[openrtm-commit:02192] r2820 - in branches/DEV_IQ_2016/OpenRTM-aist/src/lib: coil/common coil/posix/coil coil/win32/coil rtm
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2016年 12月 27日 (火) 14:56:06 JST
Author: sec_fukai
Date: 2016-12-27 14:56:06 +0900 (Tue, 27 Dec 2016)
New Revision: 2820
Modified:
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/ClockManager.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Properties.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Timer.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Routing.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/DynamicLib.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Process.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Signal.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Task.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigAdmin.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaNaming.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaPort.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ECFactory.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContext.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Factory.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortProvider.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerConfig.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ModuleManager.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NVUtil.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NamingManager.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrProvider.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortProvider.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortAdmin.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortBase.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObject.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoConfiguration.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoOrganization.cpp
Log:
[compat,->DEV_IQ_2016] Convert tabs to much spaces. refs #3758
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/ClockManager.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/ClockManager.cpp 2016-12-13 08:09:10 UTC (rev 2819)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/ClockManager.cpp 2016-12-27 05:56:06 UTC (rev 2820)
@@ -121,13 +121,13 @@
ClockManager& ClockManager::instance()
{
if(!clockmgr)
- {
- coil::Guard<coil::Mutex> guard(clockmgr_mutex);
+ {
+ coil::Guard<coil::Mutex> guard(clockmgr_mutex);
if (!clockmgr)
- {
- clockmgr = new ClockManager();
- }
- }
+ {
+ clockmgr = new ClockManager();
+ }
+ }
return *clockmgr;
}
#endif
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Properties.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Properties.cpp 2016-12-13 08:09:10 UTC (rev 2819)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Properties.cpp 2016-12-27 05:56:06 UTC (rev 2820)
@@ -56,8 +56,8 @@
while (it != it_end)
{
- setDefault(it->first.c_str(), it->second.c_str());
- ++it;
+ setDefault(it->first.c_str(), it->second.c_str());
+ ++it;
}
}
@@ -90,12 +90,12 @@
keys = prop.propertyNames();
for (size_t i(0), len(keys.size()); i < len; ++i)
{
- const Properties* node(NULL);
- if ((node = prop.findNode(keys[i])) != NULL)
- {
- setDefault(keys[i], node->default_value);
- setProperty(keys[i], node->value);
- }
+ const Properties* node(NULL);
+ if ((node = prop.findNode(keys[i])) != NULL)
+ {
+ setDefault(keys[i], node->default_value);
+ setProperty(keys[i], node->value);
+ }
}
}
@@ -117,12 +117,12 @@
keys = prop.propertyNames();
for (size_t i(0), len(keys.size()); i < len; ++i)
{
- const Properties* node(prop.findNode(keys[i]));
- if (node != 0)
- {
- setDefault(keys[i], node->default_value);
- setProperty(keys[i], node->value);
- }
+ const Properties* node(prop.findNode(keys[i]));
+ if (node != 0)
+ {
+ setDefault(keys[i], node->default_value);
+ setProperty(keys[i], node->value);
+ }
}
return *this;
@@ -143,7 +143,7 @@
// delete myself from parent
if (root != NULL)
{
- root->removeNode(name.c_str());
+ root->removeNode(name.c_str());
}
};
@@ -164,7 +164,7 @@
Properties* node(NULL);
if ((node = _getNode(keys, 0, this)) != NULL)
{
- return (!node->value.empty()) ? node->value : node->default_value;
+ return (!node->value.empty()) ? node->value : node->default_value;
}
return m_empty;
}
@@ -177,7 +177,7 @@
* @endif
*/
const std::string& Properties::getProperty(const std::string& key,
- const std::string& def) const
+ const std::string& def) const
{
const std::string& value((*this)[key]);
@@ -225,7 +225,7 @@
Properties* node(NULL);
if ((node = _getNode(keys, 0, this)) != NULL)
{
- return node->default_value;
+ return node->default_value;
}
return m_empty;
}
@@ -238,7 +238,7 @@
* @endif
*/
std::string Properties::setProperty(const std::string& key,
- const std::string& value)
+ const std::string& value)
{
std::vector<std::string> keys;
split(key, '.', keys);
@@ -246,14 +246,14 @@
Properties* curr(this);
for (size_t i(0), len(keys.size()); i < len; ++i)
{
- Properties* next(curr->hasKey(keys[i].c_str()));
- if (next == NULL)
- {
- next = new Properties(keys[i].c_str());
- next->root = curr;
- curr->leaf.push_back(next);
- }
- curr = next;
+ Properties* next(curr->hasKey(keys[i].c_str()));
+ if (next == NULL)
+ {
+ next = new Properties(keys[i].c_str());
+ next->root = curr;
+ curr->leaf.push_back(next);
+ }
+ curr = next;
}
std::string retval(curr->value);
curr->value = value;
@@ -268,7 +268,7 @@
* @endif
*/
std::string Properties::setDefault(const std::string& key,
- const std::string& value)
+ const std::string& value)
{
std::vector<std::string> keys;
split(key, '.', keys);
@@ -276,14 +276,14 @@
Properties* curr(this);
for (size_t i(0), len(keys.size()); i < len; ++i)
{
- Properties* next(curr->hasKey(keys[i].c_str()));
- if (next == NULL)
- {
- next = new Properties(keys[i].c_str());
- next->root = curr;
- curr->leaf.push_back(next);
- }
- curr = next;
+ Properties* next(curr->hasKey(keys[i].c_str()));
+ if (next == NULL)
+ {
+ next = new Properties(keys[i].c_str());
+ next->root = curr;
+ curr->leaf.push_back(next);
+ }
+ curr = next;
}
curr->default_value = value;
return value;
@@ -300,16 +300,16 @@
{
for (long i = 0; i < num && defaults[i][0] != '\0' ; i += 2)
{
- std::string key(defaults[i]);
- std::string value(defaults[i + 1]);
-
- coil::eraseHeadBlank(key);
- coil::eraseTailBlank(key);
-
- coil::eraseHeadBlank(value);
- coil::eraseTailBlank(value);
-
- setDefault(key.c_str(), value.c_str());
+ std::string key(defaults[i]);
+ std::string value(defaults[i + 1]);
+
+ coil::eraseHeadBlank(key);
+ coil::eraseTailBlank(key);
+
+ coil::eraseHeadBlank(value);
+ coil::eraseTailBlank(value);
+
+ setDefault(key.c_str(), value.c_str());
}
}
@@ -341,38 +341,38 @@
while(!inStream.eof())
{
- std::string tmp;
+ std::string tmp;
coil::getlinePortable(inStream, tmp);
- coil::eraseHeadBlank(tmp);
-
- // Skip comments or empty lines
- if (tmp.empty()) { continue; }
- if (tmp[0] == '#' || tmp[0] == '!') { continue; }
-
- // line-end '\' continues entry
- if (tmp[tmp.size() - 1] == '\\' && !coil::isEscaped(tmp, tmp.size() - 1))
- {
- tmp.erase(tmp.size() - 1);
- pline += tmp;
- continue;
- }
- pline += tmp;
-
- // Skip empty line (made of only ' ' or '\t')
- if (pline.empty()) { continue; }
-
- std::string key, value;
- splitKeyValue(pline, key, value);
- key = coil::unescape(key);
- coil::eraseHeadBlank(key);
- coil::eraseTailBlank(key);
-
- value = coil::unescape(value);
- coil::eraseHeadBlank(value);
- coil::eraseTailBlank(value);
-
- setProperty(key.c_str(), value.c_str());
- pline.clear();
+ coil::eraseHeadBlank(tmp);
+
+ // Skip comments or empty lines
+ if (tmp.empty()) { continue; }
+ if (tmp[0] == '#' || tmp[0] == '!') { continue; }
+
+ // line-end '\' continues entry
+ if (tmp[tmp.size() - 1] == '\\' && !coil::isEscaped(tmp, tmp.size() - 1))
+ {
+ tmp.erase(tmp.size() - 1);
+ pline += tmp;
+ continue;
+ }
+ pline += tmp;
+
+ // Skip empty line (made of only ' ' or '\t')
+ if (pline.empty()) { continue; }
+
+ std::string key, value;
+ splitKeyValue(pline, key, value);
+ key = coil::unescape(key);
+ coil::eraseHeadBlank(key);
+ coil::eraseTailBlank(key);
+
+ value = coil::unescape(value);
+ coil::eraseHeadBlank(value);
+ coil::eraseTailBlank(value);
+
+ setProperty(key.c_str(), value.c_str());
+ pline.clear();
}
}
@@ -417,7 +417,7 @@
std::vector<std::string> names;
for (size_t i(0), len(leaf.size()); i < len; ++i)
{
- _propertiyNames(names, leaf[i]->name, leaf[i]);
+ _propertiyNames(names, leaf[i]->name, leaf[i]);
}
return names;
}
@@ -501,13 +501,13 @@
Properties* prop;
while (it != it_end)
{
- if ((*it)->name == leaf_name)
- {
- prop = *it;
- leaf.erase(it);
- return prop;
- }
- ++it;
+ if ((*it)->name == leaf_name)
+ {
+ prop = *it;
+ leaf.erase(it);
+ return prop;
+ }
+ ++it;
}
return NULL;
}
@@ -523,8 +523,8 @@
{
for (size_t i(0), len(leaf.size()); i < len; ++i)
{
- if (leaf[i]->name == key)
- return leaf[i];
+ if (leaf[i]->name == key)
+ return leaf[i];
}
return NULL;
}
@@ -540,8 +540,8 @@
{
while (!leaf.empty())
{
- if (leaf.back() != NULL) // recursive delete
- delete leaf.back(); // back() returns always new
+ if (leaf.back() != NULL) // recursive delete
+ delete leaf.back(); // back() returns always new
}
}
@@ -558,7 +558,7 @@
keys = prop.propertyNames();
for (size_t i(0), len(prop.size()); i < len; ++i)
{
- (*this)[keys[i]] = prop[keys[i]];
+ (*this)[keys[i]] = prop[keys[i]];
}
return (*this);
}
@@ -574,41 +574,41 @@
* @endif
*/
void Properties::splitKeyValue(const std::string& str, std::string& key,
- std::string& value)
+ std::string& value)
{
std::string::size_type i(0);
std::string::size_type len(str.size());
while (i < len)
{
- if ((str[i] == ':' || str[i] == '=') && !coil::isEscaped(str, i))
- {
- key = str.substr(0, i); // substr(0, i) returns 0...(i-1) chars.
- coil::eraseHeadBlank(key);
- coil::eraseTailBlank(key);
- value = str.substr(i + 1);
- coil::eraseHeadBlank(value);
- coil::eraseTailBlank(value);
- return;
- }
- ++i;
+ if ((str[i] == ':' || str[i] == '=') && !coil::isEscaped(str, i))
+ {
+ key = str.substr(0, i); // substr(0, i) returns 0...(i-1) chars.
+ coil::eraseHeadBlank(key);
+ coil::eraseTailBlank(key);
+ value = str.substr(i + 1);
+ coil::eraseHeadBlank(value);
+ coil::eraseTailBlank(value);
+ return;
+ }
+ ++i;
}
// If no ':' or '=' exist, ' ' would be delimiter.
i = 0;
while (i < len)
{
- if ((str[i] == ' ') && !coil::isEscaped(str, i))
- {
- key = str.substr(0, i); // substr(0, i) returns 0...(i-1) chars.
- coil::eraseHeadBlank(key);
- coil::eraseTailBlank(key);
- value = str.substr(i + 1);
- coil::eraseHeadBlank(value);
- coil::eraseTailBlank(value);
- return;
- }
- ++i;
+ if ((str[i] == ' ') && !coil::isEscaped(str, i))
+ {
+ key = str.substr(0, i); // substr(0, i) returns 0...(i-1) chars.
+ coil::eraseHeadBlank(key);
+ coil::eraseTailBlank(key);
+ value = str.substr(i + 1);
+ coil::eraseHeadBlank(value);
+ coil::eraseTailBlank(value);
+ return;
+ }
+ ++i;
}
key = str;
@@ -624,7 +624,7 @@
* @endif
*/
bool Properties::split(const std::string& str, const char delim,
- std::vector<std::string>& value)
+ std::vector<std::string>& value)
{
if (str.empty()) return false;
@@ -633,13 +633,13 @@
while (end_it < len)
{
- if ((str[end_it] == delim) && !coil::isEscaped(str, end_it))
- {
- // substr(0, i) returns 0...(i-1) chars.
- value.push_back(str.substr(begin_it, end_it - begin_it));
- begin_it = end_it + 1;
- }
- ++end_it;
+ if ((str[end_it] == delim) && !coil::isEscaped(str, end_it))
+ {
+ // substr(0, i) returns 0...(i-1) chars.
+ value.push_back(str.substr(begin_it, end_it - begin_it));
+ begin_it = end_it + 1;
+ }
+ ++end_it;
}
value.push_back(str.substr(begin_it, end_it));
return true;
@@ -654,23 +654,23 @@
*/
Properties*
Properties::_getNode(std::vector<std::string>& keys,
- std::vector<Properties*>::size_type index,
- const Properties* curr)
+ std::vector<Properties*>::size_type index,
+ const Properties* curr)
{
Properties* next(curr->hasKey(keys[index].c_str()));
if (next == NULL)
{
- return NULL;
+ return NULL;
}
if (index < keys.size() - 1) // node
{
- return next->_getNode(keys, ++index, next);
+ return next->_getNode(keys, ++index, next);
}
else
{
- return next;
+ return next;
}
return NULL;
}
@@ -684,22 +684,22 @@
*/
void
Properties::_propertiyNames(std::vector<std::string>& names,
- std::string curr_name,
- const Properties* curr)
+ std::string curr_name,
+ const Properties* curr)
{
if (!curr->leaf.empty())
{
- for (size_t i(0), len(curr->leaf.size()); i < len; ++i)
- {
- std::string next_name;
- // if (curr_name == "") next_name = curr->leaf[i]->name;
- next_name = curr_name + "." + curr->leaf[i]->name;
- _propertiyNames(names, next_name, curr->leaf[i]);
- }
+ for (size_t i(0), len(curr->leaf.size()); i < len; ++i)
+ {
+ std::string next_name;
+ // if (curr_name == "") next_name = curr->leaf[i]->name;
+ next_name = curr_name + "." + curr->leaf[i]->name;
+ _propertiyNames(names, next_name, curr->leaf[i]);
+ }
}
else
{
- names.push_back(curr_name);
+ names.push_back(curr_name);
}
return;
}
@@ -713,32 +713,32 @@
*/
void
Properties::_store(std::ostream& out, std::string curr_name,
- Properties* curr)
+ Properties* curr)
{
if (!curr->leaf.empty())
{
-
- for (size_t i(0), len(curr->leaf.size()); i < len; ++i)
- {
- std::string next_name;
- if (curr_name == "")
- {
- next_name = curr->leaf[i]->name;
- }
- else
- {
- next_name = curr_name + "." + curr->leaf[i]->name;
- }
- _store(out, next_name, curr->leaf[i]);
- }
+
+ for (size_t i(0), len(curr->leaf.size()); i < len; ++i)
+ {
+ std::string next_name;
+ if (curr_name == "")
+ {
+ next_name = curr->leaf[i]->name;
+ }
+ else
+ {
+ next_name = curr_name + "." + curr->leaf[i]->name;
+ }
+ _store(out, next_name, curr->leaf[i]);
+ }
}
if (curr->root != NULL)
{
- if (curr->value.length() > 0)
- {
- out << curr_name << ": " << coil::escape(curr->value) << std::endl;
- }
+ if (curr->value.length() > 0)
+ {
+ out << curr_name << ": " << coil::escape(curr->value) << std::endl;
+ }
}
}
@@ -755,20 +755,20 @@
if (index != 0) out << indent(index) << "- " << curr.name;
if (curr.leaf.empty())
{
- if (curr.value.empty())
- {
- out << ": " << curr.default_value << std::endl;
- }
- else
- {
- out << ": " << curr.value << std::endl;
- }
- return out;
+ if (curr.value.empty())
+ {
+ out << ": " << curr.default_value << std::endl;
+ }
+ else
+ {
+ out << ": " << curr.value << std::endl;
+ }
+ return out;
}
if (index != 0) out << std::endl;
for (size_t i(0), len(curr.leaf.size()); i < len ;++i)
{
- _dump(out, *(curr.leaf[i]), index + 1);
+ _dump(out, *(curr.leaf[i]), index + 1);
}
return out;
}
@@ -785,7 +785,7 @@
std::string space;
for (int i(0); i < index - 1; ++i)
{
- space += " ";
+ space += " ";
}
return space;
}
@@ -802,7 +802,7 @@
std::string space;
for (int i(0); i < index - 1; ++i)
{
- space += " ";
+ space += " ";
}
return space;
}
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Timer.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Timer.cpp 2016-12-13 08:09:10 UTC (rev 2819)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Timer.cpp 2016-12-27 05:56:06 UTC (rev 2820)
@@ -71,7 +71,7 @@
TimeValue t_curr, t_pre, tm;;
while (m_running)
{
- invoke();
+ invoke();
coil::sleep(m_interval);
}
return 0;
@@ -92,8 +92,8 @@
Guard guard(m_runningMutex);
if (!m_running)
{
- m_running = true;
- open(0);
+ m_running = true;
+ open(0);
}
}
@@ -122,12 +122,12 @@
Guard guard(m_taskMutex);
for (size_t i(0), len(m_tasks.size()); i < len; ++i)
{
- m_tasks[i].remains = m_tasks[i].remains - m_interval;
- if (m_tasks[i].remains.sign() <= 0)
- {
- m_tasks[i].listener->invoke();
- m_tasks[i].remains = m_tasks[i].period;
- }
+ m_tasks[i].remains = m_tasks[i].remains - m_interval;
+ if (m_tasks[i].remains.sign() <= 0)
+ {
+ m_tasks[i].listener->invoke();
+ m_tasks[i].remains = m_tasks[i].period;
+ }
}
}
@@ -144,12 +144,12 @@
for (size_t i(0), len(m_tasks.size()); i < len; ++i)
{
- if (m_tasks[i].listener == listener)
- {
- m_tasks[i].period = tm;
- m_tasks[i].remains = tm;
- return listener;
- }
+ if (m_tasks[i].listener == listener)
+ {
+ m_tasks[i].period = tm;
+ m_tasks[i].remains = tm;
+ return listener;
+ }
}
m_tasks.push_back(Task(listener, tm));
return listener;
@@ -170,11 +170,11 @@
for (size_t i(0), len(m_tasks.size()); i < len; ++i, ++it)
{
- if (m_tasks[i].listener == id)
- {
- m_tasks.erase(it);
- return true;
- }
+ if (m_tasks[i].listener == id)
+ {
+ m_tasks.erase(it);
+ return true;
+ }
}
return false;
}
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Routing.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Routing.cpp 2016-12-13 08:09:10 UTC (rev 2819)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Routing.cpp 2016-12-27 05:56:06 UTC (rev 2820)
@@ -105,7 +105,7 @@
{
dest_if = vs[ifname_pos];
pclose(fp);
- wait(NULL);
+ wait(NULL);
return true;
}
#endif // COIL_OS_FREEBSD || COIL_OS_DARWIN || COIL_OS_CYGWIN || COIL_OS_QNX
@@ -160,7 +160,7 @@
{
ipaddr = vs[1];
pclose(fp);
- wait(NULL);
+ wait(NULL);
return true;
}
} while (!feof(fp));
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/DynamicLib.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/DynamicLib.cpp 2016-12-13 08:09:10 UTC (rev 2819)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/DynamicLib.cpp 2016-12-27 05:56:06 UTC (rev 2820)
@@ -172,16 +172,16 @@
}
/* Convert the error code into the message. */
- ::FormatMessage(
- FORMAT_MESSAGE_FROM_SYSTEM |
- FORMAT_MESSAGE_IGNORE_INSERTS,
- NULL,
- dwcode,
- MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
- (char *)cstr,
- 256,
- NULL
- );
+ ::FormatMessage(
+ FORMAT_MESSAGE_FROM_SYSTEM |
+ FORMAT_MESSAGE_IGNORE_INSERTS,
+ NULL,
+ dwcode,
+ MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+ (char *)cstr,
+ 256,
+ NULL
+ );
return cstr;
}
};
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Process.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Process.cpp 2016-12-13 08:09:10 UTC (rev 2819)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Process.cpp 2016-12-27 05:56:06 UTC (rev 2820)
@@ -32,12 +32,12 @@
int launch_shell(std::string command)
{
#ifdef UNICODE
- // std::string -> LPTSTR
+ // std::string -> LPTSTR
std::wstring wcommand = string2wstring(command);
LPTSTR lpcommand = new TCHAR[wcommand.size() + 1];
_tcscpy(lpcommand, wcommand.c_str());
#else
- // std::string -> LPTSTR
+ // std::string -> LPTSTR
LPTSTR lpcommand = new TCHAR[command.size() + 1];
_tcscpy(lpcommand, command.c_str());
#endif // UNICODE
@@ -53,7 +53,7 @@
NULL, NULL, &si, &pi) )
{
delete lpcommand;
- return -1;
+ return -1;
}
CloseHandle(pi.hProcess);
CloseHandle(pi.hThread);
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Signal.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Signal.cpp 2016-12-13 08:09:10 UTC (rev 2819)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Signal.cpp 2016-12-27 05:56:06 UTC (rev 2820)
@@ -54,7 +54,7 @@
sigset_t *mask, int flags)
: m_handle(handle), m_signum(signum), m_mask(mask), m_flags(flags)
{
- ::signal(m_signum, m_handle);
+ ::signal(m_signum, m_handle);
}
/*!
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Task.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Task.cpp 2016-12-13 08:09:10 UTC (rev 2819)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/win32/coil/Task.cpp 2016-12-27 05:56:06 UTC (rev 2820)
@@ -92,14 +92,14 @@
{
if (m_count == 0)
{
- m_thread =
- (HANDLE)::_beginthreadex(NULL, // security
- 0, //stuck size
- Task::svc_run, // func
- (void*)this, // argument
- 0, // flag (0 or CREATE_SUSPEND)
- NULL); //thread descripter
- ++m_count;
+ m_thread =
+ (HANDLE)::_beginthreadex(NULL, // security
+ 0, //stuck size
+ Task::svc_run, // func
+ (void*)this, // argument
+ 0, // flag (0 or CREATE_SUSPEND)
+ NULL); //thread descripter
+ ++m_count;
};
}
@@ -115,7 +115,7 @@
if (m_count > 0)
{
DWORD retval;
- retval = ::WaitForSingleObject(m_thread, INFINITE);
+ retval = ::WaitForSingleObject(m_thread, INFINITE);
}
return 0;
}
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigAdmin.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigAdmin.cpp 2016-12-13 08:09:10 UTC (rev 2819)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigAdmin.cpp 2016-12-27 05:56:06 UTC (rev 2820)
@@ -72,7 +72,7 @@
{
for (int i(0), len(m_params.size()); i < len; ++i)
{
- if (m_params[i] != NULL) { delete m_params[i]; }
+ if (m_params[i] != NULL) { delete m_params[i]; }
}
m_params.clear();
}
@@ -88,7 +88,7 @@
{
std::vector<ConfigBase*>::iterator it;
it = std::find_if(m_params.begin(), m_params.end(),
- find_conf(param_name));
+ find_conf(param_name));
if (it == m_params.end())
{
return false;
@@ -125,8 +125,8 @@
m_changedParam.clear();
if (m_changed && m_active)
{
- update(m_activeId.c_str());
- m_changed = false;
+ update(m_activeId.c_str());
+ m_changed = false;
}
return;
}
@@ -148,7 +148,7 @@
for (int i(0), len(m_params.size()); i < len; ++i)
{
- if (prop.hasKey(m_params[i]->name) != NULL)
+ if (prop.hasKey(m_params[i]->name) != NULL)
{
// m_changedParam is updated here
m_params[i]->update(prop[m_params[i]->name].c_str());
@@ -175,11 +175,11 @@
std::vector<ConfigBase*>::iterator it;
it = std::find_if(m_params.begin(), m_params.end(),
- find_conf(config_param));
+ find_conf(config_param));
if (it != m_params.end())
{
- (*it)->update(m_configsets[key].c_str());
- return;
+ (*it)->update(m_configsets[key].c_str());
+ return;
}
}
@@ -195,10 +195,10 @@
{
std::vector<ConfigBase*>::iterator it;
it = std::find_if(m_params.begin(), m_params.end(),
- find_conf(param_name));
+ find_conf(param_name));
if (it != m_params.end())
{
- return true;
+ return true;
}
return false;
}
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaNaming.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaNaming.cpp 2016-12-13 08:09:10 UTC (rev 2819)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaNaming.cpp 2016-12-27 05:56:06 UTC (rev 2820)
@@ -183,17 +183,17 @@
* @endif
*/
void CorbaNaming::rebind(const CosNaming::Name& name,
- CORBA::Object_ptr obj,
- const bool force)
+ CORBA::Object_ptr obj,
+ const bool force)
throw (SystemException, NotFound, CannotProceed, InvalidName)
{
try
{
- m_rootContext->rebind(name, obj);
+ m_rootContext->rebind(name, obj);
}
catch (NotFound& e)
{
- force ? rebindRecursive(m_rootContext, name, obj) : throw e;
+ force ? rebindRecursive(m_rootContext, name, obj) : throw e;
}
catch (CannotProceed& e)
{
@@ -436,11 +436,11 @@
{
try
{
- return m_rootContext->bind_new_context(name);
+ return m_rootContext->bind_new_context(name);
}
catch (NotFound& e)
{
- force ? bindRecursive(m_rootContext, name, newContext()) : throw e;
+ force ? bindRecursive(m_rootContext, name, newContext()) : throw e;
}
catch (CannotProceed& e)
{
@@ -510,7 +510,7 @@
for (CORBA::ULong i = 0; i < len; ++i)
{
if (bl[i].binding_type == CosNaming::ncontext)
- { // If Object is context, destroy recursive.
+ { // If Object is context, destroy recursive.
CosNaming::NamingContext_var next_context;
next_context = CosNaming::NamingContext::
_narrow(context->resolve(bl[i].binding_name));
@@ -521,7 +521,7 @@
next_context->destroy();
}
else if (bl[i].binding_type == CosNaming::nobject)
- { // If Object is object, unbind it.
+ { // If Object is object, unbind it.
context->unbind(bl[i].binding_name);
}
else assert(0); // never comes here
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaPort.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaPort.cpp 2016-12-13 08:09:10 UTC (rev 2819)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaPort.cpp 2016-12-27 05:56:06 UTC (rev 2820)
@@ -90,8 +90,8 @@
*/
bool
CorbaPort::registerProvider(const char* instance_name,
- const char* type_name,
- PortableServer::RefCountServantBase& provider)
+ const char* type_name,
+ PortableServer::RefCountServantBase& provider)
{
RTC_TRACE(("registerProvider(instance=%s, type_name=%s)",
instance_name, type_name));
@@ -110,7 +110,7 @@
if (!appendInterface(instance_name, type_name, RTC::PROVIDED))
{
RTC_ERROR(("appending provider interface failed"));
- return false;
+ return false;
}
return true;
@@ -125,14 +125,14 @@
*/
bool
CorbaPort::registerConsumer(const char* instance_name,
- const char* type_name,
- CorbaConsumerBase& consumer)
+ const char* type_name,
+ CorbaConsumerBase& consumer)
{
RTC_TRACE(("registerConsumer()"));
if (!appendInterface(instance_name, type_name, RTC::REQUIRED))
{
- return false;
+ return false;
}
m_consumers.push_back(CorbaConsumerHolder(type_name,
@@ -159,7 +159,7 @@
while(it != m_providers.end())
{
it->activate();
- ++it;
+ ++it;
}
}
@@ -176,7 +176,7 @@
while(it != m_providers.end())
{
it->deactivate();
- ++it;
+ ++it;
}
}
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ECFactory.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ECFactory.cpp 2016-12-13 08:09:10 UTC (rev 2819)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ECFactory.cpp 2016-12-27 05:56:06 UTC (rev 2820)
@@ -30,8 +30,8 @@
* @endif
*/
ECFactoryCXX::ECFactoryCXX(const char* name,
- ECNewFunc new_func,
- ECDeleteFunc delete_func)
+ ECNewFunc new_func,
+ ECDeleteFunc delete_func)
: m_name(name),
m_New(new_func),
m_Delete(delete_func)
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContext.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContext.cpp 2016-12-13 08:09:10 UTC (rev 2819)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContext.cpp 2016-12-27 05:56:06 UTC (rev 2820)
@@ -98,8 +98,8 @@
RTC_TRACE(("set_rate(%f)", rate));
if (rate > 0.0)
{
- m_profile.rate = rate;
- return RTC::RTC_OK;
+ m_profile.rate = rate;
+ return RTC::RTC_OK;
}
return RTC::BAD_PARAMETER;
}
@@ -192,9 +192,9 @@
RTC_TRACE(("add_component()"));
if (!CORBA::is_nil(comp))
{
- CORBA_SeqUtil::push_back(m_profile.participants,
- RTC::RTObject::_narrow(comp));
- return RTC::RTC_OK;
+ CORBA_SeqUtil::push_back(m_profile.participants,
+ RTC::RTObject::_narrow(comp));
+ return RTC::RTC_OK;
}
return RTC::BAD_PARAMETER;
}
@@ -206,15 +206,15 @@
* @else
* @brief Remove the component from component list
* @endif
- */
+ */
ReturnCode_t
ExecutionContextBase::remove_component(LightweightRTObject_ptr comp)
{
RTC_TRACE(("remove_component()"));
CORBA::ULong index;
index = CORBA_SeqUtil::find(m_profile.participants,
- find_objref<RTObject_ptr>(RTC::RTObject::_narrow(comp)));
-
+ find_objref<RTObject_ptr>(RTC::RTObject::_narrow(comp)));
+
if (index < 0) return RTC::BAD_PARAMETER;
CORBA_SeqUtil::erase(m_profile.participants, index);
return RTC::RTC_OK;
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Factory.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Factory.cpp 2016-12-13 08:09:10 UTC (rev 2819)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Factory.cpp 2016-12-27 05:56:06 UTC (rev 2820)
@@ -77,9 +77,9 @@
* @endif
*/
FactoryCXX::FactoryCXX(const coil::Properties& profile,
- RtcNewFunc new_func,
- RtcDeleteFunc delete_func,
- NumberingPolicy* policy)
+ RtcNewFunc new_func,
+ RtcDeleteFunc delete_func,
+ NumberingPolicy* policy)
: FactoryBase(profile),
m_New(new_func),
m_Delete(delete_func),
@@ -100,22 +100,22 @@
{
try
{
- RTObject_impl* rtobj(m_New(mgr));
- if (rtobj == 0) return NULL;
-
- ++m_Number;
- rtobj->setProperties(this->profile());
-
- // create instance_name
- std::string instance_name(rtobj->getTypeName());
- instance_name.append(m_policy->onCreate(rtobj));
- rtobj->setInstanceName(instance_name.c_str());
-
- return rtobj;
+ RTObject_impl* rtobj(m_New(mgr));
+ if (rtobj == 0) return NULL;
+
+ ++m_Number;
+ rtobj->setProperties(this->profile());
+
+ // create instance_name
+ std::string instance_name(rtobj->getTypeName());
+ instance_name.append(m_policy->onCreate(rtobj));
+ rtobj->setInstanceName(instance_name.c_str());
+
+ return rtobj;
}
catch (...)
{
- return NULL;
+ return NULL;
}
}
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortProvider.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortProvider.cpp 2016-12-13 08:09:10 UTC (rev 2819)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortProvider.cpp 2016-12-27 05:56:06 UTC (rev 2820)
@@ -78,10 +78,10 @@
RTC_TRACE(("publishInterface()"));
RTC_DEBUG_STR((NVUtil::toString(prop)));
if (!NVUtil::isStringValue(prop,
- "dataport.interface_type",
- m_interfaceType.c_str()))
+ "dataport.interface_type",
+ m_interfaceType.c_str()))
{
- return false;
+ return false;
}
NVUtil::append(prop, m_properties);
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.cpp 2016-12-13 08:09:10 UTC (rev 2819)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.cpp 2016-12-27 05:56:06 UTC (rev 2820)
@@ -201,11 +201,11 @@
// 終了待ち合わせ
if (m_runner != NULL)
{
- m_runner->wait();
+ m_runner->wait();
}
else
{
- join();
+ join();
}
m_listeners.manager_.postShutdown();
shutdownLogger();
@@ -227,10 +227,10 @@
}
while (1)
{
- {
- Guard guard(m_terminate.mutex);
- if (m_terminate.waiting > 1) break;
- }
+ {
+ Guard guard(m_terminate.mutex);
+ if (m_terminate.waiting > 1) break;
+ }
coil::usleep(100000);
}
}
@@ -271,7 +271,7 @@
catch (...)
{
RTC_ERROR(("POA Manager activatatin failed."));
- return false;
+ return false;
}
std::vector<std::string> lsvc;
@@ -279,49 +279,49 @@
for (int i(0), len(lsvc.size()); i < len; ++i)
{
- size_t begin_pos(lsvc[i].find_first_of('('));
- size_t end_pos(lsvc[i].find_first_of(')'));
- std::string filename, initfunc;
- if (begin_pos != std::string::npos && end_pos != std::string::npos &&
- begin_pos < end_pos)
- {
- initfunc = lsvc[i].substr(begin_pos + 1, end_pos - (begin_pos + 1));
- filename = lsvc[i].substr(0, begin_pos);
- coil::eraseBothEndsBlank(initfunc);
- coil::eraseBothEndsBlank(filename);
- }
- else
- {
- initfunc = coil::split(lsvc[i], ".").operator[](0) + "Init";
- filename = lsvc[i];
- }
- if (filename.find_first_of('.') == std::string::npos)
- {
- if (m_config.findNode("manager.modules.C++.suffixes") != 0)
- {
- filename += "." + m_config["manager.modules.C++.suffixes"];
- }
- }
- try
- {
- m_module->load(filename, initfunc);
- }
- catch (ModuleManager::Error& e)
- {
- RTC_ERROR(("Module load error: %s", e.reason.c_str()));
- }
- catch (ModuleManager::SymbolNotFound& e)
- {
- RTC_ERROR(("Symbol not found: %s", e.name.c_str()));
- }
- catch (ModuleManager::ModuleNotFound& e)
- {
- RTC_ERROR(("Module not found: %s", e.name.c_str()));
- }
- catch (...)
- {
- RTC_ERROR(("Unknown Exception"));
- }
+ size_t begin_pos(lsvc[i].find_first_of('('));
+ size_t end_pos(lsvc[i].find_first_of(')'));
+ std::string filename, initfunc;
+ if (begin_pos != std::string::npos && end_pos != std::string::npos &&
+ begin_pos < end_pos)
+ {
+ initfunc = lsvc[i].substr(begin_pos + 1, end_pos - (begin_pos + 1));
+ filename = lsvc[i].substr(0, begin_pos);
+ coil::eraseBothEndsBlank(initfunc);
+ coil::eraseBothEndsBlank(filename);
+ }
+ else
+ {
+ initfunc = coil::split(lsvc[i], ".").operator[](0) + "Init";
+ filename = lsvc[i];
+ }
+ if (filename.find_first_of('.') == std::string::npos)
+ {
+ if (m_config.findNode("manager.modules.C++.suffixes") != 0)
+ {
+ filename += "." + m_config["manager.modules.C++.suffixes"];
+ }
+ }
+ try
+ {
+ m_module->load(filename, initfunc);
+ }
+ catch (ModuleManager::Error& e)
+ {
+ RTC_ERROR(("Module load error: %s", e.reason.c_str()));
+ }
+ catch (ModuleManager::SymbolNotFound& e)
+ {
+ RTC_ERROR(("Symbol not found: %s", e.name.c_str()));
+ }
+ catch (ModuleManager::ModuleNotFound& e)
+ {
+ RTC_ERROR(("Module not found: %s", e.name.c_str()));
+ }
+ catch (...)
+ {
+ RTC_ERROR(("Unknown Exception"));
+ }
}
initLocalService();
@@ -331,50 +331,50 @@
for (int i(0), len(mods.size()); i < len; ++i)
{
- size_t begin_pos(mods[i].find_first_of('('));
- size_t end_pos(mods[i].find_first_of(')'));
- std::string filename, initfunc;
- if (begin_pos != std::string::npos && end_pos != std::string::npos &&
- begin_pos < end_pos)
- {
- initfunc = mods[i].substr(begin_pos + 1, end_pos - (begin_pos + 1));
- filename = mods[i].substr(0, begin_pos);
- coil::eraseBothEndsBlank(initfunc);
- coil::eraseBothEndsBlank(filename);
- }
- else
- {
- initfunc = coil::split(mods[i], ".").operator[](0) + "Init";
- filename = mods[i];
- }
- if (filename.find_first_of('.') == std::string::npos)
- {
- std::cout << m_config["manager.modules.C++.suffixes"] << std::endl;
- if (m_config.findNode("manager.modules.C++.suffixes") != 0)
- {
- filename += "." + m_config["manager.modules.C++.suffixes"];
- }
- }
- try
- {
- m_module->load(filename, initfunc);
- }
- catch (ModuleManager::Error& e)
- {
- RTC_ERROR(("Module load error: %s", e.reason.c_str()));
- }
- catch (ModuleManager::SymbolNotFound& e)
- {
- RTC_ERROR(("Symbol not found: %s", e.name.c_str()));
- }
- catch (ModuleManager::ModuleNotFound& e)
- {
- RTC_ERROR(("Module not found: %s", e.name.c_str()));
- }
- catch (...)
- {
- RTC_ERROR(("Unknown Exception"));
- }
+ size_t begin_pos(mods[i].find_first_of('('));
+ size_t end_pos(mods[i].find_first_of(')'));
+ std::string filename, initfunc;
+ if (begin_pos != std::string::npos && end_pos != std::string::npos &&
+ begin_pos < end_pos)
+ {
+ initfunc = mods[i].substr(begin_pos + 1, end_pos - (begin_pos + 1));
+ filename = mods[i].substr(0, begin_pos);
+ coil::eraseBothEndsBlank(initfunc);
+ coil::eraseBothEndsBlank(filename);
+ }
+ else
+ {
+ initfunc = coil::split(mods[i], ".").operator[](0) + "Init";
+ filename = mods[i];
+ }
+ if (filename.find_first_of('.') == std::string::npos)
+ {
+ std::cout << m_config["manager.modules.C++.suffixes"] << std::endl;
+ if (m_config.findNode("manager.modules.C++.suffixes") != 0)
+ {
+ filename += "." + m_config["manager.modules.C++.suffixes"];
+ }
+ }
+ try
+ {
+ m_module->load(filename, initfunc);
+ }
+ catch (ModuleManager::Error& e)
+ {
+ RTC_ERROR(("Module load error: %s", e.reason.c_str()));
+ }
+ catch (ModuleManager::SymbolNotFound& e)
+ {
+ RTC_ERROR(("Symbol not found: %s", e.name.c_str()));
+ }
+ catch (ModuleManager::ModuleNotFound& e)
+ {
+ RTC_ERROR(("Module not found: %s", e.name.c_str()));
+ }
+ catch (...)
+ {
+ RTC_ERROR(("Unknown Exception"));
+ }
}
m_config["sdo.service.consumer.available_services"]
@@ -517,16 +517,16 @@
{
if (no_block)
{
- RTC_TRACE(("Manager::runManager(): non-blocking mode"));
- m_runner = new OrbRunner(m_pORB);
- m_runner->open(0);
+ RTC_TRACE(("Manager::runManager(): non-blocking mode"));
+ m_runner = new OrbRunner(m_pORB);
+ m_runner->open(0);
}
else
{
- RTC_TRACE(("Manager::runManager(): blocking mode"));
- m_pORB->run();
- RTC_TRACE(("Manager::runManager(): ORB was terminated"));
- join();
+ RTC_TRACE(("Manager::runManager(): blocking mode"));
+ m_pORB->run();
+ RTC_TRACE(("Manager::runManager(): ORB was terminated"));
+ join();
}
return;
}
@@ -634,25 +634,25 @@
* @endif
*/
bool Manager::registerFactory(coil::Properties& profile,
- RtcNewFunc new_func,
- RtcDeleteFunc delete_func)
+ RtcNewFunc new_func,
+ RtcDeleteFunc delete_func)
{
RTC_TRACE(("Manager::registerFactory(%s)", profile["type_name"].c_str()));
FactoryBase* factory;
factory = new FactoryCXX(profile, new_func, delete_func);
try
{
- bool ret = m_factory.registerObject(factory);
- if (!ret) {
- delete factory;
- return false;
- }
- return true;
+ bool ret = m_factory.registerObject(factory);
+ if (!ret) {
+ delete factory;
+ return false;
+ }
+ return true;
}
catch (...)
{
- delete factory;
- return false;
+ delete factory;
+ return false;
}
}
@@ -675,22 +675,22 @@
* @endif
*/
bool Manager::registerECFactory(const char* name,
- ECNewFunc new_func,
- ECDeleteFunc delete_func)
+ ECNewFunc new_func,
+ ECDeleteFunc delete_func)
{
RTC_TRACE(("Manager::registerECFactory(%s)", name));
try
{
- ECFactoryBase* factory;
- factory = new ECFactoryCXX(name, new_func, delete_func);
- if(m_ecfactory.registerObject(factory))
+ ECFactoryBase* factory;
+ factory = new ECFactoryCXX(name, new_func, delete_func);
+ if(m_ecfactory.registerObject(factory))
{
return true;
}
}
catch (...)
{
- return false;
+ return false;
}
return false;
}
@@ -740,7 +740,7 @@
coil::vstring exported_ports;
exported_ports = coil::split(comp_prop["exported_ports"], ",");
- std::string exported_ports_str("");
+ std::string exported_ports_str("");
for (size_t i(0), len(exported_ports.size()); i < len; ++i)
{
coil::vstring keyval(coil::split(exported_ports[i], "."));
@@ -752,13 +752,13 @@
{
exported_ports_str += exported_ports[i];
}
-
+
if (i != exported_ports.size() - 1)
{
exported_ports_str += ",";
}
}
-
+
comp_prop["exported_ports"] = exported_ports_str;
comp_prop["conf.default.exported_ports"] = exported_ports_str;
@@ -849,9 +849,9 @@
comp = factory->create(this);
if (comp == NULL)
{
- RTC_ERROR(("RTC creation failed: %s",
+ RTC_ERROR(("RTC creation failed: %s",
comp_id["implementation_id"].c_str()));
- return NULL;
+ return NULL;
}
RTC_TRACE(("RTC created: %s", comp_id["implementation_id"].c_str()));
m_listeners.rtclifecycle_.postCreate(comp);
@@ -910,8 +910,8 @@
m_listeners.naming_.preBind(comp, names);
for (int i(0), len(names.size()); i < len; ++i)
{
- RTC_TRACE(("Bind name: %s", names[i].c_str()));
- m_namingManager->bindObject(names[i].c_str(), comp);
+ RTC_TRACE(("Bind name: %s", names[i].c_str()));
+ m_namingManager->bindObject(names[i].c_str(), comp);
}
m_listeners.naming_.postBind(comp, names);
@@ -936,8 +936,8 @@
m_listeners.naming_.preUnbind(comp, names);
for (int i(0), len(names.size()); i < len; ++i)
{
- RTC_TRACE(("Unbind name: %s", names[i].c_str()));
- m_namingManager->unbindObject(names[i].c_str());
+ RTC_TRACE(("Unbind name: %s", names[i].c_str()));
+ m_namingManager->unbindObject(names[i].c_str());
}
m_listeners.naming_.postUnbind(comp, names);
@@ -949,7 +949,7 @@
{
RTC_TRACE(("Manager::createContext()"));
RTC_TRACE(("ExecutionContext type: %s",
- m_config.getProperty("exec_cxt.periodic.type").c_str()));
+ m_config.getProperty("exec_cxt.periodic.type").c_str()));
std::string ec_id;
coil::Properties ec_prop;
@@ -987,13 +987,13 @@
{
RTC_DEBUG(("Factory not found: %s",
comp_id["implementation_id"].c_str()));
- return;
+ return;
}
else
{
RTC_DEBUG(("Factory found: %s",
comp_id["implementation_id"].c_str()));
- factory->destroy(comp);
+ factory->destroy(comp);
}
if (coil::toBool(m_config["manager.shutdown_on_nortcs"],
@@ -1320,7 +1320,7 @@
{
std::string logfile(logouts[i]);
if (logfile == "") continue;
-
+
// Open logfile
if (logfile == "STDOUT" || logfile == "stdout")
{
@@ -1341,20 +1341,20 @@
m_logStreamBuf.addStream(of, true);
m_logfiles.push_back(of);
}
-
+
// Set date format for log entry header
rtclog.setDateFormat(m_config["logger.date_format"].c_str());
rtclog.setClockType(m_config["logger.clock_type"]);
// Loglevel was set from configuration file.
rtclog.setLevel(m_config["logger.log_level"].c_str());
-
+
// Log stream mutex locking mode
coil::toBool(m_config["logger.stream_lock"],
"enable", "disable", false) ?
rtclog.enableLock() : rtclog.disableLock();
-
+
RTC_INFO(("%s", m_config["openrtm.version"].c_str()));
RTC_INFO(("Copyright (C) 2003-2012"));
RTC_INFO((" Noriaki Ando"));
@@ -1405,25 +1405,25 @@
// Initialize ORB
try
{
- std::vector<std::string> args(coil::split(createORBOptions(), " "));
- // TAO's ORB_init needs argv[0] as command name.
- args.insert(args.begin(), "manager");
- char** argv = coil::toArgv(args);
- int argc(args.size());
-
- // ORB initialization
- m_pORB = CORBA::ORB_init(argc, argv);
- // Get the RootPOA
- CORBA::Object_var obj =
- m_pORB->resolve_initial_references((char*)"RootPOA");
- m_pPOA = PortableServer::POA::_narrow(obj);
- if (CORBA::is_nil(m_pPOA))
- {
- RTC_ERROR(("Could not resolve RootPOA."));
- return false;
- }
- // Get the POAManager
- m_pPOAManager = m_pPOA->the_POAManager();
+ std::vector<std::string> args(coil::split(createORBOptions(), " "));
+ // TAO's ORB_init needs argv[0] as command name.
+ args.insert(args.begin(), "manager");
+ char** argv = coil::toArgv(args);
+ int argc(args.size());
+
+ // ORB initialization
+ m_pORB = CORBA::ORB_init(argc, argv);
+ // Get the RootPOA
+ CORBA::Object_var obj =
+ m_pORB->resolve_initial_references((char*)"RootPOA");
+ m_pPOA = PortableServer::POA::_narrow(obj);
+ if (CORBA::is_nil(m_pPOA))
+ {
+ RTC_ERROR(("Could not resolve RootPOA."));
+ return false;
+ }
+ // Get the POAManager
+ m_pPOAManager = m_pPOA->the_POAManager();
#ifdef ORB_IS_OMNIORB
const char* conf = "corba.alternate_iiop_addresses";
@@ -1454,8 +1454,8 @@
}
catch (...)
{
- RTC_ERROR(("Exception: Caught unknown exception in initORB()." ));
- return false;
+ RTC_ERROR(("Exception: Caught unknown exception in initORB()." ));
+ return false;
}
return true;
}
@@ -1531,7 +1531,7 @@
RTC_DEBUG(("Endpoint is : %s", endpoint.c_str()));
if (endpoint.find(":") == std::string::npos) { endpoint += ":"; }
- if (corba == "omniORB")
+ if (corba == "omniORB")
{
coil::normalize(endpoint);
if (coil::normalize(endpoint) == "all:")
@@ -1551,11 +1551,11 @@
opt += " -ORBendPoint giop:tcp:" + endpoint;
}
}
- else if (corba == "TAO")
+ else if (corba == "TAO")
{
opt += "-ORBEndPoint iiop://" + endpoint;
}
- else if (corba == "MICO")
+ else if (corba == "MICO")
{
opt += "-ORBIIOPAddr inet:" + endpoint;
}
@@ -1581,9 +1581,9 @@
{
while (m_pORB->work_pending())
{
- RTC_PARANOID(("Pending work still exists."));
- if (m_pORB->work_pending())
- m_pORB->perform_work();
+ RTC_PARANOID(("Pending work still exists."));
+ if (m_pORB->work_pending())
+ m_pORB->perform_work();
}
RTC_DEBUG(("No pending works of ORB. Shutting down POA and ORB."));
}
@@ -1594,49 +1594,49 @@
if (!CORBA::is_nil(m_pPOA))
{
- try
- {
- if (!CORBA::is_nil(m_pPOAManager))
- m_pPOAManager->deactivate(false, true);
- RTC_DEBUG(("POA Manager was deactivated."));
- m_pPOA->destroy(false, true);
- m_pPOA = PortableServer::POA::_nil();
- RTC_DEBUG(("POA was destroid."));
- }
- catch (CORBA::SystemException& ex)
- {
- RTC_ERROR(("Exception cought during root POA destruction"));
+ try
+ {
+ if (!CORBA::is_nil(m_pPOAManager))
+ m_pPOAManager->deactivate(false, true);
+ RTC_DEBUG(("POA Manager was deactivated."));
+ m_pPOA->destroy(false, true);
+ m_pPOA = PortableServer::POA::_nil();
+ RTC_DEBUG(("POA was destroid."));
+ }
+ catch (CORBA::SystemException& ex)
+ {
+ RTC_ERROR(("Exception cought during root POA destruction"));
#ifndef ORB_IS_RTORB
- RTC_ERROR(("CORBA::SystemException(minor=%d)", ex.minor()));
+ RTC_ERROR(("CORBA::SystemException(minor=%d)", ex.minor()));
#endif // ORB_IS_RTORB
- }
- catch (...)
- {
- RTC_ERROR(("Caught unknown exception during POA destruction."));
- }
+ }
+ catch (...)
+ {
+ RTC_ERROR(("Caught unknown exception during POA destruction."));
+ }
}
if (!CORBA::is_nil(m_pORB))
{
- try
- {
- m_pORB->shutdown(true);
- RTC_DEBUG(("ORB was shutdown."));
+ try
+ {
+ m_pORB->shutdown(true);
+ RTC_DEBUG(("ORB was shutdown."));
//m_pORB->destroy();
- RTC_DEBUG(("ORB was destroied."));
- m_pORB = CORBA::ORB::_nil();
- }
- catch (CORBA::SystemException& ex)
- {
- RTC_ERROR(("Exception caught during ORB shutdown"));
+ RTC_DEBUG(("ORB was destroied."));
+ m_pORB = CORBA::ORB::_nil();
+ }
+ catch (CORBA::SystemException& ex)
+ {
+ RTC_ERROR(("Exception caught during ORB shutdown"));
#ifndef ORB_IS_RTORB
RTC_ERROR(("CORBA::SystemException(minodor=%d)", ex.minor()));
#endif // ORB_IS_RTORB
- }
- catch (...)
- {
- RTC_ERROR(("Caught unknown exception during ORB shutdown."));
- }
+ }
+ catch (...)
+ {
+ RTC_ERROR(("Caught unknown exception during ORB shutdown."));
+ }
}
}
@@ -1667,33 +1667,33 @@
for (int i(0), len_i(meth.size()); i < len_i; ++i)
{
- std::vector<std::string> names;
- names = coil::split(m_config[meth[i] + ".nameservers"], ",");
-
-
- for (int j(0), len_j(names.size()); j < len_j; ++j)
- {
- RTC_TRACE(("Register Naming Server: %s/%s", \
- meth[i].c_str(), names[j].c_str()));
- m_namingManager->registerNameServer(meth[i].c_str(),
- names[j].c_str());
- }
+ std::vector<std::string> names;
+ names = coil::split(m_config[meth[i] + ".nameservers"], ",");
+
+
+ for (int j(0), len_j(names.size()); j < len_j; ++j)
+ {
+ RTC_TRACE(("Register Naming Server: %s/%s", \
+ meth[i].c_str(), names[j].c_str()));
+ m_namingManager->registerNameServer(meth[i].c_str(),
+ names[j].c_str());
+ }
}
// NamingManager Timer update initialization
if (coil::toBool(m_config["naming.update.enable"], "YES", "NO", true))
{
coil::TimeValue tm(10, 0); // default interval = 10sec for safty
- std::string intr(m_config["naming.update.interval"]);
- if (!intr.empty())
- {
- tm = atof(intr.c_str());
- }
- if (m_timer != NULL)
- {
- m_timer->registerListenerObj(m_namingManager,
- &NamingManager::update, tm);
- }
+ std::string intr(m_config["naming.update.interval"]);
+ if (!intr.empty())
+ {
+ tm = atof(intr.c_str());
+ }
+ if (m_timer != NULL)
+ {
+ m_timer->registerListenerObj(m_namingManager,
+ &NamingManager::update, tm);
+ }
}
return true;
}
@@ -1849,10 +1849,10 @@
{
otherref.close();
std::ofstream reffile(m_config["manager.refstring_path"].c_str());
- RTM::Manager_var mgr_v(RTM::Manager::
+ RTM::Manager_var mgr_v(RTM::Manager::
_duplicate(m_mgrservant->getObjRef()));
CORBA::String_var str_var = m_pORB->object_to_string(mgr_v);
- reffile << str_var;
+ reffile << str_var;
reffile.close();
}
else
@@ -1904,37 +1904,37 @@
comps = m_namingManager->getObjects();
for (int i(0), len(comps.size()); i < len; ++i)
{
- try
- {
- comps[i]->exit();
- coil::Properties p(comps[i]->getInstanceName());
- p << comps[i]->getProperties();
+ try
+ {
+ comps[i]->exit();
+ coil::Properties p(comps[i]->getInstanceName());
+ p << comps[i]->getProperties();
rtclog.lock();
- rtclog.level(::RTC::Logger::RTL_PARANOID) << p;
+ rtclog.level(::RTC::Logger::RTL_PARANOID) << p;
rtclog.unlock();
- }
- catch (...)
- {
- ;
- }
+ }
+ catch (...)
+ {
+ ;
+ }
}
for (CORBA::ULong i(0), len(m_ecs.size()); i < len; ++i)
{
- try{
- PortableServer::RefCountServantBase* servant;
- servant = dynamic_cast<PortableServer::RefCountServantBase*>(m_ecs[i]);
- if (servant == NULL)
- {
- RTC_ERROR(("Invalid dynamic cast. EC->RefCountServantBase failed."));
- return;
+ try{
+ PortableServer::RefCountServantBase* servant;
+ servant = dynamic_cast<PortableServer::RefCountServantBase*>(m_ecs[i]);
+ if (servant == NULL)
+ {
+ RTC_ERROR(("Invalid dynamic cast. EC->RefCountServantBase failed."));
+ return;
+ }
+ PortableServer::ObjectId_var oid = m_pPOA->servant_to_id(servant);
+ m_pPOA->deactivate_object(oid);
}
- PortableServer::ObjectId_var oid = m_pPOA->servant_to_id(servant);
- m_pPOA->deactivate_object(oid);
- }
- catch (...)
- {
- ;
- }
+ catch (...)
+ {
+ ;
+ }
}
return;
}
@@ -2178,18 +2178,18 @@
{
if (file_name == NULL)
{
- RTC_ERROR(("Invalid configuration file name."));
- return false;
+ RTC_ERROR(("Invalid configuration file name."));
+ return false;
}
if (file_name[0] != '\0')
{
- std::ifstream conff(file_name);
- if (!conff.fail())
- {
- prop.load(conff);
- conff.close();
- return true;
- }
+ std::ifstream conff(file_name);
+ if (!conff.fail())
+ {
+ prop.load(conff);
+ conff.close();
+ return true;
+ }
}
return false;
}
@@ -2202,7 +2202,7 @@
* @endif
*/
std::string Manager::formatString(const char* naming_format,
- coil::Properties& prop)
+ coil::Properties& prop)
{
std::string name(naming_format), str("");
std::string::iterator it, it_end;
@@ -2212,60 +2212,60 @@
it_end = name.end();
for ( ; it != it_end; ++it)
{
- char c(*it);
- if (c == '%')
- {
- ++count;
- if (!(count % 2)) str.push_back((*it));
- }
- else if (c == '$')
- {
- count = 0;
- ++it;
- if (*it == '{' || *it == '(')
- {
- ++it;
- std::string env;
- for ( ; it != it_end && (*it) != '}' && (*it) != ')'; ++it)
- {
- env += *it;
- }
- char* envval = coil::getenv(env.c_str());
- if (envval != NULL) str += envval;
- }
- else
- {
- str.push_back(c);
- }
- }
- else
- {
- if (count > 0 && (count % 2))
- {
- count = 0;
- if (c == 'n') str += prop["instance_name"];
- else if (c == 't') str += prop["type_name"];
- else if (c == 'm') str += prop["type_name"];
- else if (c == 'v') str += prop["version"];
- else if (c == 'V') str += prop["vendor"];
- else if (c == 'c') str += prop["category"];
- else if (c == 'i') str += prop["implementation_id"];
- else if (c == 'N')
- {
- size_t n = prop["implementation_id"].size();
- str += prop["instance_name"].substr(n);
- }
- else if (c == 'h') str += m_config["os.hostname"];
- else if (c == 'M') str += m_config["manager.name"];
- else if (c == 'p') str += m_config["manager.pid"];
- else str.push_back(c);
- }
- else
- {
- count = 0;
- str.push_back(c);
- }
- }
+ char c(*it);
+ if (c == '%')
+ {
+ ++count;
+ if (!(count % 2)) str.push_back((*it));
+ }
+ else if (c == '$')
+ {
+ count = 0;
+ ++it;
+ if (*it == '{' || *it == '(')
+ {
+ ++it;
+ std::string env;
+ for ( ; it != it_end && (*it) != '}' && (*it) != ')'; ++it)
+ {
+ env += *it;
+ }
+ char* envval = coil::getenv(env.c_str());
+ if (envval != NULL) str += envval;
+ }
+ else
+ {
+ str.push_back(c);
+ }
+ }
+ else
+ {
+ if (count > 0 && (count % 2))
+ {
+ count = 0;
+ if (c == 'n') str += prop["instance_name"];
+ else if (c == 't') str += prop["type_name"];
+ else if (c == 'm') str += prop["type_name"];
+ else if (c == 'v') str += prop["version"];
+ else if (c == 'V') str += prop["vendor"];
+ else if (c == 'c') str += prop["category"];
+ else if (c == 'i') str += prop["implementation_id"];
+ else if (c == 'N')
+ {
+ size_t n = prop["implementation_id"].size();
+ str += prop["instance_name"].substr(n);
+ }
+ else if (c == 'h') str += m_config["os.hostname"];
+ else if (c == 'M') str += m_config["manager.name"];
+ else if (c == 'p') str += m_config["manager.pid"];
+ else str.push_back(c);
+ }
+ else
+ {
+ count = 0;
+ str.push_back(c);
+ }
+ }
}
return str;
}
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerConfig.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerConfig.cpp 2016-12-13 08:09:10 UTC (rev 2819)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerConfig.cpp 2016-12-27 05:56:06 UTC (rev 2820)
@@ -106,12 +106,12 @@
prop.setDefaults(default_config);
if (findConfigFile())
{
- std::ifstream f(m_configFile.c_str());
- if (f.is_open())
- {
- prop.load(f);
- f.close();
- }
+ std::ifstream f(m_configFile.c_str());
+ if (f.is_open())
+ {
+ prop.load(f);
+ f.close();
+ }
}
setSystemInformation(prop);
if (m_isMaster) { prop["manager.is_master"] = "YES"; }
@@ -137,21 +137,21 @@
while ((opt = get_opts()) > 0)
{
- switch (opt)
- {
+ switch (opt)
+ {
case 'a':
{
m_argprop["manager.corba_servant"] = "NO";
}
break;
- // Specify configuration file not default
- case 'f':
- m_configFile = get_opts.optarg;
- break;
- case 'l':
- // m_configFile = get_opts.optarg;
- break;
- case 'o':
+ // Specify configuration file not default
+ case 'f':
+ m_configFile = get_opts.optarg;
+ break;
+ case 'l':
+ // m_configFile = get_opts.optarg;
+ break;
+ case 'o':
{
std::string optarg(get_opts.optarg);
std::string::size_type pos(optarg.find(":"));
@@ -160,7 +160,7 @@
m_argprop[optarg.substr(0, pos)] = optarg.substr(pos + 1);
}
}
- break;
+ break;
case 'p': // ORB's port number
{
int portnum;
@@ -171,12 +171,12 @@
}
}
break;
- case 'd':
+ case 'd':
m_isMaster = true;
- break;
- default:
- break;
- }
+ break;
+ default:
+ break;
+ }
}
return;
}
@@ -193,32 +193,32 @@
// Check existance of configuration file given command arg
if (m_configFile != "")
{
- if (fileExist(m_configFile))
- {
- return true;
- }
+ if (fileExist(m_configFile))
+ {
+ return true;
+ }
}
// Search rtc configuration file from environment variable
char* env = getenv(config_file_env);
if (env != NULL)
{
- if (fileExist(env))
- {
- m_configFile = env;
- return true;
- }
+ if (fileExist(env))
+ {
+ m_configFile = env;
+ return true;
+ }
}
// Search rtc configuration file from default search path
int i = 0;
while (config_file_path[i] != NULL)
{
- if (fileExist(config_file_path[i]))
- {
- m_configFile = config_file_path[i];
- return true;
- }
- ++i;
+ if (fileExist(config_file_path[i]))
+ {
+ m_configFile = config_file_path[i];
+ return true;
+ }
+ ++i;
}
return false;
}
@@ -238,7 +238,7 @@
coil::utsname sysinfo;
if (coil::uname(&sysinfo) != 0)
{
- return;
+ return;
}
//
@@ -272,13 +272,13 @@
// fial() 0: ok, !0: fail
if (infile.fail() != 0)
{
- infile.close();
- return false;
+ infile.close();
+ return false;
}
else
{
- infile.close();
- return true;
+ infile.close();
+ return true;
}
return false;
}
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ModuleManager.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ModuleManager.cpp 2016-12-13 08:09:10 UTC (rev 2819)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ModuleManager.cpp 2016-12-27 05:56:06 UTC (rev 2820)
@@ -82,46 +82,46 @@
if (coil::isURL(file_name))
{
- if (!m_downloadAllowed)
- {
- RTC_ERROR(("Downloading module is not allowed."));
- throw NotAllowedOperation("Downloading module is not allowed.");
- }
- else
- {
- throw NotFound("Not implemented.");
- }
+ if (!m_downloadAllowed)
+ {
+ RTC_ERROR(("Downloading module is not allowed."));
+ throw NotAllowedOperation("Downloading module is not allowed.");
+ }
+ else
+ {
+ throw NotFound("Not implemented.");
+ }
}
// Find local file from load path or absolute directory
std::string file_path;
if (coil::isAbsolutePath(file_name))
{
- if (!m_absoluteAllowed)
- {
- RTC_ERROR(("Absolute path is not allowed"));
- throw NotAllowedOperation("Absolute path is not allowed");
- }
- else
- {
- file_path = file_name;
- }
+ if (!m_absoluteAllowed)
+ {
+ RTC_ERROR(("Absolute path is not allowed"));
+ throw NotAllowedOperation("Absolute path is not allowed");
+ }
+ else
+ {
+ file_path = file_name;
+ }
}
else
{
- file_path = findFile(file_name, m_loadPath);
+ file_path = findFile(file_name, m_loadPath);
}
// Now file_name is valid full path to module
if (file_path == "")
{
- RTC_ERROR(("Invalid file name: Empty file name."));
- throw InvalidArguments("Invalid file name.");
+ RTC_ERROR(("Invalid file name: Empty file name."));
+ throw InvalidArguments("Invalid file name.");
}
if (!fileExist(file_path))
{
- RTC_ERROR(("Module file not found: %s", file_path.c_str()));
- throw FileNotFound(file_path.c_str());
+ RTC_ERROR(("Module file not found: %s", file_path.c_str()));
+ throw FileNotFound(file_path.c_str());
}
DLLEntity* dll(new DLLEntity());
@@ -129,17 +129,17 @@
int retval = dll->dll.open(file_path.c_str());
if (retval != 0)
{
- RTC_ERROR(("Module file %s load failed: %s",
- file_path.c_str(), dll->dll.error()));
+ RTC_ERROR(("Module file %s load failed: %s",
+ file_path.c_str(), dll->dll.error()));
delete dll;
- throw Error("DLL open failed.");
+ throw Error("DLL open failed.");
}
dll->properties["file_path"] = file_path;
bool ret = m_modules.registerObject(dll);
if (!ret)
{
- RTC_ERROR(("Module registration failed: %s", file_path.c_str()));
- delete dll;
+ RTC_ERROR(("Module registration failed: %s", file_path.c_str()));
+ delete dll;
}
return file_path;
@@ -153,7 +153,7 @@
* @endif
*/
std::string ModuleManager::load(const std::string& file_name,
- const std::string& init_func)
+ const std::string& init_func)
{
RTC_TRACE(("load(fname = %s, init_func = %s)",
file_name.c_str(), init_func.c_str()));
@@ -162,7 +162,7 @@
if (name == "")
{
- throw InvalidOperation("Invalid file name");
+ throw InvalidOperation("Invalid file name");
}
// if (!init_func)
@@ -228,28 +228,28 @@
* @endif
*/
void* ModuleManager::symbol(const std::string& file_name,
- const std::string& func_name)
+ const std::string& func_name)
throw (ModuleNotFound, SymbolNotFound)
{
RTC_TRACE(("symbol(%s, %s)",
- file_name.c_str(), func_name.c_str()))
+ file_name.c_str(), func_name.c_str()))
// "file_name" should be in modules map.
DLLEntity* dll(m_modules.find(file_name.c_str()));
if (dll == NULL)
{
- RTC_ERROR(("Module %s not found in module table.", file_name.c_str()));
- throw ModuleNotFound(file_name);
+ RTC_ERROR(("Module %s not found in module table.", file_name.c_str()));
+ throw ModuleNotFound(file_name);
}
RTC_DEBUG(("Finding function symbol: %s in %s",
- func_name.c_str(), file_name.c_str()));
+ func_name.c_str(), file_name.c_str()));
void* func;
func = dll->dll.symbol(func_name.c_str());
if (!func)
{
- RTC_ERROR(("Specified symbol %s not found.", func_name.c_str()));
- throw SymbolNotFound(func_name);
+ RTC_ERROR(("Specified symbol %s not found.", func_name.c_str()));
+ throw SymbolNotFound(func_name);
}
return func;
@@ -284,8 +284,8 @@
while (it != it_end)
{
- m_loadPath.push_back(*it);
- ++it;
+ m_loadPath.push_back(*it);
+ ++it;
}
return;
@@ -357,10 +357,10 @@
* @endif
*/
std::string ModuleManager::findFile(const std::string& fname,
- const std::vector<std::string>& load_path)
+ const std::vector<std::string>& load_path)
{
RTC_TRACE(("findFile(%s, %s)", fname.c_str(),
- coil::flatten(load_path, ", ").c_str()));
+ coil::flatten(load_path, ", ").c_str()));
StringVectorConstItr it, it_end;
std::string file_name(fname);
@@ -369,12 +369,12 @@
while (it != it_end)
{
- std::string f((*it) + "/" + file_name);
- if (fileExist(f))
- {
- return f;
- }
- ++it;
+ std::string f((*it) + "/" + file_name);
+ if (fileExist(f))
+ {
+ return f;
+ }
+ ++it;
}
return std::string("");
@@ -395,13 +395,13 @@
// fial() 0: ok, !0: fail
if (infile.fail() != 0)
{
- infile.close();
- return false;
+ infile.close();
+ return false;
}
else
{
- infile.close();
- return true;
+ infile.close();
+ return true;
}
return false;
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NVUtil.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NVUtil.cpp 2016-12-13 08:09:10 UTC (rev 2819)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NVUtil.cpp 2016-12-27 05:56:06 UTC (rev 2820)
@@ -123,7 +123,7 @@
#else // ORB_IS_RTORB
nv[i].name = (char *)keys[i].c_str();
#endif // ORB_IS_RTORB
- nv[i].value <<= prop[keys[i]].c_str();
+ nv[i].value <<= prop[keys[i]].c_str();
}
}
@@ -138,12 +138,12 @@
{
for (CORBA::ULong i(0), len(nv.length()); i < len; ++i)
{
- const char* value;
- if (nv[i].value >>= value)
- {
- const char* name(nv[i].name);
- prop[name] = value;
- };
+ const char* value;
+ if (nv[i].value >>= value)
+ {
+ const char* name(nv[i].name);
+ prop[name] = value;
+ };
}
}
@@ -163,9 +163,9 @@
{
const char* value;
if (nv.value >>= value)
- {
- m_prop.setProperty(CORBA::string_dup(nv.name), value);
- };
+ {
+ m_prop.setProperty(CORBA::string_dup(nv.name), value);
+ };
}
coil::Properties m_prop;
};
@@ -240,14 +240,14 @@
{
try
{
- CORBA::Any value;
- value = find(nv, name);
- const char* str_value;
- return value >>= str_value;
+ CORBA::Any value;
+ value = find(nv, name);
+ const char* str_value;
+ return value >>= str_value;
}
catch (...)
{
- return false;
+ return false;
}
}
@@ -260,14 +260,14 @@
* @endif
*/
bool isStringValue(const SDOPackage::NVList& nv,
- const char* name, const char* value)
+ const char* name, const char* value)
{
if (isString(nv, name))
{
- if (toString(nv, name) == value)
- {
- return true;
- }
+ if (toString(nv, name) == value)
+ {
+ return true;
+ }
}
return false;
}
@@ -284,19 +284,19 @@
const char* str_value;
try
{
- if(!(find(nv, name) >>= str_value))
+ if(!(find(nv, name) >>= str_value))
{
- str_value = "";
+ str_value = "";
}
}
catch (...)
{
- str_value = "";
+ str_value = "";
}
if (str_value == NULL)
{
- str_value = "";
+ str_value = "";
}
return str_value;
@@ -324,22 +324,22 @@
if (index < 0)
{
- CORBA_SeqUtil::push_back(nv, newNV(name, value));
+ CORBA_SeqUtil::push_back(nv, newNV(name, value));
}
else
{
- const char* tmp_char;
- nv[index].value >>= tmp_char;
- std::string tmp_str(tmp_char);
-
- std::vector<std::string> values;
- values = coil::split(tmp_str, ",");
- if (values.end() == std::find(values.begin(), values.end(), value))
- {
- tmp_str.append(",");
- tmp_str.append(value);
- nv[index].value <<= tmp_str.c_str();
- }
+ const char* tmp_char;
+ nv[index].value >>= tmp_char;
+ std::string tmp_str(tmp_char);
+
+ std::vector<std::string> values;
+ values = coil::split(tmp_str, ",");
+ if (values.end() == std::find(values.begin(), values.end(), value))
+ {
+ tmp_str.append(",");
+ tmp_str.append(value);
+ nv[index].value <<= tmp_str.c_str();
+ }
}
return true;
}
@@ -355,7 +355,7 @@
{
for (CORBA::ULong i = 0, len = src.length(); i < len; ++i)
{
- CORBA_SeqUtil::push_back(dest, src[i]);
+ CORBA_SeqUtil::push_back(dest, src[i]);
}
}
@@ -370,15 +370,15 @@
{
for (CORBA::ULong i(0), n(nv.length()); i < n; ++i)
{
- const char* str_value;
- if (nv[i].value >>= str_value)
- {
- out << nv[i].name << ": " << str_value << std::endl;
- }
- else
- {
- out << nv[i].name << ": not a string value" << std::endl;
- }
+ const char* str_value;
+ if (nv[i].value >>= str_value)
+ {
+ out << nv[i].name << ": " << str_value << std::endl;
+ }
+ else
+ {
+ out << nv[i].name << ": not a string value" << std::endl;
+ }
}
return out;
}
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NamingManager.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NamingManager.cpp 2016-12-13 08:09:10 UTC (rev 2819)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NamingManager.cpp 2016-12-27 05:56:06 UTC (rev 2820)
@@ -218,7 +218,7 @@
const char* name_server)
{
RTC_TRACE(("NamingManager::registerNameServer(%s, %s)",
- method, name_server));
+ method, name_server));
NamingBase* name;
name = createNamingObj(method, name_server);
@@ -319,15 +319,15 @@
"YES", "NO", false));
for (int i(0), len(m_names.size()); i < len; ++i)
{
- if (m_names[i]->ns == 0) // if ns==NULL
- {
+ if (m_names[i]->ns == 0) // if ns==NULL
+ {
RTC_DEBUG(("Retrying connection to %s/%s",
m_names[i]->method.c_str(),
m_names[i]->nsname.c_str()));
retryConnection(m_names[i]);
- }
+ }
else
- {
+ {
try
{
if (rebind) { bindCompsTo(m_names[i]->ns); }
@@ -366,9 +366,9 @@
Guard guard(m_namesMutex);
for (int i(0), len(m_names.size()); i < len; ++i)
{
- if (m_names[i]->ns != NULL)
+ if (m_names[i]->ns != NULL)
{
- m_names[i]->ns->unbindObject(name);
+ m_names[i]->ns->unbindObject(name);
}
}
unregisterCompName(name);
@@ -428,7 +428,7 @@
for (int i(0), len(m_compNames.size()); i < len; ++i)
{
- comps.push_back(const_cast<RTObject_impl*>(m_compNames[i]->rtobj));
+ comps.push_back(const_cast<RTObject_impl*>(m_compNames[i]->rtobj));
}
return comps;
}
@@ -482,7 +482,7 @@
{
for (int i(0), len(m_compNames.size()); i < len; ++i)
{
- ns->bindObject(m_compNames[i]->name.c_str(), m_compNames[i]->rtobj);
+ ns->bindObject(m_compNames[i]->name.c_str(), m_compNames[i]->rtobj);
}
}
@@ -494,15 +494,15 @@
* @endif
*/
void NamingManager::registerCompName(const char* name,
- const RTObject_impl* rtobj)
+ const RTObject_impl* rtobj)
{
for (int i(0), len(m_compNames.size()); i < len; ++i)
{
- if (m_compNames[i]->name == name)
- {
- m_compNames[i]->rtobj = rtobj;
- return;
- }
+ if (m_compNames[i]->name == name)
+ {
+ m_compNames[i]->rtobj = rtobj;
+ return;
+ }
}
m_compNames.push_back(new Comps(name, rtobj));
return;
@@ -533,11 +533,11 @@
{
for (int i(0), len(m_mgrNames.size()); i < len; ++i)
{
- if (m_mgrNames[i]->name == name)
- {
- m_mgrNames[i]->mgr = mgr;
- return;
- }
+ if (m_mgrNames[i]->name == name)
+ {
+ m_mgrNames[i]->mgr = mgr;
+ return;
+ }
}
m_mgrNames.push_back(new Mgr(name, mgr));
return;
@@ -555,12 +555,12 @@
std::vector<Comps*>::iterator it(m_compNames.begin());
for (int i(0), len(m_compNames.size()); i < len; ++i, ++it)
{
- if (m_compNames[i]->name == name)
- {
- delete m_compNames[i];
- m_compNames.erase(it);
- return;
- }
+ if (m_compNames[i]->name == name)
+ {
+ delete m_compNames[i];
+ m_compNames.erase(it);
+ return;
+ }
}
return;
}
@@ -569,12 +569,12 @@
std::vector<Mgr*>::iterator it(m_mgrNames.begin());
for (int i(0), len(m_mgrNames.size()); i < len; ++i, ++it)
{
- if (m_mgrNames[i]->name == name)
- {
- delete m_mgrNames[i];
- m_mgrNames.erase(it);
- return;
- }
+ if (m_mgrNames[i]->name == name)
+ {
+ delete m_mgrNames[i];
+ m_mgrNames.erase(it);
+ return;
+ }
}
return;
}
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrProvider.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrProvider.cpp 2016-12-13 08:09:10 UTC (rev 2819)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrProvider.cpp 2016-12-27 05:56:06 UTC (rev 2820)
@@ -166,10 +166,10 @@
CORBA::ULong len((CORBA::ULong)cdr.bufSize());
RTC_PARANOID(("converted CDR data size: %d", len));
- if (len == (CORBA::ULong)0) {
- RTC_ERROR(("buffer is empty."));
- return ::OpenRTM::BUFFER_EMPTY;
- }
+ if (len == (CORBA::ULong)0) {
+ RTC_ERROR(("buffer is empty."));
+ return ::OpenRTM::BUFFER_EMPTY;
+ }
#ifndef ORB_IS_RTORB
data->length(len);
cdr.get_octet_array(&((*data)[0]), len);
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortProvider.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortProvider.cpp 2016-12-13 08:09:10 UTC (rev 2819)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortProvider.cpp 2016-12-27 05:56:06 UTC (rev 2820)
@@ -74,10 +74,10 @@
bool OutPortProvider::publishInterface(SDOPackage::NVList& prop)
{
if (!NVUtil::isStringValue(prop,
- "dataport.interface_type",
- m_interfaceType.c_str()))
+ "dataport.interface_type",
+ m_interfaceType.c_str()))
{
- return false;
+ return false;
}
NVUtil::append(prop, m_properties);
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp 2016-12-13 08:09:10 UTC (rev 2819)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp 2016-12-27 05:56:06 UTC (rev 2820)
@@ -132,17 +132,17 @@
#ifndef ORB_IS_RTORB
const SDO_var sdo = sdo_list[i];
::OpenRTM::DataFlowComponent_var dfc;
- if (!sdoToDFC(sdo.in(), dfc.out())) { continue; }
+ if (!sdoToDFC(sdo.in(), dfc.out())) { continue; }
#else // ORB_IS_RTORB
const SDO_var sdo = sdo_list[i].object();
::OpenRTM::DataFlowComponent_var dfc;
::OpenRTM::DataFlowComponent_ptr dfc_ptr(dfc);
- if (!sdoToDFC(sdo.in(), dfc_ptr)) { continue; }
+ if (!sdoToDFC(sdo.in(), dfc_ptr)) { continue; }
#endif // ORB_IS_RTORB
- Member member(dfc.in());
+ Member member(dfc.in());
stopOwnedEC(member);
@@ -529,11 +529,11 @@
std::vector<std::string> createdPorts; // newPorts - interPorts
set_difference(oldPorts.begin(), oldPorts.end(),
- newPorts.begin(), newPorts.end(),
- std::back_inserter(removedPorts));
+ newPorts.begin(), newPorts.end(),
+ std::back_inserter(removedPorts));
set_difference(newPorts.begin(), newPorts.end(),
- oldPorts.begin(), oldPorts.end(),
- std::back_inserter(createdPorts));
+ oldPorts.begin(), oldPorts.end(),
+ std::back_inserter(createdPorts));
RTC_VERBOSE(("old ports: %s", ::coil::flatten(oldPorts).c_str()));
RTC_VERBOSE(("new ports: %s", ::coil::flatten(newPorts).c_str()));
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortAdmin.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortAdmin.cpp 2016-12-13 08:09:10 UTC (rev 2819)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortAdmin.cpp 2016-12-27 05:56:06 UTC (rev 2820)
@@ -164,7 +164,7 @@
index = CORBA_SeqUtil::find(m_portRefs, find_port_name(port_name));
if (index >= 0)
{//throw NotFound(port_name);
- return m_portRefs[index];
+ return m_portRefs[index];
}
return RTC::PortService::_nil();
}
@@ -240,7 +240,7 @@
{
if (!addPort(port))
{
- RTC_ERROR(("registerPort(PortBase&) failed."));
+ RTC_ERROR(("registerPort(PortBase&) failed."));
}
}
@@ -248,7 +248,7 @@
{
if (!addPort(port))
{
- RTC_ERROR(("registerPort(PortService_ptr) failed."));
+ RTC_ERROR(("registerPort(PortService_ptr) failed."));
}
}
@@ -263,21 +263,21 @@
{
try
{
- port.disconnect_all();
- // port.shutdown();
-
- const char* tmp(port.getProfile().name);
- CORBA_SeqUtil::erase_if(m_portRefs, find_port_name(tmp));
-
+ port.disconnect_all();
+ // port.shutdown();
+
+ const char* tmp(port.getProfile().name);
+ CORBA_SeqUtil::erase_if(m_portRefs, find_port_name(tmp));
+
PortableServer::ObjectId_var oid = m_pPOA->servant_to_id(&port);
- m_pPOA->deactivate_object(oid);
- port.setPortRef(RTC::PortService::_nil());
-
- return m_portServants.unregisterObject(tmp) == NULL ? false : true;
+ m_pPOA->deactivate_object(oid);
+ port.setPortRef(RTC::PortService::_nil());
+
+ return m_portServants.unregisterObject(tmp) == NULL ? false : true;
}
catch (...)
{
- return false;
+ return false;
}
}
@@ -285,12 +285,12 @@
{
try
{
- CORBA_SeqUtil::erase_if(m_portRefs, find_port(port));
- return true;
+ CORBA_SeqUtil::erase_if(m_portRefs, find_port(port));
+ return true;
}
catch (...)
{
- return false;
+ return false;
}
}
@@ -298,14 +298,14 @@
{
if (!removePort(port))
{
- RTC_ERROR(("deletePort(PortBase&) failed."));
+ RTC_ERROR(("deletePort(PortBase&) failed."));
}
}
void PortAdmin::deletePort(PortService_ptr port)
{
if (!removePort(port))
{
- RTC_ERROR(("deletePort(PortService_ptr) failed."));
+ RTC_ERROR(("deletePort(PortService_ptr) failed."));
}
}
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortBase.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortBase.cpp 2016-12-13 08:09:10 UTC (rev 2819)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortBase.cpp 2016-12-27 05:56:06 UTC (rev 2820)
@@ -162,9 +162,9 @@
if (index < 0)
{
- ConnectorProfile_var conn_prof;
- conn_prof = new ConnectorProfile();
- return conn_prof._retn();
+ ConnectorProfile_var conn_prof;
+ conn_prof = new ConnectorProfile();
+ return conn_prof._retn();
}
ConnectorProfile_var conn_prof;
conn_prof = new ConnectorProfile(m_profile.connector_profiles[index]);
@@ -185,26 +185,26 @@
if (isEmptyId(connector_profile))
{
Guard gurad(m_profile_mutex);
- // "connector_id" stores UUID which is generated at the initial Port
- // in connection process.
- setUUID(connector_profile);
- assert(!isExistingConnId(connector_profile.connector_id));
+ // "connector_id" stores UUID which is generated at the initial Port
+ // in connection process.
+ setUUID(connector_profile);
+ assert(!isExistingConnId(connector_profile.connector_id));
}
else
{
Guard gurad(m_profile_mutex);
- if (isExistingConnId(connector_profile.connector_id))
- {
+ if (isExistingConnId(connector_profile.connector_id))
+ {
RTC_ERROR(("Connection already exists."));
- return RTC::PRECONDITION_NOT_MET;
- }
+ return RTC::PRECONDITION_NOT_MET;
+ }
}
try
{
- RTC::PortService_ptr p;
- p = connector_profile.ports[(CORBA::ULong)0];
- ReturnCode_t ret = p->notify_connect(connector_profile);
+ RTC::PortService_ptr p;
+ p = connector_profile.ports[(CORBA::ULong)0];
+ ReturnCode_t ret = p->notify_connect(connector_profile);
if (ret != RTC::RTC_OK)
{
RTC_ERROR(("Connection failed. cleanup."));
@@ -214,7 +214,7 @@
}
catch (...)
{
- return RTC::BAD_PARAMETER;
+ return RTC::BAD_PARAMETER;
}
return RTC::RTC_ERROR;
}
@@ -283,7 +283,7 @@
}
else
{
- m_profile.connector_profiles[index] = connector_profile;
+ m_profile.connector_profiles[index] = connector_profile;
RTC_PARANOID(("Existing connector_id. Updated."));
}
@@ -345,7 +345,7 @@
if (index < 0)
{
RTC_ERROR(("Invalid connector id: %s", connector_id));
- return RTC::BAD_PARAMETER;
+ return RTC::BAD_PARAMETER;
}
ConnectorProfile prof;
@@ -405,7 +405,7 @@
if (index < 0)
{
RTC_ERROR(("Invalid connector id: %s", connector_id));
- return RTC::BAD_PARAMETER;
+ return RTC::BAD_PARAMETER;
}
ConnectorProfile& prof(m_profile.connector_profiles[(CORBA::ULong)index]);
@@ -627,15 +627,15 @@
{
CORBA::Long index;
index = CORBA_SeqUtil::find(connector_profile.ports,
- find_port_ref(m_profile.port_ref));
+ find_port_ref(m_profile.port_ref));
if (index < 0) return RTC::BAD_PARAMETER;
if (++index < static_cast<CORBA::Long>(connector_profile.ports.length()))
{
- RTC::PortService_ptr p;
- p = connector_profile.ports[index];
- return p->notify_connect(connector_profile);
+ RTC::PortService_ptr p;
+ p = connector_profile.ports[index];
+ return p->notify_connect(connector_profile);
}
return RTC::RTC_OK;
}
@@ -651,7 +651,7 @@
{
CORBA::ULong index;
index = CORBA_SeqUtil::find(cprof.ports,
- find_port_ref(m_profile.port_ref));
+ find_port_ref(m_profile.port_ref));
if (index < 0)
{
return RTC::BAD_PARAMETER;
@@ -757,7 +757,7 @@
bool PortBase::isExistingConnId(const char* id)
{
return CORBA_SeqUtil::find(m_profile.connector_profiles,
- find_conn_id(id)) >= 0;
+ find_conn_id(id)) >= 0;
}
/*!
@@ -771,7 +771,7 @@
{
CORBA::Long index;
index = CORBA_SeqUtil::find(m_profile.connector_profiles,
- find_conn_id(id));
+ find_conn_id(id));
return m_profile.connector_profiles[index];
}
@@ -785,7 +785,7 @@
CORBA::Long PortBase::findConnProfileIndex(const char* id)
{
return CORBA_SeqUtil::find(m_profile.connector_profiles,
- find_conn_id(id));
+ find_conn_id(id));
}
/*!
@@ -800,16 +800,16 @@
{
CORBA::Long index;
index = CORBA_SeqUtil::find(m_profile.connector_profiles,
- find_conn_id(connector_profile.connector_id));
+ find_conn_id(connector_profile.connector_id));
if (index < 0)
{
- CORBA_SeqUtil::push_back(m_profile.connector_profiles,
- connector_profile);
+ CORBA_SeqUtil::push_back(m_profile.connector_profiles,
+ connector_profile);
}
else
{
- m_profile.connector_profiles[index] = connector_profile;
+ m_profile.connector_profiles[index] = connector_profile;
}
}
@@ -824,7 +824,7 @@
{
CORBA::Long index;
index = CORBA_SeqUtil::find(m_profile.connector_profiles,
- find_conn_id(id));
+ find_conn_id(id));
if (index < 0) return false;
CORBA_SeqUtil::erase(m_profile.connector_profiles, index);
@@ -839,12 +839,12 @@
* @endif
*/
bool PortBase::appendInterface(const char* instance_name,
- const char* type_name,
- PortInterfacePolarity pol)
+ const char* type_name,
+ PortInterfacePolarity pol)
{
CORBA::Long index;
index = CORBA_SeqUtil::find(m_profile.interfaces,
- find_interface(instance_name, pol));
+ find_interface(instance_name, pol));
if (index >= 0) return false;
// setup PortInterfaceProfile
@@ -868,7 +868,7 @@
{
CORBA::Long index;
index = CORBA_SeqUtil::find(m_profile.interfaces,
- find_interface(name, pol));
+ find_interface(name, pol));
if (index < 0) return false;
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObject.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObject.cpp 2016-12-13 08:09:10 UTC (rev 2819)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObject.cpp 2016-12-27 05:56:06 UTC (rev 2820)
@@ -88,7 +88,7 @@
* @endif
*/
RTObject_impl::RTObject_impl(CORBA::ORB_ptr orb,
- PortableServer::POA_ptr poa)
+ PortableServer::POA_ptr poa)
: m_pManager(NULL),
m_pORB(CORBA::ORB::_duplicate(orb)),
m_pPOA(PortableServer::POA::_duplicate(poa)),
@@ -406,10 +406,10 @@
// deactivate myself on owned EC
CORBA_SeqUtil::for_each(m_ecMine,
- deactivate_comps(m_objref));
+ deactivate_comps(m_objref));
// deactivate myself on other EC
CORBA_SeqUtil::for_each(m_ecOther,
- deactivate_comps(m_objref));
+ deactivate_comps(m_objref));
// owned EC will be finalised later in finalizeContext().
@@ -598,7 +598,7 @@
ecs = ExecutionContextService::_narrow(exec_context);
if (CORBA::is_nil(ecs))
{
- return -1;
+ return -1;
}
// if m_ecOther has nil element, insert attached ec to there.
@@ -634,7 +634,7 @@
ecs = ExecutionContextService::_narrow(exec_context);
if (CORBA::is_nil(ecs))
{
- return -1;
+ return -1;
}
// if m_ecMine has nil element, insert attached ec to there.
@@ -676,13 +676,13 @@
if ((CORBA::ULong)ec_id < ECOTHER_OFFSET ||
(CORBA::ULong)(ec_id - ECOTHER_OFFSET) > len)
{
- return RTC::BAD_PARAMETER;
+ return RTC::BAD_PARAMETER;
}
::CORBA::ULong index(ec_id - ECOTHER_OFFSET);
if (CORBA::is_nil(m_ecOther[index]))
{
- return RTC::BAD_PARAMETER;
+ return RTC::BAD_PARAMETER;
}
m_ecOther[index] = ::RTC::ExecutionContextService::_nil();
@@ -707,8 +707,8 @@
RTC_TRACE(("get_component_profile()"));
try
{
- ComponentProfile_var profile
- = new ComponentProfile();
+ ComponentProfile_var profile
+ = new ComponentProfile();
#ifndef ORB_IS_RTORB
profile->instance_name =
CORBA::string_dup(m_properties["instance_name"].c_str());
@@ -734,11 +734,11 @@
profile->port_profiles = ppl._retn();
#endif // ORB_IS_RTORB
NVUtil::copyFromProperties(profile->properties, m_properties);
- return profile._retn();
+ return profile._retn();
}
catch (...)
{
- ; // This operation throws no exception.
+ ; // This operation throws no exception.
}
assert(false);
return 0;
@@ -757,11 +757,11 @@
RTC_TRACE(("get_ports()"));
try
{
- return m_portAdmin.getPortServiceList();
+ return m_portAdmin.getPortServiceList();
}
catch (...)
{
- ; // This operation throws no exception.
+ ; // This operation throws no exception.
}
assert(false);
return 0;
@@ -841,11 +841,11 @@
try
{
preOnFinalize(0);
- ret = onFinalize();
+ ret = onFinalize();
}
catch (...)
{
- ret = RTC::RTC_ERROR;
+ ret = RTC::RTC_ERROR;
}
postOnFinalize(0, ret);
return ret;
@@ -866,11 +866,11 @@
try
{
preOnStartup(ec_id);
- ret = onStartup(ec_id);
+ ret = onStartup(ec_id);
}
catch (...)
{
- ret = RTC::RTC_ERROR;
+ ret = RTC::RTC_ERROR;
}
postOnStartup(ec_id, ret);
return ret;
@@ -948,7 +948,7 @@
}
catch (...)
{
- ret = RTC::RTC_ERROR;
+ ret = RTC::RTC_ERROR;
}
postOnDeactivated(ec_id, ret);
return ret;
@@ -969,11 +969,11 @@
try
{
preOnAborting(ec_id);
- ret = onAborting(ec_id);
+ ret = onAborting(ec_id);
}
catch (...)
{
- ret = RTC::RTC_ERROR;
+ ret = RTC::RTC_ERROR;
}
postOnAborting(ec_id, ret);
return ret;
@@ -994,11 +994,11 @@
try
{
preOnError(ec_id);
- ret = onError(ec_id);
+ ret = onError(ec_id);
}
catch (...)
{
- ret = RTC::RTC_ERROR;
+ ret = RTC::RTC_ERROR;
}
m_configsets.update();
postOnError(ec_id, ret);
@@ -1020,11 +1020,11 @@
try
{
preOnReset(ec_id);
- ret = onReset(ec_id);
+ ret = onReset(ec_id);
}
catch (...)
{
- ret = RTC::RTC_ERROR;
+ ret = RTC::RTC_ERROR;
}
postOnReset(ec_id, ret);
return ret;
@@ -1046,13 +1046,13 @@
try
{
preOnExecute(ec_id);
- if (m_readAll) {readAll(); }
- ret = onExecute(ec_id);
- if (m_writeAll) { writeAll();}
+ if (m_readAll) {readAll(); }
+ ret = onExecute(ec_id);
+ if (m_writeAll) { writeAll();}
}
catch (...)
{
- ret = RTC::RTC_ERROR;
+ ret = RTC::RTC_ERROR;
}
postOnExecute(ec_id, ret);
return ret;
@@ -1074,12 +1074,12 @@
try
{
preOnStateUpdate(ec_id);
- ret = onStateUpdate(ec_id);
- m_configsets.update();
+ ret = onStateUpdate(ec_id);
+ m_configsets.update();
}
catch (...)
{
- ret = RTC::RTC_ERROR;
+ ret = RTC::RTC_ERROR;
}
postOnStateUpdate(ec_id, ret);
return ret;
@@ -1100,11 +1100,11 @@
try
{
preOnRateChanged(ec_id);
- ret = onRateChanged(ec_id);
+ ret = onRateChanged(ec_id);
}
catch (...)
{
- ret = RTC::RTC_ERROR;
+ ret = RTC::RTC_ERROR;
}
postOnRateChanged(ec_id, ret);
return ret;
@@ -1127,13 +1127,13 @@
RTC_TRACE(("get_owned_organizations()"));
try
{
- SDOPackage::OrganizationList_var org_list;
- org_list = new SDOPackage::OrganizationList(m_sdoOwnedOrganizations);
- return org_list._retn();
+ SDOPackage::OrganizationList_var org_list;
+ org_list = new SDOPackage::OrganizationList(m_sdoOwnedOrganizations);
+ return org_list._retn();
}
catch (...)
{
- throw SDOPackage::NotAvailable();
+ throw SDOPackage::NotAvailable();
}
return new SDOPackage::OrganizationList();
}
@@ -1148,18 +1148,18 @@
*/
char* RTObject_impl::get_sdo_id()
throw (CORBA::SystemException,
- SDOPackage::NotAvailable, SDOPackage::InternalError)
+ SDOPackage::NotAvailable, SDOPackage::InternalError)
{
RTC_TRACE(("get_sdo_id()"));
try
{
- CORBA::String_var sdo_id;
- sdo_id = CORBA::string_dup(m_profile.instance_name);
- return sdo_id._retn();
+ CORBA::String_var sdo_id;
+ sdo_id = CORBA::string_dup(m_profile.instance_name);
+ return sdo_id._retn();
}
catch (...)
{
- throw SDOPackage::InternalError("get_sdo_id()");
+ throw SDOPackage::InternalError("get_sdo_id()");
}
}
@@ -1172,18 +1172,18 @@
*/
char* RTObject_impl::get_sdo_type()
throw (CORBA::SystemException,
- SDOPackage::NotAvailable, SDOPackage::InternalError)
+ SDOPackage::NotAvailable, SDOPackage::InternalError)
{
RTC_TRACE(("get_sdo_type()"));
CORBA::String_var sdo_type;
try
{
- sdo_type = CORBA::string_dup(m_profile.description);
- return sdo_type._retn();
+ sdo_type = CORBA::string_dup(m_profile.description);
+ return sdo_type._retn();
}
catch (...)
{
- throw SDOPackage::InternalError("get_sdo_type()");
+ throw SDOPackage::InternalError("get_sdo_type()");
}
sdo_type = "";
return sdo_type._retn();
@@ -1198,19 +1198,19 @@
*/
SDOPackage::DeviceProfile* RTObject_impl::get_device_profile()
throw (CORBA::SystemException,
- SDOPackage::NotAvailable, SDOPackage::InternalError)
+ SDOPackage::NotAvailable, SDOPackage::InternalError)
{
RTC_TRACE(("get_device_profile()"));
try
{
- SDOPackage::DeviceProfile_var dprofile;
- dprofile =
+ SDOPackage::DeviceProfile_var dprofile;
+ dprofile =
new SDOPackage::DeviceProfile(m_pSdoConfigImpl->getDeviceProfile());
- return dprofile._retn();
+ return dprofile._retn();
}
catch (...)
{
- throw SDOPackage::InternalError("get_device_profile()");
+ throw SDOPackage::InternalError("get_device_profile()");
}
return new SDOPackage::DeviceProfile();
}
@@ -1227,20 +1227,20 @@
*/
SDOPackage::ServiceProfileList* RTObject_impl::get_service_profiles()
throw (CORBA::SystemException,
- SDOPackage::NotAvailable, SDOPackage::InternalError)
+ SDOPackage::NotAvailable, SDOPackage::InternalError)
{
RTC_TRACE(("get_service_profiles()"));
SDOPackage::ServiceProfileList_var sprofiles;
try
{
- sprofiles = m_sdoservice.getServiceProviderProfiles();
+ sprofiles = m_sdoservice.getServiceProviderProfiles();
RTC_DEBUG(("SDO ServiceProfiles[%d]", sprofiles->length()));
}
catch (...)
{
RTC_ERROR(("Unknown exception cought in get_service_profiles()."));
- throw SDOPackage::InternalError("get_service_profiles()");
+ throw SDOPackage::InternalError("get_service_profiles()");
}
return sprofiles._retn();
}
@@ -1255,8 +1255,8 @@
SDOPackage::ServiceProfile*
RTObject_impl::get_service_profile(const char* id)
throw (CORBA::SystemException,
- SDOPackage::InvalidParameter, SDOPackage::NotAvailable,
- SDOPackage::InternalError)
+ SDOPackage::InvalidParameter, SDOPackage::NotAvailable,
+ SDOPackage::InternalError)
{
if (!id)
{
@@ -1268,7 +1268,7 @@
SDOPackage::ServiceProfile_var prof;
try
{
- prof = m_sdoservice.getServiceProviderProfile(id);
+ prof = m_sdoservice.getServiceProviderProfile(id);
}
catch (SDOPackage::InvalidParameter &e)
{
@@ -1278,7 +1278,7 @@
catch (...)
{
RTC_ERROR(("Unknown exception cought in get_service_profile(%s).", id));
- throw SDOPackage::InternalError("get_service_profile()");
+ throw SDOPackage::InternalError("get_service_profile()");
}
return prof._retn();
}
@@ -1292,8 +1292,8 @@
*/
SDOPackage::SDOService_ptr RTObject_impl::get_sdo_service(const char* id)
throw (CORBA::SystemException,
- SDOPackage::InvalidParameter, SDOPackage::NotAvailable,
- SDOPackage::InternalError)
+ SDOPackage::InvalidParameter, SDOPackage::NotAvailable,
+ SDOPackage::InternalError)
{
RTC_TRACE(("get_sdo_service(%s))", id));
if (!id)
@@ -1304,7 +1304,7 @@
SDOPackage::SDOService_var sdo;
try
{
- sdo = m_sdoservice.getServiceProvider(id);
+ sdo = m_sdoservice.getServiceProvider(id);
}
catch (SDOPackage::InvalidParameter &e)
{
@@ -1312,7 +1312,7 @@
}
catch (...)
{
- throw SDOPackage::InternalError("get_service()");
+ throw SDOPackage::InternalError("get_service()");
}
return sdo;
}
@@ -1326,8 +1326,8 @@
*/
SDOPackage::Configuration_ptr RTObject_impl::get_configuration()
throw (CORBA::SystemException,
- SDOPackage::InterfaceNotImplemented, SDOPackage::NotAvailable,
- SDOPackage::InternalError)
+ SDOPackage::InterfaceNotImplemented, SDOPackage::NotAvailable,
+ SDOPackage::InternalError)
{
RTC_TRACE(("get_configuration()"));
if (m_pSdoConfig == NULL)
@@ -1335,18 +1335,18 @@
try
{
#ifdef ORB_IS_RTORB
- SDOPackage::Configuration_ptr config;
- config = m_pSdoConfig;
- return config;
+ SDOPackage::Configuration_ptr config;
+ config = m_pSdoConfig;
+ return config;
#else // ORB_IS_RTORB
- SDOPackage::Configuration_var config;
- config = m_pSdoConfig;
- return config._retn();
+ SDOPackage::Configuration_var config;
+ config = m_pSdoConfig;
+ return config._retn();
#endif // ORB_IS_RTORB
}
catch (...)
{
- SDOPackage::InternalError("get_configuration()");
+ SDOPackage::InternalError("get_configuration()");
}
return SDOPackage::Configuration::_nil();
}
@@ -1360,8 +1360,8 @@
*/
SDOPackage::Monitoring_ptr RTObject_impl::get_monitoring()
throw (CORBA::SystemException,
- SDOPackage::InterfaceNotImplemented, SDOPackage::NotAvailable,
- SDOPackage::InternalError)
+ SDOPackage::InterfaceNotImplemented, SDOPackage::NotAvailable,
+ SDOPackage::InternalError)
{
RTC_TRACE(("get_monitoring()"));
throw SDOPackage::InterfaceNotImplemented();
@@ -1377,19 +1377,19 @@
*/
SDOPackage::OrganizationList* RTObject_impl::get_organizations()
throw (CORBA::SystemException,
- SDOPackage::NotAvailable, SDOPackage::InternalError)
+ SDOPackage::NotAvailable, SDOPackage::InternalError)
{
RTC_TRACE(("get_organizations()"));
m_sdoOrganizations = m_pSdoConfigImpl->getOrganizations();
try
{
- SDOPackage::OrganizationList_var org;
- org = new SDOPackage::OrganizationList(m_sdoOrganizations);
- return org._retn();
+ SDOPackage::OrganizationList_var org;
+ org = new SDOPackage::OrganizationList(m_sdoOrganizations);
+ return org._retn();
}
catch (...)
{
- throw SDOPackage::InternalError("get_organizations()");
+ throw SDOPackage::InternalError("get_organizations()");
}
return new SDOPackage::OrganizationList(0);
}
@@ -1403,18 +1403,18 @@
*/
SDOPackage::NVList* RTObject_impl::get_status_list()
throw (CORBA::SystemException,
- SDOPackage::NotAvailable, SDOPackage::InternalError)
+ SDOPackage::NotAvailable, SDOPackage::InternalError)
{
RTC_TRACE(("get_status_list()"));
try
{
- NVList_var status;
- status = new NVList(m_sdoStatus);
- return status._retn();
+ NVList_var status;
+ status = new NVList(m_sdoStatus);
+ return status._retn();
}
catch (...)
{
- SDOPackage::InternalError("get_status_list()");
+ SDOPackage::InternalError("get_status_list()");
}
return new SDOPackage::NVList(0);
}
@@ -1428,8 +1428,8 @@
*/
CORBA::Any* RTObject_impl::get_status(const char* name)
throw (CORBA::SystemException,
- SDOPackage::InvalidParameter, SDOPackage::NotAvailable,
- SDOPackage::InternalError)
+ SDOPackage::InvalidParameter, SDOPackage::NotAvailable,
+ SDOPackage::InternalError)
{
RTC_TRACE(("get_status(%s)", name));
CORBA::Long index;
@@ -1438,13 +1438,13 @@
throw SDOPackage::InvalidParameter("get_status(): Not found");
try
{
- CORBA::Any_var status;
- status = new CORBA::Any(m_sdoStatus[index].value);
- return status._retn();
+ CORBA::Any_var status;
+ status = new CORBA::Any(m_sdoStatus[index].value);
+ return status._retn();
}
catch (...)
{
- throw SDOPackage::InternalError("get_status()");
+ throw SDOPackage::InternalError("get_status()");
}
return new CORBA::Any();
}
@@ -1671,7 +1671,7 @@
* @endif
*/
bool RTObject_impl::addOutPort(const char* name,
- OutPortBase& outport)
+ OutPortBase& outport)
{
RTC_TRACE(("addOutPort(%s)", name));
@@ -1694,7 +1694,7 @@
}
void RTObject_impl::registerOutPort(const char* name,
- OutPortBase& outport)
+ OutPortBase& outport)
{
RTC_TRACE(("registerOutPort(%s)", name));
@@ -1720,15 +1720,15 @@
if (ret)
{
- while (it != m_inports.end())
- {
- if ( (*it) == &inport )
- {
- m_inports.erase(it);
- return true;
- }
- ++it;
- }
+ while (it != m_inports.end())
+ {
+ if ( (*it) == &inport )
+ {
+ m_inports.erase(it);
+ return true;
+ }
+ ++it;
+ }
}
return false;
@@ -1749,16 +1749,16 @@
if (ret)
{
- std::vector<OutPortBase*>::iterator it = m_outports.begin();
- while (it != m_outports.end())
- {
- if ( (*it) == &outport )
- {
- m_outports.erase(it);
- return true;
- }
- ++it;
- }
+ std::vector<OutPortBase*>::iterator it = m_outports.begin();
+ while (it != m_outports.end())
+ {
+ if ( (*it) == &outport )
+ {
+ m_outports.erase(it);
+ return true;
+ }
+ ++it;
+ }
}
return false;
@@ -2011,14 +2011,14 @@
while( it != it_end )
{
- if (!((*it)->read()))
- {
- RTC_DEBUG(("The error occurred in readAll()."));
- ret = false;
- if (!m_readAllCompletion)
- return false;
- }
- ++it;
+ if (!((*it)->read()))
+ {
+ RTC_DEBUG(("The error occurred in readAll()."));
+ ret = false;
+ if (!m_readAllCompletion)
+ return false;
+ }
+ ++it;
}
return ret;
@@ -2043,14 +2043,14 @@
while( it != it_end )
{
- if (!((*it)->write()))
- {
- RTC_DEBUG(("The error occurred in writeAll()."));
- ret = false;
- if (!m_writeAllCompletion)
- return false;
- }
- ++it;
+ if (!((*it)->write()))
+ {
+ RTC_DEBUG(("The error occurred in writeAll()."));
+ ret = false;
+ if (!m_writeAllCompletion)
+ return false;
+ }
+ ++it;
}
return ret;
}
@@ -2165,7 +2165,7 @@
// never throws exception
RTC_ERROR(("Unknown exception caught."));
}
- RTC::ExecutionContextFactory::instance().deleteObject(m_eclist[i]);
+ RTC::ExecutionContextFactory::instance().deleteObject(m_eclist[i]);
}
if (!m_eclist.empty())
{
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoConfiguration.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoConfiguration.cpp 2016-12-13 08:09:10 UTC (rev 2819)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoConfiguration.cpp 2016-12-27 05:56:06 UTC (rev 2820)
@@ -77,7 +77,7 @@
*/
void
toConfigurationSet(SDOPackage::ConfigurationSet& conf,
- const coil::Properties& prop)
+ const coil::Properties& prop)
{
#ifndef ORB_IS_RTORB
conf.description = CORBA::string_dup(prop["description"].c_str());
@@ -130,19 +130,19 @@
CORBA::Boolean
Configuration_impl::set_device_profile(const DeviceProfile& dProfile)
throw (CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError)
+ InvalidParameter, NotAvailable, InternalError)
{
RTC_TRACE(("set_device_profile()"));
try
{
- Guard gurad(m_dprofile_mutex);
- m_deviceProfile = dProfile;
+ Guard gurad(m_dprofile_mutex);
+ m_deviceProfile = dProfile;
}
catch (...)
{
- throw InternalError("Unknown Error");
- // never reach here
- return false;
+ throw InternalError("Unknown Error");
+ // never reach here
+ return false;
}
return true;
}
@@ -157,7 +157,7 @@
CORBA::Boolean
Configuration_impl::add_service_profile(const ServiceProfile& sProfile)
throw (CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError)
+ InvalidParameter, NotAvailable, InternalError)
{
RTC_TRACE(("add_service_profile()"));
// SDO specification defines that InvalidParameter() exception
@@ -171,7 +171,7 @@
}
catch (...)
{
- throw InternalError("Configuration::set_service_profile");
+ throw InternalError("Configuration::set_service_profile");
}
return false;
}
@@ -186,19 +186,19 @@
CORBA::Boolean
Configuration_impl::add_organization(Organization_ptr org)
throw (CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError)
+ InvalidParameter, NotAvailable, InternalError)
{
RTC_TRACE(("add_organization()"));
try
{
- CORBA_SeqUtil::push_back(m_organizations,
+ CORBA_SeqUtil::push_back(m_organizations,
::SDOPackage::Organization::_duplicate(org));
}
catch (...)
{
- throw InternalError("Configuration::set_service_profile");
- // never reach here
- return false;
+ throw InternalError("Configuration::set_service_profile");
+ // never reach here
+ return false;
}
return true;
}
@@ -213,7 +213,7 @@
CORBA::Boolean
Configuration_impl::remove_service_profile(const char* id)
throw (CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError)
+ InvalidParameter, NotAvailable, InternalError)
{
RTC_TRACE(("remove_service_profile(%s)", id));
try
@@ -222,7 +222,7 @@
}
catch (...)
{
- throw InternalError("Configuration::remove_service_profile");
+ throw InternalError("Configuration::remove_service_profile");
}
return false;
}
@@ -237,19 +237,19 @@
CORBA::Boolean
Configuration_impl::remove_organization(const char* organization_id)
throw (CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError)
+ InvalidParameter, NotAvailable, InternalError)
{
RTC_TRACE(("remove_organization(%s)", organization_id));
try
{
- Guard gurad(m_org_mutex);
- CORBA_SeqUtil::erase_if(m_organizations, org_id(organization_id));
+ Guard gurad(m_org_mutex);
+ CORBA_SeqUtil::erase_if(m_organizations, org_id(organization_id));
}
catch (...)
{
- throw InternalError("Configuration::remove_organization");
- // never reach here
- return false;
+ throw InternalError("Configuration::remove_organization");
+ // never reach here
+ return false;
}
return true;
}
@@ -267,20 +267,20 @@
ParameterList*
Configuration_impl::get_configuration_parameters()
throw (CORBA::SystemException,
- NotAvailable, InternalError)
+ NotAvailable, InternalError)
{
RTC_TRACE(("get_configuration_parameters()"));
try
{
- Guard gaurd(m_params_mutex);
- ParameterList_var param;
- param = new ParameterList(m_parameters);
- return param._retn();
+ Guard gaurd(m_params_mutex);
+ ParameterList_var param;
+ param = new ParameterList(m_parameters);
+ return param._retn();
}
catch (...)
{
- throw InternalError("Configuration::get_configuration_parameters()");
- //never reach here
+ throw InternalError("Configuration::get_configuration_parameters()");
+ //never reach here
}
// never reach here
return new ParameterList(0);
@@ -296,7 +296,7 @@
NVList*
Configuration_impl::get_configuration_parameter_values()
throw (CORBA::SystemException,
- NotAvailable, InternalError)
+ NotAvailable, InternalError)
{
RTC_TRACE(("get_configuration_parameter_values()"));
Guard guard(m_config_mutex);
@@ -324,7 +324,7 @@
CORBA::Any*
Configuration_impl::get_configuration_parameter_value(const char* name)
throw (CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError)
+ InvalidParameter, NotAvailable, InternalError)
{
RTC_TRACE(("get_configuration_parameter_value(%s)", name));
if (std::string(name).empty()) throw InvalidParameter("Name is empty.");
@@ -355,9 +355,9 @@
*/
CORBA::Boolean
Configuration_impl::set_configuration_parameter(const char* name,
- const CORBA::Any& value)
+ const CORBA::Any& value)
throw (CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError)
+ InvalidParameter, NotAvailable, InternalError)
{
RTC_TRACE(("set_configuration_parameter(%s, value)", name));
/*
@@ -386,25 +386,25 @@
ConfigurationSetList*
Configuration_impl::get_configuration_sets()
throw (CORBA::SystemException,
- NotAvailable, InternalError)
+ NotAvailable, InternalError)
{
RTC_TRACE(("get_configuration_sets()"));
try
{
- Guard guard(m_config_mutex);
-
- std::vector<coil::Properties*> cf(m_configsets.getConfigurationSets());
- ConfigurationSetList_var config_sets =
+ Guard guard(m_config_mutex);
+
+ std::vector<coil::Properties*> cf(m_configsets.getConfigurationSets());
+ ConfigurationSetList_var config_sets =
new ConfigurationSetList((CORBA::ULong)cf.size());
// Ctor's first arg is max length. Actual length has to be set.
config_sets->length((CORBA::ULong)cf.size());
- for (CORBA::ULong i(0), len(cf.size()); i < len; ++i)
- {
- toConfigurationSet(config_sets[i], *(cf[i]));
- }
-
- return config_sets._retn();
+ for (CORBA::ULong i(0), len(cf.size()); i < len; ++i)
+ {
+ toConfigurationSet(config_sets[i], *(cf[i]));
+ }
+
+ return config_sets._retn();
}
catch (CORBA::SystemException& e)
{
@@ -413,13 +413,13 @@
#else
RTC_ERROR(("CORBA::SystemException cought."));
#endif
- throw InternalError("Configuration::get_configuration_sets()");
+ throw InternalError("Configuration::get_configuration_sets()");
}
catch (...)
{
RTC_ERROR(("Unknown exception cought."));
- throw InternalError("Configuration::get_configuration_sets()");
+ throw InternalError("Configuration::get_configuration_sets()");
}
// never reach here
return new ConfigurationSetList(0);
@@ -435,7 +435,7 @@
ConfigurationSet*
Configuration_impl::get_configuration_set(const char* id)
throw (CORBA::SystemException,
- NotAvailable, InternalError)
+ NotAvailable, InternalError)
{
RTC_TRACE(("get_configuration_set(%s)", id));
if (std::string(id).empty()) throw InternalError("ID is empty");
@@ -462,15 +462,15 @@
try
{
- ConfigurationSet_var config;
- config = new ConfigurationSet();
- toConfigurationSet(config, configset);
+ ConfigurationSet_var config;
+ config = new ConfigurationSet();
+ toConfigurationSet(config, configset);
- return config._retn();
+ return config._retn();
}
catch (...)
{
- throw InternalError("Configuration::get_configuration_set()");
+ throw InternalError("Configuration::get_configuration_set()");
}
// never reach here
@@ -489,7 +489,7 @@
Configuration_impl::
set_configuration_set_values(const ConfigurationSet& configuration_set)
throw (CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError)
+ InvalidParameter, NotAvailable, InternalError)
{
RTC_TRACE(("set_configuration_set_values()"));
std::string id(configuration_set.id);
@@ -498,12 +498,12 @@
try
{
coil::Properties conf(id.c_str());
- toProperties(conf, configuration_set);
+ toProperties(conf, configuration_set);
- //------------------------------------------------------------
- // Because the format of port-name had been changed from
- // <port_name> to <instance_name>.<port_name>, the following
- // processing was added. (since r1648)
+ //------------------------------------------------------------
+ // Because the format of port-name had been changed from
+ // <port_name> to <instance_name>.<port_name>, the following
+ // processing was added. (since r1648)
if (conf.findNode("exported_ports") != 0)
{
coil::vstring
@@ -527,13 +527,13 @@
}
conf["exported_ports"] = exported_ports_str;
}
- //------------------------------------------------------------
+ //------------------------------------------------------------
- return m_configsets.setConfigurationSetValues(conf);
+ return m_configsets.setConfigurationSetValues(conf);
}
catch (...)
{
- throw InternalError("Configuration::set_configuration_set_values()");
+ throw InternalError("Configuration::set_configuration_set_values()");
}
return true;
}
@@ -548,7 +548,7 @@
ConfigurationSet*
Configuration_impl::get_active_configuration_set()
throw (CORBA::SystemException,
- NotAvailable, InternalError)
+ NotAvailable, InternalError)
{
RTC_TRACE(("get_active_configuration_set()"));
// activeなConfigurationSetは無い
@@ -556,16 +556,16 @@
try
{
- Guard gurad(m_config_mutex);
- // activeなConfigurationSetを返す
- ConfigurationSet_var config;
- config = new ConfigurationSet();
- toConfigurationSet(config, m_configsets.getActiveConfigurationSet());
- return config._retn();
+ Guard gurad(m_config_mutex);
+ // activeなConfigurationSetを返す
+ ConfigurationSet_var config;
+ config = new ConfigurationSet();
+ toConfigurationSet(config, m_configsets.getActiveConfigurationSet());
+ return config._retn();
}
catch (...)
{
- throw InternalError("Configuration::get_active_configuration_set()");
+ throw InternalError("Configuration::get_active_configuration_set()");
}
// never reach here
return new ConfigurationSet();
@@ -582,25 +582,25 @@
Configuration_impl::
add_configuration_set(const ConfigurationSet& configuration_set)
throw (CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError)
+ InvalidParameter, NotAvailable, InternalError)
{
RTC_TRACE(("add_configuration_set()"));
try
{
- Guard gurad(m_config_mutex);
- const char* config_id(configuration_set.id);
-// const char* config_value(configuration_set.description);
-// RTC::Properties config(config_id);
- coil::Properties config(config_id);
-// coil::Properties config(config_id,config_value);
- toProperties(config, configuration_set);
+ Guard gurad(m_config_mutex);
+ const char* config_id(configuration_set.id);
+// const char* config_value(configuration_set.description);
+// RTC::Properties config(config_id);
+ coil::Properties config(config_id);
+// coil::Properties config(config_id,config_value);
+ toProperties(config, configuration_set);
// config["description"] = configuration_set.description;
- return m_configsets.addConfigurationSet(config);
+ return m_configsets.addConfigurationSet(config);
}
catch (...)
{
- throw InternalError("Configuration::add_configuration_set()");
- return false;
+ throw InternalError("Configuration::add_configuration_set()");
+ return false;
}
return true;
}
@@ -615,7 +615,7 @@
CORBA::Boolean
Configuration_impl::remove_configuration_set(const char* id)
throw (CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError)
+ InvalidParameter, NotAvailable, InternalError)
{
RTC_TRACE(("remove_configuration_set(%s)", id));
if (std::string(id).empty())
@@ -623,13 +623,13 @@
try
{
- Guard guard(m_config_mutex);
- return m_configsets.removeConfigurationSet(id);
+ Guard guard(m_config_mutex);
+ return m_configsets.removeConfigurationSet(id);
}
catch (...)
{
- throw InternalError("Configuration::remove_configuration_set()");
- return false;
+ throw InternalError("Configuration::remove_configuration_set()");
+ return false;
}
return false;
}
@@ -644,7 +644,7 @@
CORBA::Boolean
Configuration_impl::activate_configuration_set(const char* id)
throw (CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError)
+ InvalidParameter, NotAvailable, InternalError)
{
RTC_TRACE(("activate_configuration_set(%s)", id));
if (std::string(id).empty())
@@ -656,17 +656,17 @@
}
else
{
- throw InvalidParameter("Configuration::activate_configuration_set()");
+ throw InvalidParameter("Configuration::activate_configuration_set()");
}
/*
try
{
- return m_configsets.activateConfigurationSet(id);
+ return m_configsets.activateConfigurationSet(id);
}
catch (...)
{
- throw InternalError("Configuration::activate_configuration_set()");
- return false;
+ throw InternalError("Configuration::activate_configuration_set()");
+ return false;
}
*/
return false;
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoOrganization.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoOrganization.cpp 2016-12-13 08:09:10 UTC (rev 2819)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoOrganization.cpp 2016-12-27 05:56:06 UTC (rev 2820)
@@ -82,7 +82,7 @@
*/
char* Organization_impl::get_organization_id()
throw (CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError)
+ InvalidParameter, NotAvailable, InternalError)
{
RTC_TRACE(("get_organization_id() = %s", m_pId.c_str()));
return CORBA::string_dup(m_pId.c_str());
@@ -97,7 +97,7 @@
*/
OrganizationProperty* Organization_impl::get_organization_property()
throw (CORBA::SystemException,
- NotAvailable, InternalError)
+ NotAvailable, InternalError)
{
RTC_TRACE(("get_organization_property()"));
Guard guard(m_org_mutex);
@@ -116,7 +116,7 @@
CORBA::Any*
Organization_impl::get_organization_property_value(const char* name)
throw (CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError)
+ InvalidParameter, NotAvailable, InternalError)
{
RTC_TRACE(("get_organization_property_value(%s)", name));
if (std::string(name).empty())
@@ -130,13 +130,13 @@
try
{
- CORBA::Any_var value;
- value = new CORBA::Any(m_orgProperty.properties[index].value);
- return value._retn();
+ CORBA::Any_var value;
+ value = new CORBA::Any(m_orgProperty.properties[index].value);
+ return value._retn();
}
catch (...)
{
- throw InternalError("get_organization_property_value()");
+ throw InternalError("get_organization_property_value()");
}
// never reach here
return new CORBA::Any();
@@ -153,18 +153,18 @@
Organization_impl::
add_organization_property(const OrganizationProperty& organization_property)
throw (CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError)
+ InvalidParameter, NotAvailable, InternalError)
{
RTC_TRACE(("add_organization_property()"));
try
{
- Guard guard(m_org_mutex);
- m_orgProperty = organization_property;
- return true;
+ Guard guard(m_org_mutex);
+ m_orgProperty = organization_property;
+ return true;
}
catch (...)
{
- throw InternalError("set_organization_property()");
+ throw InternalError("set_organization_property()");
}
return false;
}
@@ -178,28 +178,28 @@
*/
CORBA::Boolean
Organization_impl::set_organization_property_value(const char* name,
- const CORBA::Any& value)
+ const CORBA::Any& value)
throw (CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError)
+ InvalidParameter, NotAvailable, InternalError)
{
RTC_TRACE(("set_organization_property_value(name=%s)", name));
if (std::string(name).empty())
{
- throw InvalidParameter("set_organization_property_value(): Enpty name.");
+ throw InvalidParameter("set_organization_property_value(): Enpty name.");
}
CORBA::Long index;
index = CORBA_SeqUtil::find(m_orgProperty.properties,nv_name(name));
if (index < 0)
{
- NameValue nv;
- nv.name = CORBA::string_dup(name);
- nv.value = value;
- CORBA_SeqUtil::push_back(m_orgProperty.properties, nv);
+ NameValue nv;
+ nv.name = CORBA::string_dup(name);
+ nv.value = value;
+ CORBA_SeqUtil::push_back(m_orgProperty.properties, nv);
}
else
{
- m_orgProperty.properties[index].value = value;
+ m_orgProperty.properties[index].value = value;
}
return true;
}
@@ -214,7 +214,7 @@
CORBA::Boolean
Organization_impl::remove_organization_property(const char* name)
throw (CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError)
+ InvalidParameter, NotAvailable, InternalError)
{
RTC_TRACE(("remove_organization_property(%s)", name));
if (std::string(name).empty())
@@ -227,12 +227,12 @@
try
{
- CORBA_SeqUtil::erase(m_orgProperty.properties, index);
- return true;
+ CORBA_SeqUtil::erase(m_orgProperty.properties, index);
+ return true;
}
catch (...)
{
- throw InternalError("remove_organization_property()");
+ throw InternalError("remove_organization_property()");
}
return false;
}
@@ -246,7 +246,7 @@
*/
SDOSystemElement_ptr Organization_impl::get_owner()
throw (CORBA::SystemException,
- NotAvailable, InternalError)
+ NotAvailable, InternalError)
{
RTC_TRACE(("get_owner()"));
return m_varOwner._retn();
@@ -261,19 +261,19 @@
*/
CORBA::Boolean Organization_impl::set_owner(SDOSystemElement_ptr sdo)
throw (CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError)
+ InvalidParameter, NotAvailable, InternalError)
{
RTC_TRACE(("set_owner()"));
if (CORBA::is_nil(sdo))
throw InvalidParameter("set_owner()");
try
{
- m_varOwner = SDOSystemElement::_duplicate(sdo);
- return true;
+ m_varOwner = SDOSystemElement::_duplicate(sdo);
+ return true;
}
catch (...)
{
- throw InternalError("set_owner()");
+ throw InternalError("set_owner()");
}
return true;
}
@@ -287,18 +287,18 @@
*/
SDOList* Organization_impl::get_members()
throw (CORBA::SystemException,
- NotAvailable, InternalError)
+ NotAvailable, InternalError)
{
RTC_TRACE(("get_members()"));
try
{
- SDOList_var sdos;
- sdos = new SDOList(m_memberList);
- return sdos._retn();
+ SDOList_var sdos;
+ sdos = new SDOList(m_memberList);
+ return sdos._retn();
}
catch (...)
{
- throw InternalError("get_members()");
+ throw InternalError("get_members()");
}
}
@@ -311,19 +311,19 @@
*/
CORBA::Boolean Organization_impl::set_members(const SDOList& sdos)
throw (CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError)
+ InvalidParameter, NotAvailable, InternalError)
{
RTC_TRACE(("set_members()"));
if (sdos.length() < 0)
throw InvalidParameter("set_members(): number of SDOList is invalid.");
try
{
- m_memberList = sdos;
- return true;
+ m_memberList = sdos;
+ return true;
}
catch (...)
{
- throw InternalError("set_members()");
+ throw InternalError("set_members()");
}
return true;
}
@@ -337,7 +337,7 @@
*/
CORBA::Boolean Organization_impl::add_members(const SDOList& sdo_list)
throw (CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError)
+ InvalidParameter, NotAvailable, InternalError)
{
RTC_TRACE(("add_members()"));
if (sdo_list.length() < 0)
@@ -345,14 +345,14 @@
try
{
if (sdo_list.length() == 0) return true;
- CORBA_SeqUtil::push_back_list(m_memberList, sdo_list);
- return true;
+ CORBA_SeqUtil::push_back_list(m_memberList, sdo_list);
+ return true;
}
catch (...)
{
- throw InternalError("add_members()");
+ throw InternalError("add_members()");
}
- return false;
+ return false;
}
/*!
@@ -364,7 +364,7 @@
*/
CORBA::Boolean Organization_impl::remove_member(const char* id)
throw (CORBA::SystemException,
- InvalidParameter, NotAvailable, InternalError)
+ InvalidParameter, NotAvailable, InternalError)
{
RTC_TRACE(("remove_member(%s)", id));
@@ -385,13 +385,13 @@
try
{
- CORBA_SeqUtil::erase(m_memberList, index);
- return true;
+ CORBA_SeqUtil::erase(m_memberList, index);
+ return true;
}
catch (...)
{
RTC_ERROR(("unknown exception"));
- throw InternalError("remove_member(): Not found.");
+ throw InternalError("remove_member(): Not found.");
}
return false;
}
@@ -405,7 +405,7 @@
*/
DependencyType Organization_impl::get_dependency()
throw (CORBA::SystemException,
- NotAvailable, InternalError)
+ NotAvailable, InternalError)
{
RTC_TRACE(("get_dependency()"));
return m_dependency;
@@ -420,17 +420,17 @@
*/
CORBA::Boolean Organization_impl::set_dependency(DependencyType dependency)
throw (CORBA::SystemException,
- NotAvailable, InternalError)
+ NotAvailable, InternalError)
{
RTC_TRACE(("set_dependency()"));
try
{
- m_dependency = dependency;
- return true;
+ m_dependency = dependency;
+ return true;
}
catch (...)
{
- throw InternalError("set_dependency(): Unknown.");
+ throw InternalError("set_dependency(): Unknown.");
}
return false;
}
More information about the openrtm-commit
mailing list