[openrtm-commit:02248] r2856 - in branches/DEV_IQ_2016/OpenRTM-aist/src/lib: coil/common coil/posix/coil rtm
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 1月 18日 (水) 13:28:17 JST
Author: sec_fukai
Date: 2017-01-18 13:28:17 +0900 (Wed, 18 Jan 2017)
New Revision: 2856
Modified:
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Allocator.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/PeriodicTask.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Properties.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/TimeMeasure.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/TimeValue.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Timer.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/crc.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/stringutil.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Process.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Routing.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/UUID.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ComponentActionListener.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigAdmin.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigurationListener.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaPort.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContext.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextWorker.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExtTrigExecutionContext.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Factory.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortBase.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortDirectProvider.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPullConnector.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPushConnector.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerActionListener.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerConfig.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerServant.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/NumberingPolicy.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/OutPortPullConnector.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortPushConnector.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortConnectListener.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortProfileHelper.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherFlush.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherNew.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherPeriodic.cpp
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTCUtil.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
branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SystemLogger.cpp
Log:
[compat,->DEV_IQ_2016]Delete extra spaces. refs #3809
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Allocator.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Allocator.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Allocator.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -21,7 +21,7 @@
namespace coil
{
-
+
/*!
* @if jp
* @brief メモリ領域確保
@@ -33,7 +33,7 @@
{
return operator new(t);
}
-
+
/*!
* @if jp
* @brief メモリ領域解放
@@ -57,7 +57,7 @@
{
return operator new[](t);
}
-
+
/*!
* @if jp
* @brief 配列用メモリ領域解放
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/PeriodicTask.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/PeriodicTask.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/PeriodicTask.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -37,7 +37,7 @@
m_periodCount(0), m_periodCountMax(10)
{
}
-
+
/*!
* @if jp
* @brief デストラクタ
@@ -148,7 +148,7 @@
m_func = func;
return true;
}
-
+
/*!
* @if jp
* @brief タスク実行周期をセットする
@@ -317,7 +317,7 @@
* @endif
*/
void PeriodicTask::sleep()
- {
+ {
if (m_nowait)
{
return;
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 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Properties.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -39,7 +39,7 @@
{
leaf.clear();
}
-
+
/*!
* @if jp
* @brief コンストラクタ(mapでデフォルト値を与える)
@@ -53,14 +53,14 @@
leaf.clear();
std::map<std::string, std::string>::iterator it(defaults.begin());
std::map<std::string, std::string>::iterator it_end(defaults.end());
-
+
while (it != it_end)
{
setDefault(it->first.c_str(), it->second.c_str());
++it;
}
}
-
+
/*!
* @if jp
* @brief コンストラクタ(char*[] でデフォルト値を与える)
@@ -74,7 +74,7 @@
leaf.clear();
setDefaults(defaults, num);
}
-
+
/*!
* @if jp
* @brief コピーコンストラクタ
@@ -98,7 +98,7 @@
}
}
}
-
+
/*!
* @if jp
* @brief 代入演算子
@@ -112,7 +112,7 @@
name = prop.name;
value = prop.value;
default_value = prop.default_value;
-
+
std::vector<std::string> keys;
keys = prop.propertyNames();
for (size_t i(0), len(keys.size()); i < len; ++i)
@@ -124,10 +124,10 @@
setProperty(keys[i], node->value);
}
}
-
+
return *this;
}
-
+
/*!
* @if jp
* @brief デストラクタ
@@ -136,17 +136,17 @@
* @endif
*/
Properties::~Properties(void)
- {
+ {
// Delete children
clear();
-
+
// delete myself from parent
if (root != NULL)
{
root->removeNode(name.c_str());
}
};
-
+
//============================================================
// public fnctions
//============================================================
@@ -168,7 +168,7 @@
}
return m_empty;
}
-
+
/*!
* @if jp
* @brief 指定されたキーを持つプロパティを、プロパティリストから探す
@@ -180,10 +180,10 @@
const std::string& def) const
{
const std::string& value((*this)[key]);
-
+
return value.empty() ? def : value;
}
-
+
/*!
* @if jp
* @brief 指定されたキーを持つプロパティを、プロパティリストから探す
@@ -195,7 +195,7 @@
{
return getProperty(key);
}
-
+
/*!
* @if jp
* @brief 指定されたキーを持つプロパティを、プロパティリストから探す
@@ -207,10 +207,10 @@
{
setProperty(key, getProperty(key));
Properties& prop(getNode(key));
-
+
return prop.value;
}
-
+
/*!
* @if jp
* @brief 指定されたキーに対してデフォルト値を取得する
@@ -229,7 +229,7 @@
}
return m_empty;
}
-
+
/*!
* @if jp
* @brief Properties に value を key について登録する
@@ -242,7 +242,7 @@
{
std::vector<std::string> keys;
split(key, '.', keys);
-
+
Properties* curr(this);
for (size_t i(0), len(keys.size()); i < len; ++i)
{
@@ -259,7 +259,7 @@
curr->value = value;
return retval;
}
-
+
/*!
* @if jp
* @brief デフォルト値を登録する
@@ -272,7 +272,7 @@
{
std::vector<std::string> keys;
split(key, '.', keys);
-
+
Properties* curr(this);
for (size_t i(0), len(keys.size()); i < len; ++i)
{
@@ -288,7 +288,7 @@
curr->default_value = value;
return value;
}
-
+
/*!
* @if jp
* @brief Properties にデフォルト値をまとめて登録する
@@ -302,17 +302,17 @@
{
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());
}
}
-
+
//============================================================
// load and save functions
//============================================================
@@ -327,7 +327,7 @@
{
_store(out, "", this);
}
-
+
/*!
* @if jp
* @brief 入力ストリームからキーと要素が対になったプロパティリストを読み込む
@@ -338,13 +338,13 @@
void Properties::load(std::istream& inStream)
{
std::string pline;
-
+
while (!inStream.eof())
{
std::string tmp;
coil::getlinePortable(inStream, tmp);
coil::eraseHeadBlank(tmp);
-
+
// Skip comments or empty lines
if (tmp.empty())
{
@@ -354,7 +354,7 @@
{
continue;
}
-
+
// line-end '\' continues entry
if (tmp[tmp.size() - 1] == '\\'
&& !coil::isEscaped(tmp, tmp.size() - 1))
@@ -364,28 +364,28 @@
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();
}
}
-
+
/*!
* @if jp
* @brief プロパティリストを指定されたストリームに保存する
@@ -398,7 +398,7 @@
store(out, header);
return;
}
-
+
/*!
* @if jp
* @brief プロパティリストを出力ストリームへ保存する
@@ -411,7 +411,7 @@
out << "# " << header << std::endl;
_store(out, "", this);
}
-
+
//============================================================
// other util functions
//============================================================
@@ -431,7 +431,7 @@
}
return names;
}
-
+
/*!
* @if jp
* @brief プロパティの数を取得する
@@ -443,7 +443,7 @@
{
return static_cast<int>(propertyNames().size());
}
-
+
/*!
* @if jp
* @brief ノードを検索する
@@ -462,7 +462,7 @@
split(key, '.', keys);
return _getNode(keys, 0, this);
}
-
+
/*!
* @if jp
* @brief ノードを取得する
@@ -498,8 +498,8 @@
{
return false;
}
-
- if (findNode(key) != 0)
+
+ if (findNode(key) != 0)
{
return false;
}
@@ -530,7 +530,7 @@
}
return NULL;
}
-
+
/*!
* @if jp
* @brief 子ノードにkeyがあるかどうか
@@ -549,7 +549,7 @@
}
return NULL;
}
-
+
/*!
* @if jp
* @brief 子ノードを全て削除する
@@ -565,7 +565,7 @@
delete leaf.back(); // back() returns always new
}
}
-
+
/*!
* @if jp
* @brief Propertyをマージする
@@ -583,7 +583,7 @@
}
return (*this);
}
-
+
//------------------------------------------------------------
// Protected functions
//------------------------------------------------------------
@@ -599,7 +599,7 @@
{
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))
@@ -614,7 +614,7 @@
}
++i;
}
-
+
// If no ':' or '=' exist, ' ' would be delimiter.
i = 0;
while (i < len)
@@ -631,12 +631,12 @@
}
++i;
}
-
+
key = str;
value = "";
return;
}
-
+
/*!
* @if jp
* @brief 文字列を分割する
@@ -648,10 +648,10 @@
std::vector<std::string>& value)
{
if (str.empty()) return false;
-
+
std::string::size_type begin_it(0), end_it(0);
std::string::size_type len(str.size());
-
+
while (end_it < len)
{
if ((str[end_it] == delim) && !coil::isEscaped(str, end_it))
@@ -665,7 +665,7 @@
value.push_back(str.substr(begin_it, end_it));
return true;
}
-
+
/*!
* @if jp
* @brief プロパティを取得する
@@ -679,12 +679,12 @@
const Properties* curr)
{
Properties* next(curr->hasKey(keys[index].c_str()));
-
+
if (next == NULL)
{
return NULL;
}
-
+
if (index < keys.size() - 1) // node
{
return next->_getNode(keys, ++index, next);
@@ -695,7 +695,7 @@
}
return NULL;
}
-
+
/*!
* @if jp
* @brief プロパティの名称リストを取得する
@@ -724,7 +724,7 @@
}
return;
}
-
+
/*!
* @if jp
* @brief プロパティの名称リストを保存する
@@ -738,7 +738,7 @@
{
if (!curr->leaf.empty())
{
-
+
for (size_t i(0), len(curr->leaf.size()); i < len; ++i)
{
std::string next_name;
@@ -753,7 +753,7 @@
_store(out, next_name, curr->leaf[i]);
}
}
-
+
if (curr->root != NULL)
{
if (curr->value.length() > 0)
@@ -762,7 +762,7 @@
}
}
}
-
+
/*!
* @if jp
* @brief プロパティの内容を保存する
@@ -793,7 +793,7 @@
}
return out;
}
-
+
/*!
* @if jp
* @brief インデントを生成する
@@ -810,7 +810,7 @@
}
return space;
}
-
+
/*!
* @if jp
* @brief インデントを生成する
@@ -827,7 +827,7 @@
}
return space;
}
-
+
/*!
* @if jp
* @brief Propertyをストリームに出力する
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/TimeMeasure.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/TimeMeasure.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/TimeMeasure.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -26,7 +26,7 @@
#ifndef ULLONG_MAX
#define ULLONG_MAX 0xffffffffffffffffULL
-#endif
+#endif
namespace coil
{
@@ -147,11 +147,11 @@
double trecord(m_record[i]);
sum += trecord;
sq_sum += trecord * trecord;
-
+
if (trecord > max_interval) max_interval = trecord;
if (trecord < min_interval) min_interval = trecord;
}
-
+
mean_interval = sum / len;
stddev = sqrt(sq_sum / len - (mean_interval * mean_interval));
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/TimeValue.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/TimeValue.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/TimeValue.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -33,7 +33,7 @@
m_usec = usec;
normalize();
}
-
+
/*!
* @if jp
* @brief コンストラクタ
@@ -44,20 +44,20 @@
TimeValue::TimeValue(double timeval)
{
double dbHalfAdj;
- if ( timeval >= 0 )
- {
+ if ( timeval >= 0 )
+ {
dbHalfAdj = +0.5;
- }
+ }
else
- {
+ {
dbHalfAdj = -0.5;
- }
+ }
m_sec = (long int)timeval;
m_usec = (long)((timeval - (double)m_sec)
* TIMEVALUE_ONE_SECOND_IN_USECS + dbHalfAdj);
normalize();
}
-
+
/*!
* @if jp
* @brief 時間減算
@@ -97,7 +97,7 @@
res.normalize();
return res;
}
-
+
/*!
* @if jp
* @brief 時間加算
@@ -118,7 +118,7 @@
res.normalize();
return res;
}
-
+
/*!
* @if jp
* @brief double型→時間型変換
@@ -129,7 +129,7 @@
TimeValue TimeValue::operator=(double time)
{
double dbHalfAdj;
- if ( time >= 0 )
+ if ( time >= 0 )
{
dbHalfAdj = +0.5;
}
@@ -139,12 +139,12 @@
}
m_sec = (long)time;
- m_usec = (long)((time -
+ m_usec = (long)((time -
(double)m_sec)*TIMEVALUE_ONE_SECOND_IN_USECS + dbHalfAdj);
normalize();
return *this;
}
-
+
/*!
* @if jp
* @brief 時間型→double型変換
@@ -156,7 +156,7 @@
{
return (double)m_sec + ((double)m_usec/TIMEVALUE_ONE_SECOND_IN_USECS);
}
-
+
/*!
* @if jp
* @brief 符号判定
@@ -172,7 +172,7 @@
if (m_usec < 0) return -1;
return 0;
}
-
+
/*!
* @if jp
* @brief 正規化
@@ -189,7 +189,7 @@
++m_sec;
m_usec -= TIMEVALUE_ONE_SECOND_IN_USECS;
}
- while (m_usec >= TIMEVALUE_ONE_SECOND_IN_USECS) {}
+ while (m_usec >= TIMEVALUE_ONE_SECOND_IN_USECS);
}
else if (m_usec <= -TIMEVALUE_ONE_SECOND_IN_USECS)
{
@@ -198,9 +198,9 @@
--m_sec;
m_usec += TIMEVALUE_ONE_SECOND_IN_USECS;
}
- while (m_usec <= -TIMEVALUE_ONE_SECOND_IN_USECS) {}
+ while (m_usec <= -TIMEVALUE_ONE_SECOND_IN_USECS);
}
-
+
if (m_sec >= 1 && m_usec < 0)
{
--m_sec;
@@ -212,5 +212,5 @@
m_usec -= TIMEVALUE_ONE_SECOND_IN_USECS;
}
}
-
+
}; // namespace coil
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 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/Timer.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -32,7 +32,7 @@
: m_interval(interval), m_running(false)
{
}
-
+
/*!
* @if jp
* @brief デストラクタ
@@ -45,7 +45,7 @@
stop();
wait();
}
-
+
/*!
* @if jp
* @brief Timer 用スレッド生成
@@ -58,7 +58,7 @@
activate();
return 0;
}
-
+
/*!
* @if jp
* @brief Timer 用スレッド実行関数
@@ -76,7 +76,7 @@
}
return 0;
}
-
+
//============================================================
// public functions
//============================================================
@@ -90,13 +90,13 @@
void Timer::start()
{
Guard guard(m_runningMutex);
- if (!m_running)
+ if (!m_running)
{
m_running = true;
open(0);
}
}
-
+
/*!
* @if jp
* @brief Timer タスク停止
@@ -109,7 +109,7 @@
Guard guard(m_runningMutex);
m_running = false;
}
-
+
/*!
* @if jp
* @brief Timer タスク実行
@@ -130,7 +130,7 @@
}
}
}
-
+
/*!
* @if jp
* @brief リスナー登録
@@ -141,7 +141,7 @@
ListenerId Timer::registerListener(ListenerBase* listener, TimeValue tm)
{
Guard guard(m_taskMutex);
-
+
for (size_t i(0), len(m_tasks.size()); i < len; ++i)
{
if (m_tasks[i].listener == listener)
@@ -154,7 +154,7 @@
m_tasks.push_back(Task(listener, tm));
return listener;
}
-
+
/*!
* @if jp
* @brief リスナー登録解除
@@ -167,7 +167,7 @@
Guard guard(m_taskMutex);
std::vector<Task>::iterator it;
it = m_tasks.begin();
-
+
for (size_t i(0), len(m_tasks.size()); i < len; ++i, ++it)
{
if (m_tasks[i].listener == id)
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/crc.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/crc.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/crc.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -56,7 +56,7 @@
0xA56A, 0xB54B, 0x8528, 0x9509, 0xE5EE, 0xF5CF, 0xC5AC, 0xD58D,
0x3653, 0x2672, 0x1611, 0x0630, 0x76D7, 0x66F6, 0x5695, 0x46B4,
0xB75B, 0xA77A, 0x9719, 0x8738, 0xF7DF, 0xE7FE, 0xD79D, 0xC7BC,
-
+
0x48C4, 0x58E5, 0x6886, 0x78A7, 0x0840, 0x1861, 0x2802, 0x3823,
0xC9CC, 0xD9ED, 0xE98E, 0xF9AF, 0x8948, 0x9969, 0xA90A, 0xB92B,
0x5AF5, 0x4AD4, 0x7AB7, 0x6A96, 0x1A71, 0x0A50, 0x3A33, 0x2A12,
@@ -65,7 +65,7 @@
0xEDAE, 0xFD8F, 0xCDEC, 0xDDCD, 0xAD2A, 0xBD0B, 0x8D68, 0x9D49,
0x7E97, 0x6EB6, 0x5ED5, 0x4EF4, 0x3E13, 0x2E32, 0x1E51, 0x0E70,
0xFF9F, 0xEFBE, 0xDFDD, 0xCFFC, 0xBF1B, 0xAF3A, 0x9F59, 0x8F78,
-
+
0x9188, 0x81A9, 0xB1CA, 0xA1EB, 0xD10C, 0xC12D, 0xF14E, 0xE16F,
0x1080, 0x00A1, 0x30C2, 0x20E3, 0x5004, 0x4025, 0x7046, 0x6067,
0x83B9, 0x9398, 0xA3FB, 0xB3DA, 0xC33D, 0xD31C, 0xE37F, 0xF35E,
@@ -74,7 +74,7 @@
0x34E2, 0x24C3, 0x14A0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405,
0xA7DB, 0xB7FA, 0x8799, 0x97B8, 0xE75F, 0xF77E, 0xC71D, 0xD73C,
0x26D3, 0x36F2, 0x0691, 0x16B0, 0x6657, 0x7676, 0x4615, 0x5634,
-
+
0xD94C, 0xC96D, 0xF90E, 0xE92F, 0x99C8, 0x89E9, 0xB98A, 0xA9AB,
0x5844, 0x4865, 0x7806, 0x6827, 0x18C0, 0x08E1, 0x3882, 0x28A3,
0xCB7D, 0xDB5C, 0xEB3F, 0xFB1E, 0x8BF9, 0x9BD8, 0xABBB, 0xBB9A,
@@ -91,7 +91,7 @@
}
return crc16 ^ 0x0000;
}
-
+
/*!
* @if jp
* @brief CRC-32 計算関数
@@ -106,7 +106,7 @@
*
* @else
* @brief CRC-32 calculation function
- *
+ *
* CRC type: RFC2083 Appendix 15
* http://www.faqs.org/rfcs/rfc2083.html
* http://www.efg2.com/Lab/Mathematics/CRC.htm
@@ -116,7 +116,7 @@
* Input bit inversion: None
* Output bit inversion: None
* Bit shift: right
- *
+ *
* @endif
*/
unsigned long crc32(const char* str, size_t len)
@@ -133,7 +133,7 @@
* else { c = c >> 1; }
* }
* crc32table[n] = c;
- * }
+ * }
*/
static const unsigned crc32tab[256] =
{
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/stringutil.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/stringutil.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/common/stringutil.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -73,7 +73,7 @@
void toUpper(std::string& str)
{
std::transform(str.begin(), str.end(), str.begin(),
- (int (*)(int))std::toupper);
+ (int (*)(int))std::toupper);
}
/*!
@@ -86,7 +86,7 @@
void toLower(std::string& str)
{
std::transform(str.begin(), str.end(), str.begin(),
- (int (*)(int))std::tolower);
+ (int (*)(int))std::tolower);
}
/*!
@@ -100,7 +100,7 @@
{
char c;
std::stringstream s;
-
+
while (istr.get(c))
{
if (c == '\n')
@@ -123,7 +123,7 @@
line = s.str();
return static_cast<int>(line.size());
}
-
+
/*!
* @if jp
* @brief 文字列がエスケープされているか判断する
@@ -139,7 +139,7 @@
// If the number of \ is odd, delimiter is escaped.
return (i % 2) == 1;
}
-
+
/*!
* @if jp
* @brief 文字列をエスケープするためのFunctor
@@ -163,7 +163,7 @@
}
std::string str;
};
-
+
/*!
* @if jp
* @brief 文字列をエスケープする
@@ -175,7 +175,7 @@
{
return for_each(str.begin(), str.end(), escape_functor()).str;
}
-
+
/*!
* @if jp
* @brief 文字列をアンエスケープするためのFunctor
@@ -219,7 +219,7 @@
std::string str;
int count;
};
-
+
/*!
* @if jp
* @brief 文字列のエスケープを戻す
@@ -256,7 +256,7 @@
}
}
-
+
/*!
* @if jp
* @brief 文字列の先頭の空白文字を削除する
@@ -269,7 +269,7 @@
if (str.empty()) return;
while (str[0] == ' ' || str[0] == '\t') str.erase(0, 1);
}
-
+
/*!
* @if jp
* @brief 文字列の末尾の空白文字を削除する
@@ -311,7 +311,7 @@
toLower(str);
return str;
}
-
+
/*!
* @if jp
* @brief 文字列を置き換える
@@ -335,7 +335,7 @@
}
return cnt;
}
-
+
/*!
* @if jp
* @brief 文字列を分割文字で分割する
@@ -351,17 +351,17 @@
vstring results;
size delim_size = delimiter.size();
size found_pos(0), begin_pos(0), pre_pos(0), substr_size(0);
-
+
if (input.empty()) return results;
-
+
// if (input.substr(0, delim_size) == delimiter)
// begin_pos = pre_pos = delim_size;
-
+
while (1)
{
// REFIND:
found_pos = input.find(delimiter, begin_pos);
- if (found_pos == std::string::npos)
+ if (found_pos == std::string::npos)
{
std::string substr(input.substr(pre_pos));
eraseHeadBlank(substr);
@@ -389,7 +389,7 @@
}
return results;
}
-
+
/*!
* @if jp
* @brief 大文字に変換する Functor
@@ -404,7 +404,7 @@
c = toupper(c);
}
};
-
+
/*!
* @if jp
* @brief 与えられた文字列をbool値に変換する
@@ -412,13 +412,13 @@
* @brief Convert given string into bool value
* @endif
*/
- bool toBool(std::string str, std::string yes, std::string no,
+ bool toBool(std::string str, std::string yes, std::string no,
bool default_value)
{
std::for_each(str.begin(), str.end(), Toupper());
std::for_each(yes.begin(), yes.end(), Toupper());
std::for_each(no.begin(), no.end(), Toupper());
-
+
if (str.find(yes) != std::string::npos)
return true;
else if (str.find(no) != std::string::npos)
@@ -459,7 +459,7 @@
vstring vlist(split(list, ","));
return includes(vlist, value, ignore_case);
}
-
+
/*!
* @if jp
* @brief 与えられた文字列が絶対パスかどうかを判断する
@@ -475,10 +475,10 @@
if (isalpha(str[0]) && (str[1] == ':') && str[2] == '\\') return true;
// Windows network file path is begun from '\\'
if (str[0] == '\\' && str[1] == '\\') return true;
-
+
return false;
}
-
+
/*!
* @if jp
* @brief 与えられた文字列がURLかどうかを判断する
@@ -499,7 +499,7 @@
return true;
return false;
}
-
+
/*!
* @if jp
* @brief リスト内の文字列を検索する Functor
@@ -531,7 +531,7 @@
val = str;
return true;
}
-
+
/*!
* @if jp
* @brief 与えられた文字列をboolに変換
@@ -560,7 +560,7 @@
return false;
}
-
+
/*!
* @if jp
* @brief 与えられた文字列リストから重複を削除
@@ -572,7 +572,7 @@
{
return std::for_each(sv.begin(), sv.end(), unique_strvec()).str;
}
-
+
/*!
* @if jp
* @brief 与えられた文字列リストからCSVを生成
@@ -583,7 +583,7 @@
std::string flatten(vstring sv, std::string delimiter)
{
if (sv.size() == 0) return "";
-
+
std::string str;
for (size_t i(0), len(sv.size() - 1); i < len; ++i)
{
@@ -591,7 +591,7 @@
}
return str + sv.back();
}
-
+
/*!
* @if jp
* @brief 与えられた文字列リストを引数リストに変換
@@ -603,9 +603,9 @@
{
char** argv;
size_t argc(args.size());
-
+
argv = new char*[argc + 1];
-
+
for (size_t i(0); i < argc; ++i)
{
size_t sz(args[i].size());
@@ -631,7 +631,7 @@
#endif
char str[LINE_MAX];
va_list ap;
-
+
va_start(ap, fmt);
#ifdef WIN32
_vsnprintf(str, LINE_MAX - 1, fmt, ap);
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Process.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Process.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Process.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -45,9 +45,9 @@
pid_t pid;
if ((pid = fork()) < 0 )
{ // fork failed
- return -1;
+ return -1;
}
-
+
if (pid == 0) // I'm child process
{
// signal(SIGCHLD, SIG_IGN);
@@ -68,7 +68,7 @@
char* const * argv = ::coil::toArgv(vstr);
execvp(vstr.front().c_str(), argv);
-
+
return -1;
}
return 0;
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 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/Routing.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -59,11 +59,11 @@
// routing interface like AFROUTE or sysctl.
struct ::hostent *hostent;
struct ::sockaddr_in addr;
-
+
hostent = gethostbyname(dest_addr.c_str());
addr.sin_addr.s_addr = **(unsigned int **)(hostent->h_addr_list);
dest_addr = inet_ntoa(addr.sin_addr);
-
+
#if defined(COIL_OS_FREEBSD) || defined(COIL_OS_DARWIN) \
|| defined(COIL_OS_CYGWIN) \
|| defined(COIL_OS_QNX)
@@ -82,8 +82,8 @@
const char* delimiter = " ";
cmd += dest_addr;
cmd += " 2> /dev/null";
-#endif // COIL_OS_IS_LINUX
-
+#endif // COIL_OS_IS_LINUX
+
FILE* fp;
if ((fp = popen(cmd.c_str(), "r")) == NULL)
{
@@ -95,9 +95,9 @@
char str[512];
fgets(str, 512, fp);
std::string line(str);
-
+
if (std::string::npos == line.find(match_str)) { continue; }
-
+
line.erase(line.end() - 1);
coil::vstring vs(coil::split(line, delimiter));
@@ -141,21 +141,21 @@
std::string cmd("ifconfig ");
cmd += ifname;
cmd += " 2> /dev/null";
-
+
FILE* fp;
if ((fp = popen(cmd.c_str(), "r")) == NULL)
{
return false;
}
-
+
do
{
char str[512];
fgets(str, 512, fp);
std::string line(str);
-
+
if (std::string::npos == line.find("inet ")) { continue; }
-
+
line.erase(line.end() - 1);
coil::eraseHeadBlank(line);
coil::vstring vs(coil::split(line, " "));
@@ -171,5 +171,5 @@
wait(NULL);
return false;
}
-
+
}; // namespace coil
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/UUID.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/UUID.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/coil/posix/coil/UUID.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -77,8 +77,8 @@
uuid_unparse(m_uuid, m_uuidstr);
return m_uuidstr;
}
-
+
UUID_Generator::UUID_Generator()
{
}
@@ -102,26 +102,26 @@
#if defined(COIL_OS_LINUX) || defined(COIL_OS_DARWIN) || defined(COIL_OS_CYGWIN)
UUID_Generator::UUID_Generator() {}
-
+
void UUID_Generator::init() {}
UUID* UUID_Generator::generateUUID(int varsion, int variant)
{
uuid_t uuid;
-
+
uuid_generate(uuid);
return new UUID(&uuid);
}
-
+
UUID::UUID()
{
uuid_clear(this->_uuid);
}
-
+
UUID::UUID(uuid_t *uuid)
{
strncpy((char *)this->_uuid, (char *)(*uuid), sizeof(this->_uuid));
}
-
+
const char* UUID::to_string()
{
uuid_unparse(this->_uuid, buf);
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -32,9 +32,9 @@
#endif
#ifndef ORB_IS_RTORB
- // prototype of static functions
+ // prototype of static functions
static void print_key(std::stringstream& s, OctetUSequence& key);
-
+
static void print_omni_key(std::stringstream& sstr, OctetUSequence& key);
static int get_poa_info(OctetUSequence& key, StringUSequence& poas_out,
@@ -139,7 +139,7 @@
* @if jp
* @brief IOR構造体をIOR文字列へ変換する
* @else
- * @brief Convert from IOR structure to IOR string
+ * @brief Convert from IOR structure to IOR string
* @endif
*/
bool toString(IOP::IOR& ior, std::string& iorstr)
@@ -154,7 +154,7 @@
buf.rewindInputPtr();
size_t s = buf.bufSize();
CORBA::Char* data = (CORBA::Char *)buf.bufPtr();
-
+
char *result = new char[4 + s * 2 + 1];
result[4 + s * 2] = '\0';
result[0] = 'I';
@@ -261,7 +261,7 @@
return retstr.str();
}
- retstr << "IOR information" << std::endl;
+ retstr << "IOR information" << std::endl;
retstr << " Type ID: \"" << (const char*) ior.type_id
<< "\"" << std::endl;;
retstr << " Profiles:" << std::endl;;
@@ -272,29 +272,29 @@
{
IIOP::ProfileBody pBody;
IIOP::unmarshalProfile(ior.profiles[count], pBody);
-
+
retstr << "IIOP " << static_cast<int>(pBody.version.major) << "."
<< static_cast<int>(pBody.version.minor) << " ";
retstr << (const char*) pBody.address.host
<< " " << pBody.address.port << std::endl;
-
+
print_omni_key(retstr, pBody.object_key);
print_key(retstr, pBody.object_key);
print_tagged_components(retstr, pBody.components);
-
+
retstr << std::endl;
}
else if (ior.profiles[count].tag == IOP::TAG_MULTIPLE_COMPONENTS)
{
-
+
retstr << "Multiple Component Profile ";
IIOP::ProfileBody pBody;
IIOP::unmarshalMultiComponentProfile(ior.profiles[count],
pBody.components);
print_tagged_components(retstr, pBody.components);
-
+
retstr << std::endl;
-
+
}
else
{
@@ -365,7 +365,7 @@
StringUSequence poas;
int is_transient;
OctetUSequence id;
-
+
if (get_poa_info(key, poas, is_transient, id))
{
sstr << " POA(" << (char*)poas[0];
@@ -385,31 +385,31 @@
}
print_key(sstr, id);
}
-
+
static int get_poa_info(OctetUSequence& key, StringUSequence& poas_out,
int& transient_out, OctetUSequence& id_out)
{
const char* k = (const char*) key.NP_data();
int len = key.length();
const char* kend = k + len;
-
+
poas_out.length(1);
poas_out[0] = CORBA::string_dup("root");
-
+
if (*k != TRANSIENT_SUFFIX_SEP && *k != POA_NAME_SEP) { return 0; }
-
+
while (k < kend && *k == POA_NAME_SEP)
{
++k;
const char* name = k;
-
- while (k < kend && *k && *k != POA_NAME_SEP
+
+ while (k < kend && *k && *k != POA_NAME_SEP
&& *k != TRANSIENT_SUFFIX_SEP)
{
++k;
}
if (k == kend) { return 0; }
-
+
char* nm = new char[k - name + 1];
memcpy(nm, name, k - name);
nm[k - name] = '\0';
@@ -417,7 +417,7 @@
poas_out[poas_out.length() - 1] = nm;
}
if (k == kend) { return 0; }
-
+
transient_out = 0;
if (*k == TRANSIENT_SUFFIX_SEP)
{
@@ -438,7 +438,7 @@
{
#if defined(RTM_OMNIORB_40) || defined(RTM_OMNIORB_41)
CORBA::ULong total(components.length());
-
+
for (CORBA::ULong index(0); index < total; ++index)
{
try
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ComponentActionListener.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ComponentActionListener.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ComponentActionListener.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -48,7 +48,7 @@
* @endif
*/
PortActionListener::~PortActionListener() {}
-
+
/*!
* @if jp
* @class ExecutionContextActionListener クラス
@@ -57,11 +57,11 @@
* @endif
*/
ExecutionContextActionListener::~ExecutionContextActionListener() {}
-
+
//============================================================
/*!
* @if jp
@@ -73,8 +73,8 @@
PreComponentActionListenerHolder::PreComponentActionListenerHolder()
{
}
-
-
+
+
PreComponentActionListenerHolder::~PreComponentActionListenerHolder()
{
Guard guard(m_mutex);
@@ -87,7 +87,7 @@
}
}
-
+
void PreComponentActionListenerHolder::
addListener(PreComponentActionListener* listener,
bool autoclean)
@@ -95,14 +95,14 @@
Guard guard(m_mutex);
m_listeners.push_back(Entry(listener, autoclean));
}
-
-
+
+
void PreComponentActionListenerHolder::
removeListener(PreComponentActionListener* listener)
{
Guard guard(m_mutex);
std::vector<Entry>::iterator it(m_listeners.begin());
-
+
for (; it != m_listeners.end(); ++it)
{
if ((*it).first == listener)
@@ -115,10 +115,10 @@
return;
}
}
-
+
}
-
-
+
+
void PreComponentActionListenerHolder::notify(UniqueId ec_id)
{
Guard guard(m_mutex);
@@ -139,8 +139,8 @@
PostComponentActionListenerHolder::PostComponentActionListenerHolder()
{
}
-
+
PostComponentActionListenerHolder::~PostComponentActionListenerHolder()
{
Guard guard(m_mutex);
@@ -153,7 +153,7 @@
}
}
-
+
void PostComponentActionListenerHolder::
addListener(PostComponentActionListener* listener, bool autoclean)
{
@@ -161,7 +161,7 @@
m_listeners.push_back(Entry(listener, autoclean));
}
-
+
void PostComponentActionListenerHolder::
removeListener(PostComponentActionListener* listener)
{
@@ -179,10 +179,10 @@
return;
}
}
-
+
}
-
+
void PostComponentActionListenerHolder::notify(UniqueId ec_id,
ReturnCode_t ret)
{
@@ -204,8 +204,8 @@
PortActionListenerHolder::PortActionListenerHolder()
{
}
-
-
+
+
PortActionListenerHolder::~PortActionListenerHolder()
{
Guard guard(m_mutex);
@@ -218,20 +218,20 @@
}
}
-
+
void PortActionListenerHolder::addListener(PortActionListener* listener,
bool autoclean)
{
Guard guard(m_mutex);
m_listeners.push_back(Entry(listener, autoclean));
}
-
-
+
+
void PortActionListenerHolder::removeListener(PortActionListener* listener)
{
Guard guard(m_mutex);
std::vector<Entry>::iterator it(m_listeners.begin());
-
+
for (; it != m_listeners.end(); ++it)
{
if ((*it).first == listener)
@@ -244,10 +244,10 @@
return;
}
}
-
+
}
-
-
+
+
void PortActionListenerHolder::notify(const RTC::PortProfile& pprofile)
{
Guard guard(m_mutex);
@@ -269,8 +269,8 @@
ExecutionContextActionListenerHolder::ExecutionContextActionListenerHolder()
{
}
-
-
+
+
ExecutionContextActionListenerHolder::~ExecutionContextActionListenerHolder()
{
Guard guard(m_mutex);
@@ -283,7 +283,7 @@
}
}
-
+
void ExecutionContextActionListenerHolder::
addListener(ExecutionContextActionListener* listener,
bool autoclean)
@@ -291,14 +291,14 @@
Guard guard(m_mutex);
m_listeners.push_back(Entry(listener, autoclean));
}
-
-
+
+
void ExecutionContextActionListenerHolder::
removeListener(ExecutionContextActionListener* listener)
{
Guard guard(m_mutex);
std::vector<Entry>::iterator it(m_listeners.begin());
-
+
for (; it != m_listeners.end(); ++it)
{
if ((*it).first == listener)
@@ -311,10 +311,10 @@
return;
}
}
-
+
}
-
-
+
+
void ExecutionContextActionListenerHolder::notify(UniqueId ec_id)
{
Guard guard(m_mutex);
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigAdmin.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigAdmin.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigAdmin.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -60,7 +60,7 @@
m_active(true), m_changed(false)
{
}
-
+
/*!
* @if jp
* @brief 仮想デストラクタ
@@ -76,7 +76,7 @@
}
m_params.clear();
}
-
+
/*!
* @if jp
* @brief コンフィギュレーションパラメータの解除
@@ -145,7 +145,7 @@
// clear changed parameter list
m_changedParam.clear();
coil::Properties& prop(m_configsets.getNode(config_set));
-
+
for (int i(0), len(m_params.size()); i < len; ++i)
{
if (prop.hasKey(m_params[i]->name) != NULL)
@@ -172,7 +172,7 @@
std::string key(config_set);
key += "."; key += config_param;
-
+
std::vector<ConfigBase*>::iterator it;
it = std::find_if(m_params.begin(), m_params.end(),
find_conf(config_param));
@@ -202,8 +202,8 @@
}
return false;
}
-
-
+
+
/*!
* @if jp
* @brief 全コンフィギュレーションセットの取得
@@ -215,7 +215,7 @@
{
return m_configsets.getLeaf();
}
-
+
/*!
* @if jp
* @brief 指定したIDのコンフィギュレーションセットの取得
@@ -230,7 +230,7 @@
if (p == 0) { return m_emptyconf; }
return *p;
}
-
+
/*!
* @if jp
* @brief 指定したプロパティのコンフィギュレーションセットへの追加
@@ -243,7 +243,7 @@
{
std::string node(config_set.getName());
if (node.empty()) { return false; }
-
+
coil::Properties& p(m_configsets.getNode(node));
p << config_set;
@@ -252,7 +252,7 @@
onSetConfigurationSet(config_set);
return true;
}
-
+
/*!
* @if jp
* @brief アクティブ・コンフィギュレーションセットを取得
@@ -266,7 +266,7 @@
return p;
}
-
+
/*!
* @if jp
* @brief コンフィギュレーションセットに設定値を追加
@@ -279,17 +279,17 @@
std::string node(config_set.getName());
if (node.empty()) { return false; }
if (m_configsets.hasKey(node.c_str()) != 0) { return false; }
-
+
coil::Properties& p(m_configsets.getNode(node));
p << config_set;
m_newConfig.push_back(node);
-
+
m_changed = true;
m_active = false;
onAddConfigurationSet(config_set);
return true;
}
-
+
/*!
* @if jp
* @brief コンフィギュレーションセットの削除
@@ -306,17 +306,17 @@
std::vector<std::string>::iterator it;
it = std::find(m_newConfig.begin(), m_newConfig.end(), config_id);
if (it == m_newConfig.end()) { return false; }
-
+
coil::Properties* p(m_configsets.removeNode(config_id));
if (p != NULL) { delete p; }
m_newConfig.erase(it);
-
+
m_changed = true;
m_active = false;
onRemoveConfigurationSet(config_id);
return true;
}
-
+
/*!
* @if jp
* @brief コンフィギュレーションセットのアクティブ化
@@ -391,7 +391,7 @@
* @if jp
* @brief ConfigurationParamListener を追加する
* @else
- * @brief Adding ConfigurationParamListener
+ * @brief Adding ConfigurationParamListener
* @endif
*/
void ConfigAdmin::
@@ -406,7 +406,7 @@
* @if jp
* @brief ConfigurationParamListener を削除する
* @else
- * @brief Removing ConfigurationParamListener
+ * @brief Removing ConfigurationParamListener
* @endif
*/
void ConfigAdmin::
@@ -415,12 +415,12 @@
{
m_listeners.configparam_[type].removeListener(listener);
}
-
+
/*!
* @if jp
* @brief ConfigurationSetListener を追加する
* @else
- * @brief Adding ConfigurationSetListener
+ * @brief Adding ConfigurationSetListener
* @endif
*/
void ConfigAdmin::
@@ -435,7 +435,7 @@
* @if jp
* @brief ConfigurationSetListener を削除する
* @else
- * @brief Removing ConfigurationSetListener
+ * @brief Removing ConfigurationSetListener
* @endif
*/
void ConfigAdmin::
@@ -444,12 +444,12 @@
{
m_listeners.configset_[type].removeListener(listener);
}
-
+
/*!
* @if jp
* @brief ConfigurationSetNameListener を追加する
* @else
- * @brief Adding ConfigurationSetNameListener
+ * @brief Adding ConfigurationSetNameListener
* @endif
*/
void ConfigAdmin::
@@ -464,7 +464,7 @@
* @if jp
* @brief ConfigurationSetNameListener を削除する
* @else
- * @brief Removing ConfigurationSetNameListener
+ * @brief Removing ConfigurationSetNameListener
* @endif
*/
void ConfigAdmin::
@@ -480,7 +480,7 @@
* @if jp
* @brief コンフィギュレーションパラメータの更新(ID指定)時にコールされる
* @else
- * @brief When the configuration parameter is updated, it is called.
+ * @brief When the configuration parameter is updated, it is called.
* @endif
*/
void ConfigAdmin::onUpdate(const char* config_set)
@@ -492,7 +492,7 @@
* @if jp
* @brief コンフィギュレーションパラメータの更新(名称指定)時にコールされる
* @else
- * @brief When the configuration parameter is updated, it is called.
+ * @brief When the configuration parameter is updated, it is called.
* @endif
*/
void
@@ -550,6 +550,6 @@
{
m_listeners.configsetname_[ON_ACTIVATE_CONFIG_SET].notify(config_id);
}
-
+
}; // namespace RTC
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigurationListener.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigurationListener.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ConfigurationListener.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -61,8 +61,8 @@
ConfigurationParamListenerHolder::ConfigurationParamListenerHolder()
{
}
-
-
+
+
ConfigurationParamListenerHolder::~ConfigurationParamListenerHolder()
{
Guard guard(m_mutex);
@@ -75,7 +75,7 @@
}
}
-
+
void ConfigurationParamListenerHolder::
addListener(ConfigurationParamListener* listener,
bool autoclean)
@@ -83,14 +83,14 @@
Guard guard(m_mutex);
m_listeners.push_back(Entry(listener, autoclean));
}
-
-
+
+
void ConfigurationParamListenerHolder::
removeListener(ConfigurationParamListener* listener)
{
Guard guard(m_mutex);
std::vector<Entry>::iterator it(m_listeners.begin());
-
+
for (; it != m_listeners.end(); ++it)
{
if ((*it).first == listener)
@@ -103,10 +103,10 @@
return;
}
}
-
+
}
-
-
+
+
void ConfigurationParamListenerHolder::notify(const char* config_set_name,
const char* config_param_name)
{
@@ -129,8 +129,8 @@
ConfigurationSetListenerHolder::ConfigurationSetListenerHolder()
{
}
-
-
+
+
ConfigurationSetListenerHolder::~ConfigurationSetListenerHolder()
{
Guard guard(m_mutex);
@@ -142,8 +142,8 @@
}
}
}
-
-
+
+
void ConfigurationSetListenerHolder::
addListener(ConfigurationSetListener* listener,
bool autoclean)
@@ -151,14 +151,14 @@
Guard guard(m_mutex);
m_listeners.push_back(Entry(listener, autoclean));
}
-
-
+
+
void ConfigurationSetListenerHolder::
removeListener(ConfigurationSetListener* listener)
{
Guard guard(m_mutex);
std::vector<Entry>::iterator it(m_listeners.begin());
-
+
for (; it != m_listeners.end(); ++it)
{
if ((*it).first == listener)
@@ -171,10 +171,10 @@
return;
}
}
-
+
}
-
-
+
+
void ConfigurationSetListenerHolder::
notify(const coil::Properties& config_set)
{
@@ -196,8 +196,8 @@
ConfigurationSetNameListenerHolder::ConfigurationSetNameListenerHolder()
{
}
-
+
ConfigurationSetNameListenerHolder::~ConfigurationSetNameListenerHolder()
{
Guard guard(m_mutex);
@@ -210,7 +210,7 @@
}
}
-
+
void ConfigurationSetNameListenerHolder::
addListener(ConfigurationSetNameListener* listener, bool autoclean)
{
@@ -218,7 +218,7 @@
m_listeners.push_back(Entry(listener, autoclean));
}
-
+
void ConfigurationSetNameListenerHolder::
removeListener(ConfigurationSetNameListener* listener)
{
@@ -236,10 +236,10 @@
return;
}
}
-
+
}
-
+
void ConfigurationSetNameListenerHolder::notify(const char* config_set_name)
{
Guard guard(m_mutex);
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaPort.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaPort.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/CorbaPort.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -38,7 +38,7 @@
{
addProperty("port.port_type", "CorbaPort");
}
-
+
/*!
* @if jp
* @brief 仮想デストラクタ
@@ -74,13 +74,13 @@
if (!coil::stringTo(num, m_properties.getProperty("connection_limit",
"-1").c_str()))
{
- RTC_ERROR(("invalid connection_limit value: %s",
+ RTC_ERROR(("invalid connection_limit value: %s",
m_properties.getProperty("connection_limit").c_str()));
}
setConnectionLimit(num);
}
-
+
/*!
* @if jp
* @brief Provider を登録する
@@ -112,10 +112,10 @@
RTC_ERROR(("appending provider interface failed"));
return false;
}
-
+
return true;
};
-
+
/*!
* @if jp
* @brief Consumer を登録する
@@ -134,11 +134,11 @@
{
return false;
}
-
+
m_consumers.push_back(CorbaConsumerHolder(type_name,
instance_name,
&consumer));
-
+
return true;
}
@@ -162,7 +162,7 @@
++it;
}
}
-
+
/*!
* @if jp
* @brief 全ての Port のインターフェースを deactivates する
@@ -179,7 +179,7 @@
++it;
}
}
-
+
//============================================================
// protected functions
//============================================================
@@ -232,7 +232,7 @@
CORBA::ULong len2(properties.length());
CORBA::ULong len(len1 + len2);
connector_profile.properties.length(len);
-
+
for (CORBA::ULong i = 0; i < len2; ++i)
{
connector_profile.properties[len1 + i] = properties[i];
@@ -241,12 +241,12 @@
#else // ORB_IS_RTORB
CORBA_SeqUtil::push_back_list(connector_profile.properties, properties);
#endif
-
- RTC_DEBUG_STR((NVUtil::toString(properties)));
+ RTC_DEBUG_STR((NVUtil::toString(properties)));
+
return RTC::RTC_OK;
}
-
+
/*!
* @if jp
* @brief Interface に接続する
@@ -300,7 +300,7 @@
if (strict)
{
RTC_ERROR(("subscribeInterfaces() failed."));
- return RTC::RTC_ERROR;
+ return RTC::RTC_ERROR;
}
}
@@ -308,7 +308,7 @@
return RTC::RTC_OK;
}
-
+
/*!
* @if jp
* @brief Interface への接続を解除する
@@ -342,7 +342,7 @@
}
}
}
-
+
/*!
* @if jp
* @brief Consumer に合致する Provider を NVList の中から見つける
@@ -459,5 +459,5 @@
RTC_WARN(("IORs between Consumer and Connector are different."));
return false;
}
-
+
}; // namespace RTC
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContext.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContext.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContext.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -21,7 +21,7 @@
namespace RTC
{
-
+
ExecutionContextBase::ExecutionContextBase(RTObject_ptr owner)
: rtclog("exec_cxt"), m_running(false)
{
@@ -43,8 +43,8 @@
RTC_TRACE(("is_running()"));
return m_running;
}
-
+
/*!
* @if jp
* @brief ExecutionContext をスタートさせる
@@ -57,8 +57,8 @@
RTC_TRACE(("start()"));
return RTC::RTC_OK;
}
-
+
/*!
* @if jp
* @brief ExecutionContext をストップさせる
@@ -71,8 +71,8 @@
RTC_TRACE(("stop()"));
return RTC::RTC_OK;
}
-
-
+
+
/*!
* @if jp
* @brief 実行周期(Hz)を取得する
@@ -85,11 +85,11 @@
RTC_TRACE(("get_rate()"));
return m_profile.rate;
}
-
-
+
+
/*!
* @if jp
- * @brief 実行周期(Hz)を与える
+ * @brief 実行周期(Hz)を与える
* @else
* @brief Set rate (Hz)
* @endif
@@ -104,53 +104,53 @@
}
return RTC::BAD_PARAMETER;
}
-
+
/*!
* @if jp
* @brief コンポーネントをアクティブ化する
* @else
* @brief Activate a component
* @endif
- */
+ */
ReturnCode_t
ExecutionContextBase::activate_component(LightweightRTObject_ptr comp)
{
RTC_TRACE(("activate_component()"));
return RTC::RTC_OK;
}
-
+
/*!
* @if jp
* @brief コンポーネントを非アクティブ化する
* @else
* @brief Deactivate a component
* @endif
- */
+ */
ReturnCode_t
ExecutionContextBase::deactivate_component(LightweightRTObject_ptr comp)
{
RTC_TRACE(("deactivate_component()"));
return RTC::RTC_OK;
}
-
+
/*!
* @if jp
* @brief コンポーネントを非アクティブ化する
* @else
* @brief Deactivate a component
* @endif
- */
+ */
ReturnCode_t
ExecutionContextBase::reset_component(LightweightRTObject_ptr comp)
{
RTC_TRACE(("reset_component()"));
return RTC::RTC_OK;
}
-
-
+
+
/*!
* @if jp
* @brief コンポーネントの状態を取得する
@@ -164,8 +164,8 @@
RTC_TRACE(("get_component_state()"));
return RTC::INACTIVE_STATE;
}
-
-
+
+
/*!
* @if jp
* @brief ExecutionKind を取得する
@@ -178,8 +178,8 @@
RTC_TRACE(("get_kind()"));
return m_profile.kind;
}
-
+
/*!
* @if jp
* @brief コンポーネントを追加する
@@ -199,8 +199,8 @@
}
return RTC::BAD_PARAMETER;
}
-
-
+
+
/*!
* @if jp
* @brief コンポーネントをコンポーネントリストから削除する
@@ -239,7 +239,7 @@
p = new ExecutionContextProfile(m_profile);
return p._retn();
}
-
-
-
+
+
+
}; // namespace RTC
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextWorker.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextWorker.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExecutionContextWorker.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -40,7 +40,7 @@
{
RTC_TRACE(("ExecutionContextWorker()"));
}
-
+
/*!
* @if jp
* @brief デストラクタ
@@ -64,7 +64,7 @@
{
return RTC::ExecutionContextService::_duplicate(m_ref);
}
-
+
//============================================================
// ExecutionContext
//============================================================
@@ -80,7 +80,7 @@
RTC_TRACE(("isRunning()"));
return m_running;
}
-
+
/*!
* @if jp
* @brief ExecutionContext の実行を開始
@@ -108,7 +108,7 @@
return RTC::RTC_OK;
}
-
+
/*!
* @if jp
* @brief ExecutionContext の実行を停止
@@ -312,7 +312,7 @@
* @else
* @brief Bind the component.
* @endif
- */
+ */
RTC::ReturnCode_t ExecutionContextWorker::
bindComponent(RTC::RTObject_impl* rtc)
{
@@ -325,14 +325,14 @@
}
RTC::ExecutionContextService_var ec = getECRef();
RTC::ExecutionContextHandle_t id = rtc->bindContext(ec);
- if (id < 0 || id > ECOTHER_OFFSET)
+ if (id < 0 || id > ECOTHER_OFFSET)
{
// id should be owned context id < ECOTHER_OFFSET
RTC_ERROR(("bindContext returns invalid id: %d", id));
return RTC::RTC_ERROR;
}
RTC_DEBUG(("bindContext returns id = %d", id));
-
+
// rtc is owner of this EC
RTC::LightweightRTObject_var comp
= RTC::LightweightRTObject::_duplicate(rtc->getObjRef());
@@ -342,7 +342,7 @@
return RTC::RTC_OK;
}
-
+
/*!
* @if jp
* @brief コンポーネントをコンポーネントリストから削除する
@@ -431,7 +431,7 @@
{
if (!m_comps[i]->isCurrentState(state)) { return false; }
}
- return true;
+ return true;
}
bool ExecutionContextWorker::
@@ -453,7 +453,7 @@
{
if (m_comps[i]->isCurrentState(state)) { return true; }
}
- return false;
+ return false;
}
bool ExecutionContextWorker::
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExtTrigExecutionContext.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExtTrigExecutionContext.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ExtTrigExecutionContext.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -50,7 +50,7 @@
RTC_DEBUG(("Actual period: %d [sec], %d [usec]",
m_profile.getPeriod().sec(), m_profile.getPeriod().usec()));
}
-
+
/*!
* @if jp
* @brief デストラクタ
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Factory.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Factory.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Factory.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -20,7 +20,7 @@
#include <rtm/Factory.h>
#include <rtm/RTObject.h>
-namespace RTC
+namespace RTC
{
/*!
* @if jp
@@ -33,7 +33,7 @@
: m_Profile(profile), m_Number(-1)
{
}
-
+
/*!
* @if jp
* @brief デストラクタ
@@ -44,7 +44,7 @@
FactoryBase::~FactoryBase()
{
}
-
+
/*!
* @if jp
* @brief コンポーネントプロファイルの取得
@@ -56,7 +56,7 @@
{
return m_Profile;
}
-
+
/*!
* @if jp
* @brief 現在のインスタンス数の取得
@@ -68,7 +68,7 @@
{
return m_Number;
}
-
+
/*!
* @if jp
* @brief コンストラクタ
@@ -88,7 +88,7 @@
if (m_policy == NULL)
throw std::bad_alloc();
}
-
+
/*!
* @if jp
* @brief コンポーネントの生成
@@ -102,15 +102,15 @@
{
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 (...)
@@ -118,7 +118,7 @@
return NULL;
}
}
-
+
/*!
* @if jp
* @brief コンポーネントの破棄
@@ -136,7 +136,7 @@
}
catch (...)
{
-
+
}
}
}; // namespace RTC
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortBase.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortBase.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortBase.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -53,7 +53,7 @@
addProperty("dataport.subscription_type", "Any");
}
-
+
/*!
* @if jp
* @brief デストラクタ
@@ -64,7 +64,7 @@
InPortBase::~InPortBase()
{
RTC_TRACE(("~InPortBase()"));
-
+
if (m_connectors.size() != 0)
{
RTC_ERROR(("connector.size should be 0 in InPortBase's dtor."));
@@ -74,7 +74,7 @@
delete m_connectors[i];
}
}
-
+
if (m_thebuffer != 0)
{
CdrBufferFactory::instance().deleteObject(m_thebuffer);
@@ -83,7 +83,7 @@
RTC_ERROR(("Although singlebuffer flag is true, the buffer != 0"));
}
}
-
+
}
/*!
@@ -124,16 +124,16 @@
initProviders();
initConsumers();
int num(-1);
- if (!coil::stringTo(num,
+ if (!coil::stringTo(num,
m_properties.getProperty("connection_limit", "-1").c_str()))
{
- RTC_ERROR(("invalid connection_limit value: %s",
+ RTC_ERROR(("invalid connection_limit value: %s",
m_properties.getProperty("connection_limit").c_str()));
}
setConnectionLimit(num);
}
-
+
/*!
* @if jp
* @brief プロパティを取得する
@@ -144,7 +144,7 @@
coil::Properties& InPortBase::properties()
{
RTC_TRACE(("properties()"));
-
+
return m_properties;
}
@@ -312,7 +312,7 @@
void InPortBase::activateInterfaces()
{
RTC_TRACE(("activateInterfaces()"));
-
+
for (int i(0), len(m_connectors.size()); i < len; ++i)
{
m_connectors[i]->activate();
@@ -383,7 +383,7 @@
RTC_ERROR(("removeConnectorDataListener(): Invalid listener type."));
return;
}
-
+
/*!
* @if jp
* @brief ConnectorListener リスナを追加する
@@ -407,7 +407,7 @@
RTC_ERROR(("addConnectorListener(): Invalid listener type."));
return;
}
-
+
void InPortBase::removeConnectorListener(ConnectorListenerType type,
ConnectorListener* listener)
{
@@ -457,11 +457,11 @@
}
return PortBase::connect(connector_profile);
}
-
+
//============================================================
// protected interfaces
//============================================================
-
+
/*!
* @if jp
* @brief Interface情報を公開する
@@ -470,7 +470,7 @@
* @endif
*/
ReturnCode_t InPortBase::publishInterfaces(ConnectorProfile& cprof)
- {
+ {
RTC_TRACE(("publishInterfaces()"));
ReturnCode_t returnvalue = _publishInterfaces();
@@ -540,7 +540,7 @@
RTC_ERROR(("unsupported dataflow_type: %s", dflow_type.c_str()));
return RTC::BAD_PARAMETER;
}
-
+
/*!
* @if jp
* @brief Interfaceに接続する
@@ -628,7 +628,7 @@
RTC_ERROR(("unsupported dataflow_type: %s", dflow_type.c_str()));
return RTC::BAD_PARAMETER;
}
-
+
/*!
* @if jp
* @brief Interfaceへの接続を解除する
@@ -701,7 +701,7 @@
std::back_inserter(provider_types));
}
#endif
-
+
// InPortProvider supports "push" dataflow type
if (provider_types.size() > 0)
{
@@ -821,12 +821,12 @@
coil::flatten(m_providerTypes).c_str()));
return 0;
}
-
+
RTC_DEBUG(("interface_type: %s", prop["interface_type"].c_str()));
InPortProvider* provider;
provider = InPortProviderFactory::
instance().createObject(prop["interface_type"].c_str());
-
+
if (provider != 0)
{
RTC_DEBUG(("provider created"));
@@ -876,12 +876,12 @@
coil::flatten(m_consumerTypes).c_str()));
return 0;
}
-
+
RTC_DEBUG(("interface_type: %s", prop["interface_type"].c_str()));
OutPortConsumer* consumer;
consumer = OutPortConsumerFactory::
instance().createObject(prop["interface_type"].c_str());
-
+
if (consumer != 0)
{
RTC_DEBUG(("consumer created"));
@@ -898,9 +898,9 @@
}
RTC_ERROR(("consumer creation failed"));
- return 0;
+ return 0;
}
-
+
/*!
* @if jp
* @brief InPortPushConnector の生成
@@ -916,13 +916,13 @@
ConnectorInfo profile(cprof.name,
cprof.connector_id,
CORBA_SeqUtil::refToVstring(cprof.ports),
- prop);
+ prop);
#else // ORB_IS_RTORB
ConnectorInfo profile(cprof.name,
cprof.connector_id,
CORBA_SeqUtil::
refToVstring(RTC::PortServiceList(cprof.ports)),
- prop);
+ prop);
#endif // ORB_IS_RTORB
try
@@ -936,7 +936,7 @@
}
else
{
- connector = new InPortPushConnector(profile,
+ connector = new InPortPushConnector(profile,
provider,
m_listeners);
}
@@ -977,13 +977,13 @@
ConnectorInfo profile(cprof.name,
cprof.connector_id,
CORBA_SeqUtil::refToVstring(cprof.ports),
- prop);
+ prop);
#else // ORB_IS_RTORB
ConnectorInfo profile(cprof.name,
cprof.connector_id,
CORBA_SeqUtil::
refToVstring(RTC::PortServiceList(cprof.ports)),
- prop);
+ prop);
#endif // ORB_IS_RTORB
try
@@ -1024,6 +1024,6 @@
ConnectorListeners& InPortBase::getListeners()
{
- return m_listeners;
+ return m_listeners;
}
}; // namespace RTC
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortDirectProvider.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortDirectProvider.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortDirectProvider.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -33,7 +33,7 @@
* @endif
*/
InPortDirectProvider::InPortDirectProvider(void)
- : m_buffer(0)
+ : m_buffer(0)
{
// PortProfile setting
setInterfaceType("direct");
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPullConnector.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPullConnector.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPullConnector.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -52,7 +52,7 @@
onConnect();
}
-
+
/*!
* @if jp
* @brief デストラクタ
@@ -65,7 +65,7 @@
onDisconnect();
disconnect();
}
-
+
/*!
* @if jp
* @brief read 関数
@@ -83,7 +83,7 @@
}
return m_consumer->get(data);
}
-
+
/*!
* @if jp
* @brief 接続解除関数
@@ -104,7 +104,7 @@
return PORT_OK;
}
-
+
/*!
* @if jp
* @brief Bufferの生成
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPushConnector.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPushConnector.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/InPortPushConnector.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -30,13 +30,13 @@
* @brief Constructor
* @endif
*/
- InPortPushConnector::InPortPushConnector(ConnectorInfo info,
+ InPortPushConnector::InPortPushConnector(ConnectorInfo info,
InPortProvider* provider,
ConnectorListeners& listeners,
CdrBufferBase* buffer)
: InPortConnector(info, listeners, buffer),
- m_provider(provider),
- m_listeners(listeners),
+ m_provider(provider),
+ m_listeners(listeners),
m_deleteBuffer(buffer == 0 ? true : false)
{
// publisher/buffer creation. This may throw std::bad_alloc;
@@ -137,7 +137,7 @@
return PORT_OK;
}
-
+
/*!
* @if jp
* @brief Bufferの生成
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/Manager.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -79,7 +79,7 @@
return m_name == comp->getInstanceName();
}
-
+
/*!
* @if jp
* @brief Protected コンストラクタ
@@ -94,7 +94,7 @@
{
new coil::SignalAction((coil::SignalHandler) handler, SIGINT);
}
-
+
/*!
* @if jp
* @brief Protected コピーコンストラクタ
@@ -109,7 +109,7 @@
{
new coil::SignalAction((coil::SignalHandler) handler, SIGINT);
}
-
+
/*!
* @if jp
* @brief マネージャの初期化
@@ -139,7 +139,7 @@
}
return manager;
}
-
+
/*!
* @if jp
* @brief マネージャのインスタンスの取得
@@ -169,20 +169,20 @@
}
return *manager;
}
-
+
/*!
* @if jp
* @brief マネージャ終了処理
* @else
* @brief Terminate Manager
* @endif
- */
+ */
void Manager::terminate()
{
if (m_terminator != NULL)
m_terminator->terminate();
}
-
+
/*!
* @if jp
* @brief マネージャ・シャットダウン
@@ -210,14 +210,14 @@
m_listeners.manager_.postShutdown();
shutdownLogger();
}
-
+
/*!
* @if jp
* @brief マネージャ終了処理の待ち合わせ
* @else
* @brief Wait for Manager's termination
* @endif
- */
+ */
void Manager::join()
{
RTC_TRACE(("Manager::wait()"));
@@ -234,30 +234,30 @@
coil::usleep(100000);
}
}
-
+
/*!
* @if jp
* @brief 初期化プロシージャのセット
* @else
* @brief Set initial procedure
* @endif
- */
+ */
void Manager::setModuleInitProc(ModuleInitProc proc)
{
m_initProc = proc;
}
-
+
/*!
* @if jp
* @brief Managerのアクティブ化
* @else
* @brief Activate the Manager
* @endif
- */
+ */
bool Manager::activateManager()
{
RTC_TRACE(("Manager::activateManager()"));
-
+
try
{
if (CORBA::is_nil(this->thePOAManager()))
@@ -423,12 +423,12 @@
if (comp1 == NULL)
{ RTC_ERROR(("%s not found.", comp1_name.c_str())); continue; }
std::string port1 = comp_ports[1];
-
+
PortServiceList_var ports0 = comp0->get_ports();
PortServiceList_var ports1 = comp1->get_ports();
RTC_DEBUG(("%s has %d ports.", comp0_name.c_str(), ports0->length()));
RTC_DEBUG(("%s has %d ports.", comp1_name.c_str(), ports1->length()));
-
+
PortService_var port0_var;
for (size_t p(0); p < ports0->length(); ++p)
{
@@ -503,14 +503,14 @@
} // end of pre-activation
return true;
}
-
+
/*!
* @if jp
* @brief Managerの実行
* @else
* @brief Run the Manager
* @endif
- */
+ */
void Manager::runManager(bool no_block)
{
if (no_block)
@@ -528,7 +528,7 @@
}
return;
}
-
+
//============================================================
// Module management
//============================================================
@@ -563,7 +563,7 @@
}
return;
}
-
+
/*!
* @if jp
* @brief モジュールのアンロード
@@ -580,21 +580,21 @@
m_listeners.module_.postUnload(fnamestr);
return;
}
-
+
/*!
* @if jp
* @brief 全モジュールのアンロード
* @else
* @brief Unload all modules
* @endif
- */
+ */
void Manager::unloadAll()
{
RTC_TRACE(("Manager::unloadAll()"));
m_module->unloadAll();
return;
}
-
+
/*!
* @if jp
* @brief ロード済みのモジュールリストを取得する
@@ -607,7 +607,7 @@
RTC_TRACE(("Manager::getLoadedModules()"));
return m_module->getLoadedModules();
}
-
+
/*!
* @if jp
* @brief ロード可能なモジュールリストを取得する
@@ -616,11 +616,11 @@
* @endif
*/
std::vector<coil::Properties> Manager::getLoadableModules()
- {
+ {
RTC_TRACE(("Manager::getLoadableModules()"));
return m_module->getLoadableModules();
}
-
+
//============================================================
// Component factory management
//============================================================
@@ -639,7 +639,7 @@
FactoryBase* factory;
factory = new FactoryCXX(profile, new_func, delete_func);
try
- {
+ {
bool ret = m_factory.registerObject(factory);
if (!ret) {
delete factory;
@@ -653,7 +653,7 @@
return false;
}
}
-
+
std::vector<coil::Properties> Manager::getFactoryProfiles()
{
std::vector<FactoryBase*> factories(m_factory.getObjects());
@@ -664,7 +664,7 @@
}
return props;
}
-
+
/*!
* @if jp
* @brief ExecutionContext用ファクトリを登録する
@@ -678,7 +678,7 @@
{
RTC_TRACE(("Manager::registerECFactory(%s)", name));
try
- {
+ {
ECFactoryBase* factory;
factory = new ECFactoryCXX(name, new_func, delete_func);
if (m_ecfactory.registerObject(factory))
@@ -692,7 +692,7 @@
}
return false;
}
-
+
/*!
* @if jp
* @brief ファクトリ全リストを取得する
@@ -703,11 +703,11 @@
std::vector<std::string> Manager::getModulesFactories()
{
RTC_TRACE(("Manager::getModulesFactories()"));
-
+
ModuleFactories m;
return m_factory.for_each(m).modlist;
}
-
+
//============================================================
// Component management
//============================================================
@@ -729,8 +729,8 @@
if (!procComponentArgs(argstr.c_str(), comp_id, comp_prop)) return NULL;
//------------------------------------------------------------
- // Because the format of port-name had been changed from <port_name>
- // to <instance_name>.<port_name>, the following processing was added.
+ // 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 (comp_prop.findNode("exported_ports") != 0)
@@ -750,16 +750,16 @@
{
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;
-
+
}
//------------------------------------------------------------
@@ -770,11 +770,11 @@
{
RTC_ERROR(("Factory not found: %s",
comp_id["implementation_id"].c_str()));
-
+
// automatic module loading
std::vector<coil::Properties> mp(m_module->getLoadableModules());
RTC_INFO(("%d loadable modules found", mp.size()));
-
+
std::vector<coil::Properties>::iterator it;
it = std::find_if(mp.begin(), mp.end(), ModulePredicate(comp_id));
if (it == mp.end())
@@ -792,7 +792,7 @@
RTC_INFO(("Loading module: %s", (*it)["module_file_name"].c_str()))
load((*it)["module_file_name"].c_str(), "");
factory = m_factory.find(comp_id);
- if (factory == 0)
+ if (factory == 0)
{
RTC_ERROR(("Factory not found for loaded module: %s",
comp_id["implementation_id"].c_str()));
@@ -842,7 +842,7 @@
prop[key] = m_config[key];
}
}
-
+
RTObject_impl* comp;
comp = factory->create(this);
if (comp == NULL)
@@ -865,7 +865,7 @@
configureComponent(comp, prop);
m_listeners.rtclifecycle_.postConfigure(prop);
// comp->setProperties(prop);
-
+
//------------------------------------------------------------
// Component initialization
m_listeners.rtclifecycle_.preInitialize();
@@ -889,7 +889,7 @@
registerComponent(comp);
return comp;
}
-
+
/*!
* @if jp
* @brief RTコンポーネントを直接 Manager に登録する
@@ -902,9 +902,9 @@
RTC_TRACE(("Manager::registerComponent(%s)", comp->getInstanceName()));
// ### NamingManager のみで代用可能
m_compManager.registerObject(comp);
-
+
coil::vstring names(comp->getNamingNames());
-
+
m_listeners.naming_.preBind(comp, names);
for (int i(0), len(names.size()); i < len; ++i)
{
@@ -915,7 +915,7 @@
return true;
}
-
+
/*!
* @if jp
* @brief RTコンポーネントの登録を解除する
@@ -928,7 +928,7 @@
RTC_TRACE(("Manager::unregisterComponent(%s)", comp->getInstanceName()));
// ### NamingManager のみで代用可能
m_compManager.unregisterObject(comp->getInstanceName());
-
+
coil::vstring names(comp->getNamingNames());
m_listeners.naming_.preUnbind(comp, names);
@@ -941,12 +941,12 @@
return true;
}
-
+
ExecutionContextBase* Manager::createContext(const char* ec_args)
{
RTC_TRACE(("Manager::createContext()"));
- RTC_TRACE(("ExecutionContext type: %s",
+ RTC_TRACE(("ExecutionContext type: %s",
m_config.getProperty("exec_cxt.periodic.type").c_str()));
std::string ec_id;
@@ -964,7 +964,7 @@
ec = factory->create();
return ec;
}
-
+
/*!
* @if jp
* @brief Manager に登録されているRTコンポーネントを削除する
@@ -992,8 +992,8 @@
RTC_DEBUG(("Factory found: %s",
comp_id["implementation_id"].c_str()));
factory->destroy(comp);
- }
-
+ }
+
if (coil::toBool(m_config["manager.shutdown_on_nortcs"],
"YES", "NO", true) &&
!coil::toBool(m_config["manager.is_master"], "YES", "NO", false))
@@ -1005,7 +1005,7 @@
shutdown();
}
}
- }
+ }
void Manager::deleteComponent(const char* instance_name)
{
@@ -1019,7 +1019,7 @@
}
deleteComponent(comp);
}
-
+
/*!
* @if jp
* @brief Manager に登録されているRTコンポーネントを検索する
@@ -1032,7 +1032,7 @@
RTC_TRACE(("Manager::getComponent(%s)", instance_name));
return m_compManager.find(instance_name);
}
-
+
/*!
* @if jp
* @brief Manager に登録されている全RTコンポーネントを取得する
@@ -1057,7 +1057,7 @@
{
m_listeners.manager_.removeListener(listener);
}
-
+
void Manager::
addModuleActionListener(RTM::ModuleActionListener* listener,
bool autoclean)
@@ -1081,7 +1081,7 @@
{
m_listeners.rtclifecycle_.removeListener(listener);
}
-
+
void Manager::
addNamingActionListener(RTM::NamingActionListener* listener,
bool autoclean)
@@ -1094,7 +1094,7 @@
{
m_listeners.naming_.removeListener(listener);
}
-
+
void Manager::
addLocalServiceActionListener(RTM::LocalServiceActionListener* listener,
bool autoclean)
@@ -1108,7 +1108,7 @@
m_listeners.localservice_.removeListener(listener);
}
-
+
//============================================================
// CORBA 関連
//============================================================
@@ -1136,7 +1136,7 @@
RTC_TRACE(("Manager::getORB()"));
return CORBA::ORB::_duplicate(m_pORB);
}
-
+
/*!
* @if jp
* @brief Manager が持つ RootPOA のポインタを取得する (所有権保持)
@@ -1161,7 +1161,7 @@
RTC_TRACE(("Manager::getPOA()"));
return PortableServer::POA::_duplicate(m_pPOA);
}
-
+
/*!
* @if jp
* @brief Manager が持つ POAManager を取得する (所有権保持)
@@ -1174,7 +1174,7 @@
RTC_TRACE(("Manager::thePOAManager()"));
return m_pPOAManager.in();
}
-
+
/*!
* @if jp
* @brief Manager が持つ POAManager を取得する (所有権複製)
@@ -1187,11 +1187,11 @@
RTC_TRACE(("Manager::getPOAManager()"));
return PortableServer::POAManager::_duplicate(m_pPOAManager);
}
-
+
//============================================================
// Protected functions
//============================================================
-
+
//============================================================
// Manager initialization and finalization
//============================================================
@@ -1207,9 +1207,9 @@
// load configurations
ManagerConfig config(argc, argv);
config.configure(m_config);
- m_config["logger.file_name"] =
+ m_config["logger.file_name"] =
formatString(m_config["logger.file_name"].c_str(), m_config);
-
+
// initialize ModuleManager
m_module = new ModuleManager(m_config);
@@ -1219,7 +1219,7 @@
Guard guard(m_terminate.mutex);
m_terminate.waiting = 0;
}
-
+
// initialize Timer
if (coil::toBool(m_config["timer.enable"], "YES", "NO", true))
{
@@ -1248,22 +1248,22 @@
}
if (m_timer != NULL)
{
- m_timer->registerListenerObj(this,
+ m_timer->registerListenerObj(this,
&Manager::shutdownOnNoRtcs, tm);
}
}
-
+
{
- coil::TimeValue tm(1, 0);
+ coil::TimeValue tm(1, 0);
if (m_timer != NULL)
{
- m_timer->registerListenerObj(this,
+ m_timer->registerListenerObj(this,
&Manager::cleanupComponents, tm);
}
}
}
-
+
/*!
* @if jp
* @brief Manager の終了処理
@@ -1290,7 +1290,7 @@
}
}
-
+
//============================================================
// Logger initialization and finalization
//============================================================
@@ -1305,7 +1305,7 @@
{
rtclog.setLevel("SILENT");
rtclog.setName("manager");
-
+
if (!coil::toBool(m_config["logger.enable"], "YES", "NO", true))
{
return true;
@@ -1318,14 +1318,14 @@
{
std::string logfile(logouts[i]);
if (logfile == "") continue;
-
+
// Open logfile
if (logfile == "STDOUT" || logfile == "stdout")
{
m_logStreamBuf.addStream(std::cout.rdbuf());
continue;
}
-
+
std::filebuf* of = new std::filebuf();
of->open(logfile.c_str(), std::ios::out | std::ios::app);
@@ -1339,20 +1339,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) ?
+ "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"));
@@ -1362,7 +1362,7 @@
return true;;
}
-
+
/*!
* @if jp
* @brief System Logger の終了処理
@@ -1386,7 +1386,7 @@
m_logfiles.clear();
}
}
-
+
//============================================================
// ORB initialization and finalization
//============================================================
@@ -1408,7 +1408,7 @@
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
@@ -1437,7 +1437,7 @@
{
IIOP::Address iiop_addr;
iiop_addr.host = addr_port[0].c_str();
- CORBA::UShort port;
+ CORBA::UShort port;
coil::stringTo(port, addr_port[1].c_str());
iiop_addr.port = port;
#if defined(RTM_OMNIORB_40) || defined(RTM_OMNIORB_41)
@@ -1457,7 +1457,7 @@
}
return true;
}
-
+
/*!
* @if jp
* @brief ORB のコマンドラインオプション作成
@@ -1560,7 +1560,7 @@
}
}
-
+
/*!
* @if jp
* @brief ORB の終了処理
@@ -1586,10 +1586,10 @@
RTC_DEBUG(("No pending works of ORB. Shutting down POA and ORB."));
}
catch(...)
- {
+ {
RTC_ERROR(("Caught SystemException during perform_work."));
}
-
+
if (!CORBA::is_nil(m_pPOA))
{
try
@@ -1613,7 +1613,7 @@
RTC_ERROR(("Caught unknown exception during POA destruction."));
}
}
-
+
if (!CORBA::is_nil(m_pORB))
{
try
@@ -1637,7 +1637,7 @@
}
}
}
-
+
//============================================================
// Naming initialization and finalization
//============================================================
@@ -1651,33 +1651,33 @@
bool Manager::initNaming()
{
RTC_TRACE(("Manager::initNaming()"));
-
+
m_namingManager = new NamingManager(this);
-
+
// If NameService is disabled, return immediately
if (!coil::toBool(m_config["naming.enable"], "YES", "NO", true))
{
return true;
}
-
+
// NameServer registration for each method and servers
std::vector<std::string> meth(coil::split(m_config["naming.type"], ","));
-
+
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()));
+ 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))
{
@@ -1689,13 +1689,13 @@
}
if (m_timer != NULL)
{
- m_timer->registerListenerObj(m_namingManager,
+ m_timer->registerListenerObj(m_namingManager,
&NamingManager::update, tm);
}
}
return true;
}
-
+
/*!
* @if jp
* @brief NamingManager の終了処理
@@ -1722,7 +1722,7 @@
m_namingManager->unbindAll();
delete m_namingManager;
}
-
+
//============================================================
// Naming initialization and finalization
//============================================================
@@ -1755,7 +1755,7 @@
return true;
}
-
+
bool Manager::initFactories()
{
RTC_TRACE(("Manager::initFactories()"));
@@ -1808,7 +1808,7 @@
}
#endif // RTM_OS_LINUX
}
-
+
/*!
* @if jp
* @brief Timer の初期化
@@ -1868,7 +1868,7 @@
return true;
}
-
+
bool Manager::initLocalService()
{
RTC_TRACE(("Manager::initLocalService()"));
@@ -1934,7 +1934,7 @@
}
return;
}
-
+
/*!
* @if jp
* @brief RTコンポーネントの登録解除
@@ -1967,7 +1967,7 @@
Guard guard(m_finalized.mutex);
m_finalized.comps.push_back(comp);
}
-
+
/*!
* @if jp
* @brief createComponentの引数を処理する
@@ -1996,7 +1996,7 @@
// id should be devided into 1 or 5 elements
// RTC:[vendor]:[category]:impl_id:[version] => 5
- if (id.size() != 5)
+ if (id.size() != 5)
{
RTC_ERROR(("Invalid RTC id format.: %s", id_and_conf[0].c_str()));
return false;
@@ -2050,7 +2050,7 @@
return false;
}
ec_id = id_and_conf[0];
-
+
if (id_and_conf.size() == 2)
{
std::vector<std::string> conf(coil::split(id_and_conf[1], "&"));
@@ -2063,7 +2063,7 @@
}
return true;
}
-
+
/*!
* @if jp
* @brief RTコンポーネントのコンフィギュレーション処理
@@ -2143,12 +2143,12 @@
type_prop << name_prop;
type_prop["config_file"] = coil::flatten(coil::unique_sv(config_fname));
comp->setProperties(type_prop);
-
+
//------------------------------------------------------------
// Format component's name for NameService
std::string naming_formats;
coil::Properties& comp_prop(comp->getProperties());
-
+
naming_formats += m_config["naming.formats"];
if (comp_prop.findNode("naming.formats") != 0)
{
@@ -2156,13 +2156,13 @@
}
naming_formats = coil::flatten(coil::unique_sv(coil::split(naming_formats,
",")));
-
+
std::string naming_names;
naming_names = formatString(naming_formats.c_str(), comp->getProperties());
comp->getProperties()["naming.formats"] = naming_formats;
comp->getProperties()["naming.names"] = naming_names;
}
-
+
/*!
* @if jp
* @brief プロパティ情報のマージ
@@ -2189,7 +2189,7 @@
}
return false;
}
-
+
/*!
* @if jp
* @brief NamingServer に登録する際の登録情報を組み立てる
@@ -2203,7 +2203,7 @@
std::string name(naming_format), str("");
std::string::iterator it, it_end;
int count(0);
-
+
it = name.begin();
it_end = name.end();
for ( ; it != it_end; ++it)
@@ -2265,5 +2265,5 @@
}
return str;
}
-
+
}; // namespace RTC
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerActionListener.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerActionListener.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerActionListener.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -20,7 +20,7 @@
namespace RTM
{
-
+
//============================================================
/*!
* @if jp
@@ -32,7 +32,7 @@
ManagerActionListener::~ManagerActionListener()
{
}
-
+
/*!
* @if jp
* @class ManagerActionListenerHolder クラス
@@ -43,7 +43,7 @@
ManagerActionListenerHolder::~ManagerActionListenerHolder()
{
}
-
+
/*!
* @if jp
* @brief preShutdown コールバック関数
@@ -57,7 +57,7 @@
{
LISTENERHOLDER_CALLBACK(preShutdown, ());
}
-
+
/*!
* @if jp
* @brief postShutdown コールバック関数
@@ -71,7 +71,7 @@
{
LISTENERHOLDER_CALLBACK(postShutdown, ());
}
-
+
/*!
* @if jp
* @brief preReinit コールバック関数
@@ -85,7 +85,7 @@
{
LISTENERHOLDER_CALLBACK(preReinit, ());
}
-
+
/*!
* @if jp
* @brief postReinit コールバック関数
@@ -99,8 +99,8 @@
{
LISTENERHOLDER_CALLBACK(postReinit, ());
}
-
-
+
+
//============================================================
/*!
* @if jp
@@ -112,7 +112,7 @@
ModuleActionListener::~ModuleActionListener()
{
}
-
+
/*!
* @if jp
* @class ModuleActionListener ホルダクラス
@@ -123,7 +123,7 @@
ModuleActionListenerHolder::~ModuleActionListenerHolder()
{
}
-
+
/*!
* @if jp
* @brief preLoad コールバック関数
@@ -138,7 +138,7 @@
{
LISTENERHOLDER_CALLBACK(preLoad, (modname, funcname));
}
-
+
/*!
* @if jp
* @brief postLoad コールバック関数
@@ -153,7 +153,7 @@
{
LISTENERHOLDER_CALLBACK(postLoad, (modname, funcname));
}
-
+
/*!
* @if jp
* @brief preUnload コールバック関数
@@ -167,7 +167,7 @@
{
LISTENERHOLDER_CALLBACK(preUnload, (modname));
}
-
+
/*!
* @if jp
* @brief postUnload コールバック関数
@@ -181,8 +181,8 @@
{
LISTENERHOLDER_CALLBACK(postUnload, (modname));
}
-
-
+
+
//============================================================
/*!
* @if jp
@@ -196,7 +196,7 @@
RtcLifecycleActionListener::~RtcLifecycleActionListener()
{
}
-
+
/*!
* @if jp
* @brief デストラクタ
@@ -207,7 +207,7 @@
RtcLifecycleActionListenerHolder::~RtcLifecycleActionListenerHolder()
{
}
-
+
/*!
* @if jp
* @brief preCreate コールバック関数
@@ -221,7 +221,7 @@
{
LISTENERHOLDER_CALLBACK(preCreate, (args));
}
-
+
/*!
* @if jp
* @brief postCreate コールバック関数
@@ -235,7 +235,7 @@
{
LISTENERHOLDER_CALLBACK(postCreate, (rtobj));
}
-
+
/*!
* @if jp
* @brief preConfigure コールバック関数
@@ -249,7 +249,7 @@
{
LISTENERHOLDER_CALLBACK(preConfigure, (prop));
}
-
+
/*!
* @if jp
* @brief postConfigure コールバック関数
@@ -263,7 +263,7 @@
{
LISTENERHOLDER_CALLBACK(postConfigure, (prop));
}
-
+
/*!
* @if jp
* @brief preInitialize コールバック関数
@@ -277,7 +277,7 @@
{
LISTENERHOLDER_CALLBACK(preInitialize, ());
}
-
+
/*!
* @if jp
* @brief postInitialize コールバック関数
@@ -291,8 +291,8 @@
{
LISTENERHOLDER_CALLBACK(postInitialize, ());
}
-
-
+
+
//============================================================
/*!
* @if jp
@@ -304,7 +304,7 @@
NamingActionListener::~NamingActionListener()
{
}
-
+
/*!
* @if jp
* @brief デストラクタ
@@ -315,7 +315,7 @@
NamingActionListenerHolder::~NamingActionListenerHolder()
{
}
-
+
/*!
* @if jp
* @brief preBind コールバック関数
@@ -330,7 +330,7 @@
{
LISTENERHOLDER_CALLBACK(preBind, (rtobj, name));
}
-
+
/*!
* @if jp
* @brief postBind コールバック関数
@@ -345,7 +345,7 @@
{
LISTENERHOLDER_CALLBACK(postBind, (rtobj, name));
}
-
+
/*!
* @if jp
* @brief preUnbind コールバック関数
@@ -360,7 +360,7 @@
{
LISTENERHOLDER_CALLBACK(preUnbind, (rtobj, name));
}
-
+
/*!
* @if jp
* @brief postUnbind コールバック関数
@@ -375,8 +375,8 @@
{
LISTENERHOLDER_CALLBACK(postUnbind, (rtobj, name));
}
-
-
+
+
//============================================================
/*!
* @if jp
@@ -388,7 +388,7 @@
LocalServiceActionListener::~LocalServiceActionListener()
{
}
-
+
/*!
* @if jp
* @brief デストラクタ
@@ -399,7 +399,7 @@
LocalServiceActionListenerHolder::~LocalServiceActionListenerHolder()
{
}
-
+
/*!
* @if jp
* @brief preServiceRegister コールバック関数
@@ -414,7 +414,7 @@
{
LISTENERHOLDER_CALLBACK(preServiceRegister, (service_name));
}
-
+
/*!
* @if jp
* @brief postServiceRegister コールバック関数
@@ -429,7 +429,7 @@
{
LISTENERHOLDER_CALLBACK(postServiceRegister, (service_name, service));
}
-
+
/*!
* @if jp
* @brief preServiceInit コールバック関数
@@ -444,7 +444,7 @@
{
LISTENERHOLDER_CALLBACK(preServiceInit, (prop, service));
}
-
+
/*!
* @if jp
* @brief postServiceInit コールバック関数
@@ -459,7 +459,7 @@
{
LISTENERHOLDER_CALLBACK(postServiceInit, (prop, service));
}
-
+
/*!
* @if jp
* @brief preServiceReinit コールバック関数
@@ -474,7 +474,7 @@
{
LISTENERHOLDER_CALLBACK(preServiceReinit, (prop, service));
}
-
+
/*!
* @if jp
* @brief postServiceReinit コールバック関数
@@ -489,7 +489,7 @@
{
LISTENERHOLDER_CALLBACK(postServiceReinit, (prop, service));
}
-
+
/*!
* @if jp
* @brief postServiceFinalize コールバック関数
@@ -504,7 +504,7 @@
{
LISTENERHOLDER_CALLBACK(postServiceFinalize, (service_name, service));
}
-
+
/*!
* @if jp
* @brief preServiceFinalize コールバック関数
@@ -519,5 +519,5 @@
{
LISTENERHOLDER_CALLBACK(preServiceFinalize, (service_name, service));
}
-
+
}; // namespace RTM
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerConfig.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerConfig.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerConfig.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -31,9 +31,9 @@
namespace RTC
{
-
+
// The list of default configuration file path.
- const char* ManagerConfig::config_file_path[] =
+ const char* ManagerConfig::config_file_path[] =
{
"./rtc.conf",
"/etc/rtc.conf",
@@ -42,10 +42,10 @@
"/usr/local/etc/rtc/rtc.conf",
NULL
};
-
+
// Environment value to specify configuration file
const char* ManagerConfig::config_file_env = "RTC_MANAGER_CONFIG";
-
+
/*!
* @if jp
* @brief コンストラクタ
@@ -57,7 +57,7 @@
: m_isMaster(false)
{
}
-
+
/*!
* @if jp
* @brief コンストラクタ
@@ -70,7 +70,7 @@
{
init(argc, argv);
}
-
+
/*!
* @if jp
* @brief デストラクタ
@@ -81,7 +81,7 @@
ManagerConfig::~ManagerConfig()
{
}
-
+
/*!
* @if jp
* @brief 初期化
@@ -93,7 +93,7 @@
{
parseArgs(argc, argv);
}
-
+
/*!
* @if jp
* @brief Configuration 情報を Property に設定する
@@ -120,7 +120,7 @@
prop << m_argprop;
prop["config_file"] = m_configFile;
}
-
+
/*!
* @if jp
* @brief コマンド引数をパースする
@@ -132,9 +132,9 @@
{
coil::GetOpt get_opts(argc, argv, "af:l:o:p:d", 0);
int opt;
-
+
// if (argc == 0) return true;
-
+
while ((opt = get_opts()) > 0)
{
switch (opt)
@@ -180,7 +180,7 @@
}
return;
}
-
+
/*!
* @if jp
* @brief Configuration file の検索
@@ -191,14 +191,14 @@
bool ManagerConfig::findConfigFile()
{
// Check existance of configuration file given command arg
- if (m_configFile != "")
+ if (m_configFile != "")
{
if (fileExist(m_configFile))
{
return true;
}
}
-
+
// Search rtc configuration file from environment variable
char* env = getenv(config_file_env);
if (env != NULL)
@@ -222,7 +222,7 @@
}
return false;
}
-
+
/*!
* @if jp
* @brief システム情報を設定する
@@ -231,33 +231,33 @@
* @endif
*/
void ManagerConfig::setSystemInformation(coil::Properties& prop)
- {
+ {
//
// Get system information by using ACE_OS::uname (UNIX/Windows)
- //
+ //
coil::utsname sysinfo;
if (coil::uname(&sysinfo) != 0)
{
return;
}
-
+
//
// Getting current proccess pid by using ACE_OS::getpid() (UNIX/Windows)
//
coil::pid_t pid = coil::getpid();
char pidc[8];
snprintf(pidc, sizeof(pidc), "%d", pid);
-
+
prop.setProperty("os.name", sysinfo.sysname);
prop.setProperty("os.release", sysinfo.release);
prop.setProperty("os.version", sysinfo.version);
prop.setProperty("os.arch", sysinfo.machine);
prop.setProperty("os.hostname", sysinfo.nodename);
prop.setProperty("manager.pid", pidc);
-
+
return;
}
-
+
/*!
* @if jp
* @brief ファイルの存在確認
@@ -270,7 +270,7 @@
std::ifstream infile;
infile.open(filename.c_str(), std::ios::in);
// fial() 0: ok, !0: fail
- if (infile.fail() != 0)
+ if (infile.fail() != 0)
{
infile.close();
return false;
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerServant.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerServant.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ManagerServant.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -37,8 +37,8 @@
m_isMaster(false)
{
rtclog.setName("ManagerServant");
- coil::Properties config(m_mgr.getConfig());
-
+ coil::Properties config(m_mgr.getConfig());
+
if (coil::toBool(config["manager.is_master"], "YES", "NO", true))
{ // this is master manager
RTC_TRACE(("This manager is master."));
@@ -47,7 +47,7 @@
{
RTC_WARN(("Manager CORBA servant creation failed."));
return;
-
+
}
m_isMaster = true;
RTC_WARN(("Manager CORBA servant was successfully created."));
@@ -80,7 +80,7 @@
}
}
}
-
+
ManagerServant::~ManagerServant()
{
Guard guardm(m_masterMutex);
@@ -116,7 +116,7 @@
m_slaves.length(0);
}
-
+
/*!
* @if jp
* @brief モジュールをロードする
@@ -130,26 +130,26 @@
RTC_TRACE(("ManagerServant::load_module(%s, %s)", pathname, initfunc));
m_mgr.load(pathname, initfunc);
-
+
return ::RTC::RTC_OK;
}
-
+
/*!
* @if jp
* @brief モジュールをアンロードする
* @else
* @brief Unloading a module
* @endig
- */
+ */
RTC::ReturnCode_t ManagerServant::unload_module(const char* pathname)
{
RTC_TRACE(("ManagerServant::unload_module(%s)", pathname));
-
+
m_mgr.unload(pathname);
-
+
return ::RTC::RTC_OK;
}
-
+
/*!
* @if jp
* @brief ロード可能なモジュールのプロファイルを取得する
@@ -160,7 +160,7 @@
RTM::ModuleProfileList* ManagerServant::get_loadable_modules()
{
RTC_TRACE(("get_loadable_modules()"));
-
+
// copy local module profiles
::RTM::ModuleProfileList_var cprof = new ::RTM::ModuleProfileList();
std::vector<coil::Properties> prof(m_mgr.getLoadableModules());
@@ -190,20 +190,20 @@
#else // ORB_IS_RTORB
CORBA_SeqUtil::push_back_list(cprof, sprof);
#endif // ORB_IS_RTORB
- continue;
+ continue;
}
}
catch (...)
{
- RTC_INFO(("slave (%d) has disappeared.", i));
- m_slaves[i] = RTM::Manager::_nil();
+ RTC_INFO(("slave (%d) has disappeared.", i));
+ m_slaves[i] = RTM::Manager::_nil();
}
CORBA_SeqUtil::erase(m_slaves, i); --i;
}
}
return cprof._retn();
}
-
+
/*!
* @if jp
* @brief ロード済みのモジュールのプロファイルを取得する
@@ -214,11 +214,11 @@
RTM::ModuleProfileList* ManagerServant::get_loaded_modules()
{
RTC_TRACE(("get_loaded_modules()"));
-
+
// copy local module profiles
::RTM::ModuleProfileList_var cprof = new RTM::ModuleProfileList();
std::vector<coil::Properties> prof(m_mgr.getLoadedModules());
-
+
cprof->length(prof.size());
for (int i(0), len(prof.size()); i < len; ++i)
{
@@ -257,7 +257,7 @@
}
return cprof._retn();
}
-
+
/*!
* @if jp
* @brief コンポーネントファクトリのプロファイルを取得する
@@ -272,7 +272,7 @@
// copy local factory profiles
::RTM::ModuleProfileList_var cprof = new RTM::ModuleProfileList();
std::vector<coil::Properties> prof(m_mgr.getFactoryProfiles());
-
+
cprof->length(prof.size());
for (int i(0), len(prof.size()); i < len; ++i)
{
@@ -311,7 +311,7 @@
}
return cprof._retn();
}
-
+
/*!
* @if jp
* @brief コンポーネントを生成する
@@ -322,7 +322,7 @@
RTC::RTObject_ptr ManagerServant::create_component(const char* module_name)
{
RTC_TRACE(("create_component(%s)", module_name));
-
+
std::string arg(module_name);
std::string::size_type pos0(arg.find("&manager="));
std::string::size_type pos1(arg.find("?manager="));
@@ -348,7 +348,7 @@
// extract manager's location
std::string::size_type pos;
pos = (pos0 != std::string::npos) ? pos0 : pos1;
-
+
std::string::size_type endpos;
endpos = arg.find('&', pos + 1);
std::string mgrstr(arg.substr(pos + 1, endpos - 1 - pos));
@@ -400,8 +400,8 @@
RTC_WARN(("Manager cannot be found."));
return RTC::RTObject::_nil();
}
-
- // create component on the manager
+
+ // create component on the manager
arg.erase(pos + 1, endpos - pos);
RTC_DEBUG(("Creating component on %s", mgrstr.c_str()));
RTC_DEBUG(("arg: %s", arg.c_str()));
@@ -419,7 +419,7 @@
}
return RTC::RTObject::_nil();
}
-
+
/*!
* @if jp
* @brief コンポーネントを削除する
@@ -448,7 +448,7 @@
}
return ::RTC::RTC_OK;
}
-
+
/*!
* @if jp
* @brief 起動中のコンポーネントのリストを取得する
@@ -497,14 +497,14 @@
}
return crtcs._retn();
}
-
+
/*!
* @if jp
* @brief 起動中のコンポーネントプロファイルのリストを取得する
* @else
* @brief Getting RT-Component's profile list running on this manager
* @endig
- */
+ */
RTC::ComponentProfileList* ManagerServant::get_component_profiles()
{
RTC_TRACE(("get_component_profiles()"));
@@ -547,7 +547,7 @@
}
return cprofs._retn();
}
-
+
// manager 基本
/*!
* @if jp
@@ -564,7 +564,7 @@
m_mgr.getConfig().getNode("manager"));
return prof;
}
-
+
/*!
* @if jp
* @brief マネージャのコンフィギュレーションを取得する
@@ -586,7 +586,7 @@
#endif
return nvlist;
}
-
+
/*!
* @if jp
* @brief マネージャのコンフィギュレーションを設定する
@@ -613,7 +613,7 @@
RTC_TRACE(("is_master(): %s", m_isMaster ? "YES" : "NO"));
return m_isMaster;
}
-
+
/*!
* @if jp
* @brief マスターマネージャの取得
@@ -627,7 +627,7 @@
Guard guard(m_masterMutex);
return new ManagerList(m_masters);
}
-
+
/*!
* @if jp
* @brief マスターマネージャの追加
@@ -641,18 +641,18 @@
CORBA::Long index;
RTC_TRACE(("add_master_manager(), %d masters", m_masters.length()));
index = CORBA_SeqUtil::find(m_masters, is_equiv(mgr));
-
+
if (!(index < 0)) // found in my list
{
RTC_ERROR(("Already exists."));
return RTC::BAD_PARAMETER;
}
-
+
CORBA_SeqUtil::push_back(m_masters, RTM::Manager::_duplicate(mgr));
RTC_TRACE(("add_master_manager() done, %d masters", m_masters.length()));
return RTC::RTC_OK;
}
-
+
/*!
* @if jp
* @brief マスターマネージャの削除
@@ -668,18 +668,18 @@
CORBA::Long index;
index = CORBA_SeqUtil::find(m_masters, is_equiv(mgr));
-
+
if (index < 0) // not found in my list
{
RTC_ERROR(("Not found."));
return RTC::BAD_PARAMETER;
}
-
+
CORBA_SeqUtil::erase(m_masters, index);
RTC_TRACE(("remove_master_manager() done, %d masters", m_masters.length()));
return RTC::RTC_OK;
}
-
+
/*!
* @if jp
* @brief スレーブマネージャの取得
@@ -691,7 +691,7 @@
{
Guard guard(m_slaveMutex);
RTC_TRACE(("get_slave_managers(), %d slaves", m_slaves.length()));
-
+
return new ManagerList(m_slaves);
}
@@ -706,21 +706,21 @@
{
Guard guard(m_slaveMutex);
RTC_TRACE(("add_slave_manager(), %d slaves", m_slaves.length()));
-
+
CORBA::Long index;
index = CORBA_SeqUtil::find(m_slaves, is_equiv(mgr));
-
+
if (!(index < 0)) // found in my list
{
RTC_ERROR(("Already exists."));
return RTC::BAD_PARAMETER;
}
-
+
CORBA_SeqUtil::push_back(m_slaves, RTM::Manager::_duplicate(mgr));
RTC_TRACE(("add_slave_manager() done, %d slaves", m_slaves.length()));
return RTC::RTC_OK;;
}
-
+
/*!
* @if jp
* @brief スレーブマネージャの削除
@@ -734,43 +734,43 @@
RTC_TRACE(("remove_slave_manager(), %d slaves", m_slaves.length()));
CORBA::Long index;
index = CORBA_SeqUtil::find(m_slaves, is_equiv(mgr));
-
+
if (index < 0) // not found in my list
{
RTC_ERROR(("Not found."));
return RTC::BAD_PARAMETER;
}
-
+
CORBA_SeqUtil::erase(m_slaves, index);
RTC_TRACE(("remove_slave_manager() done, %d slaves", m_slaves.length()));
return RTC::RTC_OK;
}
-
-
-
+
+
+
RTC::ReturnCode_t ManagerServant::fork()
{
// m_mgr.fork();
return ::RTC::RTC_OK;
}
-
+
RTC::ReturnCode_t ManagerServant::shutdown()
{
m_mgr.terminate();
return ::RTC::RTC_OK;
}
-
+
RTC::ReturnCode_t ManagerServant::restart()
{
// m_mgr.restart();
return ::RTC::RTC_OK;
}
-
+
CORBA::Object_ptr ManagerServant::get_service(const char* name)
{
return ::CORBA::Object::_nil();
}
-
+
RTM::Manager_ptr ManagerServant::getObjRef() const
{
return m_objref;
@@ -793,7 +793,7 @@
// Create readable object ID
coil::Properties config(m_mgr.getConfig());
- PortableServer::ObjectId_var id;
+ PortableServer::ObjectId_var id;
#ifndef ORB_IS_RTORB
id = PortableServer::string_to_ObjectId(config["manager.name"].c_str());
#else // ORB_IS_RTORB
@@ -805,7 +805,7 @@
poa->activate_object_with_id(id.in(), this);
CORBA::Object_var mgrobj = poa->id_to_reference(id);
- // Set m_objref
+ // Set m_objref
m_objref = ::RTM::Manager::_narrow(mgrobj);
CORBA::String_var ior;
@@ -859,7 +859,7 @@
std::string iorstr((const char*)ior);
RTC_DEBUG(("Manager's IOR information:\n %s",
CORBA_IORUtil::formatIORinfo(iorstr.c_str()).c_str()));
-
+
return mgr._retn();
}
catch(CORBA::SystemException& e)
@@ -875,6 +875,6 @@
return RTM::Manager::_nil();
}
-
+
}; // namespace RTM
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ModuleManager.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ModuleManager.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/ModuleManager.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -35,7 +35,7 @@
namespace RTC
{
-
+
/*!
* @if jp
* @brief コンストラクタ
@@ -55,7 +55,7 @@
m_initFuncSuffix = prop[INITFUNC_SFX];
m_initFuncPrefix = prop[INITFUNC_PFX];
}
-
+
/*!
* @if jp
* @brief デストラクタ
@@ -67,7 +67,7 @@
{
unloadAll();
}
-
+
/*!
* @if jp
* @brief モジュールのロード
@@ -79,7 +79,7 @@
{
RTC_TRACE(("load(fname = %s)", file_name.c_str()));
if (file_name == "") throw InvalidArguments("Invalid file name.");
-
+
if (coil::isURL(file_name))
{
if (!m_downloadAllowed)
@@ -92,7 +92,7 @@
throw NotFound("Not implemented.");
}
}
-
+
// Find local file from load path or absolute directory
std::string file_path;
if (coil::isAbsolutePath(file_name))
@@ -111,7 +111,7 @@
{
file_path = findFile(file_name, m_loadPath);
}
-
+
// Now file_name is valid full path to module
if (file_path == "")
{
@@ -123,9 +123,9 @@
RTC_ERROR(("Module file not found: %s", file_path.c_str()));
throw FileNotFound(file_path.c_str());
}
-
+
DLLEntity* dll(new DLLEntity());
-
+
int retval = dll->dll.open(file_path.c_str());
if (retval != 0)
{
@@ -141,10 +141,10 @@
RTC_ERROR(("Module registration failed: %s", file_path.c_str()));
delete dll;
}
-
+
return file_path;
}
-
+
/*!
* @if jp
* @brief モジュールのロード、初期化
@@ -159,23 +159,23 @@
file_name.c_str(), init_func.c_str()));
std::string name;
name = load(file_name);
-
+
if (name == "")
{
throw InvalidOperation("Invalid file name");
}
-
+
// if (!init_func)
-
+
ModuleInitFunc init;
-
+
init = (ModuleInitFunc)this->symbol(name.c_str(), init_func);
init(&(Manager::instance()));
-
+
return name;
}
-
+
/*!
* @if jp
* @brief モジュールのアンロード
@@ -188,15 +188,15 @@
DLLEntity* dll(m_modules.find(file_name.c_str()));
if (dll == NULL)
throw NotFound(file_name.c_str());
-
+
dll->dll.close();
m_modules.unregisterObject(file_name.c_str());
-
+
delete dll;
-
+
return;
}
-
+
/*!
* @if jp
* @brief 全モジュールのアンロード
@@ -208,7 +208,7 @@
{
RTC_TRACE(("unloadAll()"));
std::vector<DLLEntity*> dlls(m_modules.getObjects());
-
+
for (int i(0), len(dlls.size()); i < len; ++i)
{
std::string ident(dlls[i]->properties["file_path"]);
@@ -217,7 +217,7 @@
}
return;
}
-
+
/*!
* @if jp
* @brief モジュールのシンボルの参照
@@ -243,16 +243,16 @@
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);
}
-
+
return func;
}
-
+
/*!
* @if jp
* @brief モジュールロードパスを指定する
@@ -266,7 +266,7 @@
m_loadPath = load_path;
return;
}
-
+
/*!
* @if jp
* @brief モジュールロードパスを追加する
@@ -279,16 +279,16 @@
RTC_TRACE(("addLoadpath(%s)", coil::flatten(load_path, ", ").c_str()));
StringVectorConstItr it(load_path.begin());
StringVectorConstItr it_end(load_path.end());
-
+
while (it != it_end)
{
m_loadPath.push_back(*it);
++it;
}
-
+
return;
}
-
+
/*!
* @if jp
* @brief ロード済みのモジュールリストを取得する
@@ -307,7 +307,7 @@
}
return modules;
}
-
+
/*!
* @if jp
* @brief ロード可能なモジュールリストを取得する(未実装)
@@ -346,7 +346,7 @@
m_modprofs.size()));
return m_modprofs;
}
-
+
/*!
* @if jp
* @brief LoadPath からのファイルの検索
@@ -361,10 +361,10 @@
coil::flatten(load_path, ", ").c_str()));
StringVectorConstItr it, it_end;
std::string file_name(fname);
-
+
it = load_path.begin();
it_end = load_path.end();
-
+
while (it != it_end)
{
std::string f((*it) + "/" + file_name);
@@ -374,10 +374,10 @@
}
++it;
}
-
+
return std::string("");
}
-
+
/*!
* @if jp
* @brief ファイルが存在するかどうかのチェック
@@ -391,7 +391,7 @@
std::ifstream infile;
infile.open(filename.c_str(), std::ios::in);
// fial() 0: ok, !0: fail
- if (infile.fail() != 0)
+ if (infile.fail() != 0)
{
infile.close();
return false;
@@ -401,10 +401,10 @@
infile.close();
return true;
}
-
+
return false;
}
-
+
/*!
* @if jp
* @brief 初期化関数シンボルを生成する
@@ -416,7 +416,7 @@
{
RTC_TRACE(("getInitFuncName(%s)", file_path.c_str()));
std::string base_name(coil::basename(file_path.c_str()));
-
+
return m_initFuncPrefix + base_name + m_initFuncSuffix;
}
@@ -483,7 +483,7 @@
suffixes[s].c_str(), coil::flatten(tmp).c_str()));
flist.insert(flist.end(), tmp.begin(), tmp.end());
}
-
+
// reformat file path and remove cached files
for (size_t j(0); j < flist.size(); ++j)
{
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NVUtil.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NVUtil.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NVUtil.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -51,7 +51,7 @@
nv.value <<= CORBA::Any::from_char(value);
return nv;
}
-
+
/*!
* @if jp
* @brief value が CORBA::Boolean の NameValue を生成する
@@ -66,7 +66,7 @@
nv.value <<= CORBA::Any::from_boolean(value);
return nv;
}
-
+
/*!
* @if jp
* @brief value が CORBA::Octet の NameValue を生成する
@@ -81,7 +81,7 @@
nv.value <<= CORBA::Any::from_octet(value);
return nv;
}
-
+
/*!
* @if jp
* @brief value が CORBA::Any の NameValue を生成する
@@ -96,7 +96,7 @@
nv.value = value;
return nv;
}
-
+
/*!
* @if jp
* @brief Properties を NVList へコピーする
@@ -114,7 +114,7 @@
keys = prop.propertyNames();
CORBA::ULong len((CORBA::ULong)keys.size());
nv.length(len);
-
+
for (CORBA::ULong i = 0; i < len; ++i)
{
// Why RtORB does not copy string to Properties.
@@ -126,7 +126,7 @@
nv[i].value <<= prop[keys[i]].c_str();
}
}
-
+
/*!
* @if jp
* @brief NVList を Properties へコピーする
@@ -146,7 +146,7 @@
};
}
}
-
+
/*!
* @if jp
* @brief NVList を Properties に変換するためのファンクタ
@@ -169,7 +169,7 @@
}
coil::Properties m_prop;
};
-
+
/*!
* @if jp
* @brief NVList を Properties へ変換する
@@ -183,7 +183,7 @@
p = CORBA_SeqUtil::for_each(nv, p);
return p.m_prop;
}
-
+
/*!
* @if jp
* @brief NVList を検索するためのファンクタ
@@ -201,7 +201,7 @@
}
std::string m_name;
};
-
+
/*!
* @if jp
* @brief NVList から name で指定された value を返す
@@ -216,7 +216,7 @@
if (index < 0) throw std::string("Not found");
return nv[index].value;
}
-
+
/*!
* @if jp
* @brief name で指定された要素のインデックスを返す
@@ -228,7 +228,7 @@
{
return CORBA_SeqUtil::find(nv, NVUtil::nv_find(name));
}
-
+
/*!
* @if jp
* @brief 指定された name の value の型が string であるか検証する
@@ -250,7 +250,7 @@
return false;
}
}
-
+
/*!
* @if jp
* @brief 指定された name の value の値が指定した文字列と一致するか検証する
@@ -271,7 +271,7 @@
}
return false;
}
-
+
/*!
* @if jp
* @brief 指定された name の NVList を string として返す。
@@ -298,10 +298,10 @@
{
str_value = "";
}
-
+
return str_value;
}
-
+
/*!
* @if jp
* @brief 指定された文字列を NVList の要素に追加する。
@@ -318,10 +318,10 @@
#endif // ORB_IS_RTORB
{
// if (!isString(nv, name)) return false;
-
+
CORBA::Long index;
index = find_index(nv, name);
-
+
if (index < 0)
{
CORBA_SeqUtil::push_back(nv, newNV(name, value));
@@ -331,7 +331,7 @@
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))
@@ -343,7 +343,7 @@
}
return true;
}
-
+
/*!
* @if jp
* @brief NVList に要素を追加する。
@@ -358,7 +358,7 @@
CORBA_SeqUtil::push_back(dest, src[i]);
}
}
-
+
/*!
* @if jp
* @brief NVList に設定されている内容を文字列として出力する。
@@ -387,7 +387,7 @@
* @if jp
* @brief NVList に設定されている内容を文字列として標準出力する。
* @else
- * @brief Print information configured in NVList as a string type
+ * @brief Print information configured in NVList as a string type
* to Standard Outport.
* @endif
*/
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NamingManager.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NamingManager.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NamingManager.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -43,7 +43,7 @@
{
rtclog.setName("NamingOnCorba");
coil::Properties& prop(Manager::instance().getConfig());
- m_replaceEndpoint =
+ m_replaceEndpoint =
coil::toBool(prop["corba.nameservice.replace_endpoint"].c_str(),
"YES", "NO", true);
@@ -160,7 +160,7 @@
}
#endif // ORB_IS_OMNIORB
}
-
+
/*!
* @if jp
* @brief 指定した CORBA オブジェクトをNamingServiceからアンバインド
@@ -180,7 +180,7 @@
return m_cosnaming.isAlive();
}
-
+
//============================================================
// NamingManager
//============================================================
@@ -195,7 +195,7 @@
:m_manager(manager), rtclog("NamingManager")
{
}
-
+
/*!
* @if jp
* @brief デストラクタ
@@ -206,7 +206,7 @@
NamingManager::~NamingManager()
{
}
-
+
/*!
* @if jp
* @brief NameServer の登録
@@ -225,7 +225,7 @@
Guard guard(m_namesMutex);
m_names.push_back(new NamingService(method, name_server, name));
}
-
+
/*!
* @if jp
* @brief 指定したオブジェクトのNamingServiceへバインド
@@ -237,7 +237,7 @@
const RTObject_impl* rtobj)
{
RTC_TRACE(("NamingManager::bindObject(%s)", name));
-
+
Guard guard(m_namesMutex);
for (int i(0), len(m_names.size()); i < len; ++i)
{
@@ -260,7 +260,7 @@
const PortBase* port)
{
RTC_TRACE(("NamingManager::bindObject(%s)", name));
-
+
Guard guard(m_namesMutex);
for (int i(0), len(m_names.size()); i < len; ++i)
{
@@ -279,11 +279,11 @@
}
registerPortName(name, port);
}
- void NamingManager::bindObject(const char* name,
+ void NamingManager::bindObject(const char* name,
const RTM::ManagerServant* mgr)
{
RTC_TRACE(("NamingManager::bindObject(%s)", name));
-
+
Guard guard(m_namesMutex);
for (int i(0), len(m_names.size()); i < len; ++i)
{
@@ -302,7 +302,7 @@
}
registerMgrName(name, mgr);
}
-
+
/*!
* @if jp
* @brief NamingServer の情報の更新
@@ -335,7 +335,7 @@
{
RTC_INFO(("Name server: %s (%s) disappeared.",
m_names[i]->nsname.c_str(),
- m_names[i]->method.c_str()));
+ m_names[i]->method.c_str()));
delete m_names[i]->ns;
m_names[i]->ns = 0;
}
@@ -347,11 +347,11 @@
m_names[i]->method.c_str()));
delete m_names[i]->ns;
m_names[i]->ns = 0;
- }
- }
+ }
+ }
}
}
-
+
/*!
* @if jp
* @brief 指定したオブジェクトをNamingServiceからアンバインド
@@ -362,7 +362,7 @@
void NamingManager::unbindObject(const char* name)
{
RTC_TRACE(("NamingManager::unbindObject(%s)", name));
-
+
Guard guard(m_namesMutex);
for (int i(0), len(m_names.size()); i < len; ++i)
{
@@ -374,7 +374,7 @@
unregisterCompName(name);
unregisterMgrName(name);
}
-
+
/*!
* @if jp
* @brief 全てのオブジェクトをNamingServiceからアンバインド
@@ -413,7 +413,7 @@
}
}
}
-
+
/*!
* @if jp
* @brief バインドされている全てのオブジェクトを取得
@@ -425,14 +425,14 @@
{
std::vector<RTObject_impl*> comps;
Guard guard(m_compNamesMutex);
-
+
for (int i(0), len(m_compNames.size()); i < len; ++i)
{
comps.push_back(const_cast<RTObject_impl*>(m_compNames[i]->rtobj));
}
return comps;
}
-
+
//============================================================
// Protected
//============================================================
@@ -470,7 +470,7 @@
}
return NULL;
}
-
+
/*!
* @if jp
* @brief 設定済みコンポーネントを NameServer に登録
@@ -485,7 +485,7 @@
ns->bindObject(m_compNames[i]->name.c_str(), m_compNames[i]->rtobj);
}
}
-
+
/*!
* @if jp
* @brief NameServer に登録するコンポーネントの設定
@@ -542,7 +542,7 @@
m_mgrNames.push_back(new Mgr(name, mgr));
return;
}
-
+
/*!
* @if jp
* @brief NameServer に登録するコンポーネントの設定解除
@@ -611,7 +611,7 @@
{
delete ns->ns;
ns->ns = 0;
- }
+ }
}
}
}; // namespace RTC
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NumberingPolicy.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NumberingPolicy.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/NumberingPolicy.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -33,9 +33,9 @@
std::string DefaultNumberingPolicy::onCreate(void* obj)
{
std::vector<void*>::size_type pos;
-
+
++m_num;
-
+
try
{
pos = find(NULL);
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrProvider.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrProvider.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortCorbaCdrProvider.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -33,14 +33,14 @@
* @endif
*/
OutPortCorbaCdrProvider::OutPortCorbaCdrProvider(void)
- : m_buffer(0)
+ : m_buffer(0)
{
// PortProfile setting
setInterfaceType("corba_cdr");
-
+
// ConnectorProfile setting
m_objref = this->_this();
-
+
// set outPort's reference
CORBA::ORB_var orb = ::RTC::Manager::instance().getORB();
CORBA::String_var ior = orb->object_to_string(m_objref.in());
@@ -57,7 +57,7 @@
push_back(m_properties,
NVUtil::newNV("dataport.corba_cdr.outport_ref", m_objref));
}
-
+
/*!
* @if jp
* @brief デストラクタ
@@ -87,7 +87,7 @@
RTC_ERROR(("Unknown exception caught."));
}
}
-
+
/*!
* @if jp
* @brief 設定初期化
@@ -115,7 +115,7 @@
* @if jp
* @brief リスナを設定する。
* @else
- * @brief Set the listener.
+ * @brief Set the listener.
* @endif
*/
void OutPortCorbaCdrProvider::setListener(ConnectorInfo& info,
@@ -160,7 +160,7 @@
cdrMemoryStream cdr;
CdrBufferBase::ReturnCode ret(m_buffer->read(cdr));
-
+
if (ret == CdrBufferBase::BUFFER_OK)
{
CORBA::ULong len((CORBA::ULong)cdr.bufSize());
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortProvider.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortProvider.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortProvider.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -32,7 +32,7 @@
OutPortProvider::~OutPortProvider(void)
{
}
-
+
/*!
* @if jp
* @brief 設定初期化
@@ -63,7 +63,7 @@
#endif // ORB_IS_RTORB
NVUtil::append(prop, m_properties);
}
-
+
/*!
* @if jp
* @brief Interface情報を公開する
@@ -79,11 +79,11 @@
{
return false;
}
-
+
NVUtil::append(prop, m_properties);
return true;
}
-
+
/*!
* @if jp
* @brief ポートタイプを設定する
@@ -95,7 +95,7 @@
{
m_portType = port_type;
}
-
+
/*!
* @if jp
* @brief データタイプを設定する
@@ -107,7 +107,7 @@
{
m_dataType = data_type;
}
-
+
/*!
* @if jp
* @brief インターフェースタイプを設定する
@@ -119,7 +119,7 @@
{
m_interfaceType = interface_type;
}
-
+
/*!
* @if jp
* @brief データフロータイプを設定する
@@ -131,7 +131,7 @@
{
m_dataflowType = dataflow_type;
}
-
+
/*!
* @if jp
* @brief サブスクリプションタイプを設定する
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortPullConnector.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortPullConnector.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortPullConnector.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -128,7 +128,7 @@
{
return m_buffer;
}
-
+
/*!
* @if jp
* @brief Bufferの生成
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortPushConnector.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortPushConnector.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/OutPortPushConnector.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -31,7 +31,7 @@
* @brief Constructor
* @endif
*/
- OutPortPushConnector::OutPortPushConnector(ConnectorInfo info,
+ OutPortPushConnector::OutPortPushConnector(ConnectorInfo info,
InPortConsumer* consumer,
ConnectorListeners& listeners,
CdrBufferBase* buffer)
@@ -45,23 +45,23 @@
{
m_buffer = createBuffer(info);
}
- if (m_publisher == 0 || m_buffer == 0 || m_consumer == 0)
+ if (m_publisher == 0 || m_buffer == 0 || m_consumer == 0)
{ throw std::bad_alloc(); }
-
+
if (m_publisher->init(info.properties) != PORT_OK)
{
throw std::bad_alloc();
}
m_buffer->init(info.properties.getNode("buffer"));
m_consumer->init(info.properties);
-
+
m_publisher->setConsumer(m_consumer);
m_publisher->setBuffer(m_buffer);
m_publisher->setListener(m_profile, &m_listeners);
onConnect();
}
-
+
/*!
* @if jp
* @brief デストラクタ
@@ -74,7 +74,7 @@
onDisconnect();
disconnect();
}
-
+
/*!
* @if jp
* @brief データの書き込み
@@ -87,10 +87,10 @@
{
RTC_TRACE(("write()"));
RTC_PARANOID(("data size = %d bytes", data.bufSize()));
-
+
return m_publisher->write(data, 0, 0);
}
-
+
/*!
* @if jp
* @brief 接続解除
@@ -109,7 +109,7 @@
pfactory.deleteObject(m_publisher);
}
m_publisher = 0;
-
+
// delete consumer
if (m_consumer != 0)
{
@@ -118,7 +118,7 @@
cfactory.deleteObject(m_consumer);
}
m_consumer = 0;
-
+
// delete buffer
if (m_buffer != 0)
{
@@ -158,7 +158,7 @@
{
m_publisher->deactivate();
}
-
+
/*!
* @if jp
* @brief Buffer を取得する
@@ -176,7 +176,7 @@
{
return m_buffer;
}
-
+
/*!
* @if jp
* @brief Publisherの生成
@@ -192,7 +192,7 @@
coil::normalize(pub_type);
return PublisherFactory::instance().createObject(pub_type);
}
-
+
/*!
* @if jp
* @brief Bufferの生成
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PeriodicECSharedComposite.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -172,12 +172,12 @@
for (MemIt it(m_rtcMembers.begin()); it != m_rtcMembers.end();)
{
Member& member(*it);
- if (strncmp(id, member.profile_->instance_name, strlen(id)))
+ if (strncmp(id, member.profile_->instance_name, strlen(id)))
{
++it;
continue;
}
-
+
removePort(member, m_expPorts);
m_rtobj->getProperties()["conf.default.exported_ports"] =
::coil::flatten(m_expPorts);
@@ -214,7 +214,7 @@
removeOrganizationFromTarget(member);
startOwnedEC(member);
::SDOPackage::Organization_impl::
- remove_member(member.profile_->instance_name);
+ remove_member(member.profile_->instance_name);
++it;
}
m_rtcMembers.clear();
@@ -233,13 +233,13 @@
::OpenRTM::DataFlowComponent_ptr& dfc)
{
if (::CORBA::is_nil(sdo)) return false;
-
+
// narrowing: SDO -> RTC (DataFlowComponent)
dfc = ::OpenRTM::DataFlowComponent::_narrow(sdo);
if (::CORBA::is_nil(dfc)) return false;
return true;
}
-
+
/*!
* @if jp
* @brief Owned ExecutionContext を停止させる
@@ -280,7 +280,7 @@
* @if jp
* @brief DFC に Organization オブジェクトを与える
* @else
- * @brief Set Organization object to target DFC
+ * @brief Set Organization object to target DFC
* @endif
*/
void PeriodicECOrganization::addOrganizationToTarget(Member& member)
@@ -289,7 +289,7 @@
// Configuration_var conf(member.config_.in());
Configuration_var conf(member.config_);
if (::CORBA::is_nil(conf)) return;
-
+
// set organization to target RTC's conf
conf->add_organization(m_objref);
}
@@ -298,14 +298,14 @@
* @if jp
* @brief Organization オブジェクトを DFCから削除する
* @else
- * @brief Remove Organization object from a target DFC
+ * @brief Remove Organization object from a target DFC
* @endif
*/
void PeriodicECOrganization::removeOrganizationFromTarget(Member& member)
{
// get given RTC's configuration object
if (::CORBA::is_nil(member.config_)) { return; }
-
+
// set organization to target RTC's conf
member.config_->remove_organization(m_pId.c_str());
}
@@ -363,7 +363,7 @@
* @endif
*/
void PeriodicECOrganization::removeParticipantFromEC(Member& member)
- {
+ {
if (::CORBA::is_nil(m_ec))
{
::RTC::ExecutionContextList_var ecs(m_rtobj->get_owned_contexts());
@@ -414,7 +414,7 @@
#else // ORB_IS_RTORB
::RTC::PortProfileList plist(member.profile_->port_profiles);
#endif // ORB_IS_RTORB
-
+
// port delegation
for (::CORBA::ULong i(0), len(plist.length()); i < len; ++i)
{
@@ -424,9 +424,9 @@
port_name.c_str(),
::coil::flatten(portlist).c_str()));
- std::vector<std::string>::iterator pos =
+ std::vector<std::string>::iterator pos =
std::find(portlist.begin(), portlist.end(), port_name);
- if (pos == portlist.end())
+ if (pos == portlist.end())
{
RTC_DEBUG(("Not found: %s is in %s?",
port_name.c_str(),
@@ -474,9 +474,9 @@
port_name.c_str(),
::coil::flatten(portlist).c_str()));
- std::vector<std::string>::iterator pos =
+ std::vector<std::string>::iterator pos =
std::find(portlist.begin(), portlist.end(), port_name);
- if (pos == portlist.end())
+ if (pos == portlist.end())
{
RTC_DEBUG(("Not found: %s is in %s?",
port_name.c_str(),
@@ -490,7 +490,7 @@
m_rtobj->removePort(plist[i].port_ref);
portlist.erase(pos);
-
+
RTC_DEBUG(("Port %s was deleted.", port_name.c_str()));
}
}
@@ -675,7 +675,7 @@
::CORBA_SeqUtil::push_back(sdos, ::SDOPackage::SDO_ptr(sdo));
#endif // ORB_IS_RTORB
}
-
+
try
{
m_org->set_members(sdos);
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortConnectListener.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortConnectListener.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortConnectListener.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -72,7 +72,7 @@
"ON_DISCONNECTED",
""
};
- type = type < PORT_CONNECT_RET_LISTENER_NUM ?
+ type = type < PORT_CONNECT_RET_LISTENER_NUM ?
type : PORT_CONNECT_RET_LISTENER_NUM;
return typeString[type];
}
@@ -97,8 +97,8 @@
PortConnectListenerHolder::PortConnectListenerHolder()
{
}
-
-
+
+
PortConnectListenerHolder::~PortConnectListenerHolder()
{
Guard guard(m_mutex);
@@ -111,20 +111,20 @@
}
}
-
+
void PortConnectListenerHolder::addListener(PortConnectListener* listener,
bool autoclean)
{
Guard guard(m_mutex);
m_listeners.push_back(Entry(listener, autoclean));
}
-
-
+
+
void PortConnectListenerHolder::removeListener(PortConnectListener* listener)
{
Guard guard(m_mutex);
std::vector<Entry>::iterator it(m_listeners.begin());
-
+
for (; it != m_listeners.end(); ++it)
{
if ((*it).first == listener)
@@ -137,10 +137,10 @@
return;
}
}
-
+
}
-
-
+
+
void PortConnectListenerHolder::notify(const char* portname,
RTC::ConnectorProfile& profile)
{
@@ -162,8 +162,8 @@
PortConnectRetListenerHolder::PortConnectRetListenerHolder()
{
}
-
+
PortConnectRetListenerHolder::~PortConnectRetListenerHolder()
{
Guard guard(m_mutex);
@@ -176,7 +176,7 @@
}
}
-
+
void PortConnectRetListenerHolder::
addListener(PortConnectRetListener* listener, bool autoclean)
{
@@ -184,7 +184,7 @@
m_listeners.push_back(Entry(listener, autoclean));
}
-
+
void PortConnectRetListenerHolder::
removeListener(PortConnectRetListener* listener)
{
@@ -202,10 +202,10 @@
return;
}
}
-
+
}
-
+
void PortConnectRetListenerHolder::notify(const char* portname,
RTC::ConnectorProfile& profile,
ReturnCode_t ret)
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortProfileHelper.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortProfileHelper.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PortProfileHelper.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -103,8 +103,8 @@
return m_name.c_str();
}
-
+
/*!
* @if jp
* @brief PortInterfaceProfile を追加する
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherFlush.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherFlush.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherFlush.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -53,7 +53,7 @@
// "consumer" should be deleted in the Connector
m_consumer = 0;
}
-
+
/*!
* @if jp
* @brief 初期化
@@ -78,7 +78,7 @@
PublisherFlush::setConsumer(InPortConsumer* consumer)
{
RTC_TRACE(("setConsumer()"));
-
+
if (consumer == 0)
{
return INVALID_ARGS;
@@ -107,7 +107,7 @@
* @else
* @brief Setting buffer pointer
* @endif
- */
+ */
::RTC::DataPortStatus::Enum
PublisherFlush::setListener(ConnectorInfo& info,
RTC::ConnectorListeners* listeners)
@@ -130,7 +130,7 @@
* @if jp
* @brief データを書き込む
* @else
- * @brief Write data
+ * @brief Write data
* @endif
*/
PublisherBase::ReturnCode PublisherFlush::write(const cdrMemoryStream& data,
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherNew.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherNew.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherNew.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -83,7 +83,7 @@
{
RTC_TRACE(("init()"));
RTC_DEBUG_STR((prop));
-
+
setPushPolicy(prop);
if (!createTask(prop))
{
@@ -102,7 +102,7 @@
PublisherBase::ReturnCode PublisherNew::setConsumer(InPortConsumer* consumer)
{
RTC_TRACE(("setConsumer()"));
-
+
if (consumer == 0)
{
RTC_ERROR(("setConsumer(consumer = 0): invalid argument."));
@@ -159,7 +159,7 @@
* @if jp
* @brief データを書き込む
* @else
- * @brief Write data
+ * @brief Write data
* @endif
*/
PublisherBase::ReturnCode PublisherNew::write(const cdrMemoryStream& data,
@@ -234,7 +234,7 @@
m_active = false;
return PORT_OK;
}
-
+
/*!
* @if jp
* @brief PublisherNew::スレッド実行関数
@@ -244,7 +244,7 @@
*/
int PublisherNew::svc(void)
{
-
+
Guard guard(m_retmutex);
switch (m_pushPolicy)
{
@@ -346,7 +346,7 @@
m_task->setPeriod(0.0);
m_task->executionMeasure(coil::toBool(prop["measurement.exec_time"],
"enable", "disable", true));
-
+
int ecount;
if (coil::stringTo(ecount, prop["measurement.exec_count"].c_str()))
{
@@ -381,7 +381,7 @@
{
cdrMemoryStream& cdr(m_buffer->get());
onBufferRead(cdr);
-
+
onSend(cdr);
ReturnCode ret(m_consumer->put(cdr));
if (ret != PORT_OK)
@@ -390,7 +390,7 @@
return invokeListener(ret, cdr);
}
onReceived(cdr);
-
+
m_buffer->advanceRptr();
}
return PORT_OK;
@@ -405,7 +405,7 @@
cdrMemoryStream& cdr(m_buffer->get());
onBufferRead(cdr);
-
+
onSend(cdr);
ReturnCode ret(m_consumer->put(cdr));
if (ret != PORT_OK)
@@ -414,9 +414,9 @@
return invokeListener(ret, cdr);
}
onReceived(cdr);
-
+
m_buffer->advanceRptr();
-
+
return PORT_OK;
}
@@ -434,10 +434,10 @@
for (int i(0); i < loopcnt; ++i)
{
m_buffer->advanceRptr(postskip);
-
+
const cdrMemoryStream& cdr(m_buffer->get());
onBufferRead(cdr);
-
+
onSend(cdr);
ret = m_consumer->put(cdr);
if (ret != PORT_OK)
@@ -457,7 +457,7 @@
else
{
if ( m_retcode != PORT_OK )
- { // put Error after
+ { // put Error after
m_leftskip = 0;
}
else
@@ -476,7 +476,7 @@
RTC_TRACE(("pushNew()"));
m_buffer->advanceRptr(m_buffer->readable() - 1);
-
+
cdrMemoryStream& cdr(m_buffer->get());
onBufferRead(cdr);
@@ -488,9 +488,9 @@
return invokeListener(ret, cdr);
}
onReceived(cdr);
-
+
m_buffer->advanceRptr();
-
+
return PORT_OK;
}
@@ -561,23 +561,23 @@
case PORT_ERROR:
onReceiverError(data);
return PORT_ERROR;
-
+
case SEND_FULL:
onReceiverFull(data);
return SEND_FULL;
-
+
case SEND_TIMEOUT:
onReceiverTimeout(data);
return SEND_TIMEOUT;
-
+
case CONNECTION_LOST:
onReceiverError(data);
return CONNECTION_LOST;
-
+
case UNKNOWN_ERROR:
onReceiverError(data);
return UNKNOWN_ERROR;
-
+
default:
onReceiverError(data);
return PORT_ERROR;
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherPeriodic.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherPeriodic.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/PublisherPeriodic.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -43,8 +43,8 @@
m_skipn(0), m_active(false), m_readback(false), m_leftskip(0)
{
}
-
+
/*!
* @if jp
* @brief デストラクタ
@@ -96,7 +96,7 @@
return PORT_OK;
}
-
+
/*!
* @if jp
* @brief InPortコンシューマのセット
@@ -165,7 +165,7 @@
* @if jp
* @brief データを書き込む
* @else
- * @brief Write data
+ * @brief Write data
* @endif
*/
PublisherBase::ReturnCode
@@ -272,7 +272,7 @@
}
return 0;
}
-
+
/*!
* @brief push all policy
*/
@@ -314,7 +314,7 @@
onSend(cdr);
ReturnCode ret(m_consumer->put(cdr));
-
+
if (ret != PORT_OK)
{
RTC_DEBUG(("%s = consumer.put()", DataPortStatus::toString(ret)));
@@ -323,7 +323,7 @@
onReceived(cdr);
m_buffer->advanceRptr();
-
+
return PORT_OK;
}
@@ -373,13 +373,13 @@
{
RTC_TRACE(("pushNew()"));
if (bufferIsEmpty()) { return BUFFER_EMPTY; }
-
+
// In case of the periodic/push_new policy, the buffer should
// allow readback. But, readback flag should be set as "true"
// after written at least one datum into the buffer.
m_readback = true;
m_buffer->advanceRptr(m_buffer->readable() - 1);
-
+
const cdrMemoryStream& cdr(m_buffer->get());
onBufferRead(cdr);
@@ -489,11 +489,11 @@
return false;
}
m_task->setPeriod(1.0/hz);
-
+
// Setting task measurement function
m_task->executionMeasure(coil::toBool(prop["measurement.exec_time"],
"enable", "disable", true));
-
+
int ecount;
if (coil::stringTo(ecount, prop["measurement.exec_count"].c_str()))
{
@@ -583,23 +583,23 @@
case PORT_ERROR:
onReceiverError(data);
return PORT_ERROR;
-
+
case SEND_FULL:
onReceiverFull(data);
return SEND_FULL;
-
+
case SEND_TIMEOUT:
onReceiverTimeout(data);
return SEND_TIMEOUT;
-
+
case CONNECTION_LOST:
onReceiverError(data);
return CONNECTION_LOST;
-
+
case UNKNOWN_ERROR:
onReceiverError(data);
return UNKNOWN_ERROR;
-
+
default:
onReceiverError(data);
return PORT_ERROR;
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTCUtil.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTCUtil.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTCUtil.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -34,7 +34,7 @@
dfp = OpenRTM::DataFlowComponent::_narrow(obj);
return !CORBA::is_nil(dfp);
}
-
+
/*!
* @if jp
* @brief FsmParticipant であるか判定する
@@ -48,7 +48,7 @@
fsmp = RTC::FsmParticipant::_narrow(obj);
return !CORBA::is_nil(fsmp);
}
-
+
/*!
* @if jp
* @brief Fsm であるか判定する
@@ -62,7 +62,7 @@
fsm = RTC::FsmObject::_narrow(obj);
return !CORBA::is_nil(fsm);
}
-
+
/*!
* @if jp
* @brief multiModeComponent であるか判定する
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObject.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObject.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/RTObject.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -54,7 +54,7 @@
"conf", "",
""
};
-
+
/*!
* @if jp
* @brief コンストラクタ
@@ -79,7 +79,7 @@
m_pSdoConfig = SDOPackage::Configuration::
_duplicate(m_pSdoConfigImpl->getObjRef());
}
-
+
/*!
* @if jp
* @brief コンストラクタ
@@ -105,7 +105,7 @@
m_pSdoConfig = SDOPackage::Configuration::
_duplicate(m_pSdoConfigImpl->getObjRef());
}
-
+
/*!
* @if jp
* @brief 仮想デストラクタ
@@ -118,7 +118,7 @@
RTC_TRACE(("~RTObject_impl()"));
m_pSdoConfigImpl->_remove_ref();
}
-
+
//============================================================
// Overridden functions
//============================================================
@@ -130,13 +130,13 @@
* @endif
*/
// The initialize action (on CREATED->ALIVE transition)
- // former rtc_init_entry()
+ // former rtc_init_entry()
ReturnCode_t RTObject_impl::onInitialize()
{
RTC_TRACE(("onInitialize()"));
return RTC::RTC_OK;
}
-
+
/*!
* @if jp
* @brief 終了処理用コールバック関数
@@ -151,7 +151,7 @@
RTC_TRACE(("onFinalize()"));
return RTC::RTC_OK;
}
-
+
/*!
* @if jp
* @brief 開始処理用コールバック関数
@@ -166,7 +166,7 @@
RTC_TRACE(("onStartup(%d)", ec_id));
return RTC::RTC_OK;
}
-
+
/*!
* @if jp
* @brief 停止処理用コールバック関数
@@ -181,7 +181,7 @@
RTC_TRACE(("onShutdown(%d)", ec_id));
return RTC::RTC_OK;
}
-
+
/*!
* @if jp
* @brief 活性化処理用コールバック関数
@@ -196,7 +196,7 @@
RTC_TRACE(("onActivated(%d)", ec_id));
return RTC::RTC_OK;
}
-
+
/*!
* @if jp
* @brief 非活性化処理用コールバック関数
@@ -211,7 +211,7 @@
RTC_TRACE(("onDeactivated(%d)", ec_id));
return RTC::RTC_OK;
}
-
+
/*!
* @if jp
* @brief 周期処理用コールバック関数
@@ -226,7 +226,7 @@
RTC_PARANOID(("onExecute(%d)", ec_id));
return RTC::RTC_OK;
}
-
+
/*!
* @if jp
* @brief 中断処理用コールバック関数
@@ -241,7 +241,7 @@
RTC_TRACE(("onAborting(%d)", ec_id));
return RTC::RTC_OK;
}
-
+
/*!
* @if jp
* @brief エラー処理用コールバック関数
@@ -256,7 +256,7 @@
RTC_TRACE(("onError(%d)", ec_id));
return RTC::RTC_OK;
}
-
+
/*!
* @if jp
* @brief リセット処理用コールバック関数
@@ -271,7 +271,7 @@
RTC_TRACE(("onReset(%d)", ec_id));
return RTC::RTC_OK;
}
-
+
/*!
* @if jp
* @brief 状態変更処理用コールバック関数
@@ -286,7 +286,7 @@
RTC_PARANOID(("onStateUpdate(%d)", ec_id));
return RTC::RTC_OK;
}
-
+
/*!
* @if jp
* @brief 動作周期変更通知用コールバック関数
@@ -301,7 +301,7 @@
RTC_TRACE(("onRatechanged(%d)", ec_id));
return RTC::RTC_OK;
}
-
+
//============================================================
// RTC::LightweightRTObject
//============================================================
@@ -352,7 +352,7 @@
assert(ret == RTC::RTC_OK);
return ret;
}
-
+
/*!
* @if jp
* @brief [CORBA interface] RTC を終了する
@@ -368,7 +368,7 @@
if (!m_exiting) { return RTC::PRECONDITION_NOT_MET; }
// Return RTC::PRECONDITION_NOT_MET,
// When the component is registered in ExecutionContext.
- // m_ecMine.length() != 0 ||
+ // m_ecMine.length() != 0 ||
if (m_ecOther.length() != 0)
{
@@ -381,13 +381,13 @@
}
CORBA_SeqUtil::clear(m_ecOther);
}
-
+
ReturnCode_t ret(on_finalize());
shutdown();
return ret;
}
-
+
/*!
* @if jp
* @brief [CORBA interface] RTC がオーナーである ExecutionContext を
@@ -428,7 +428,7 @@
return ret;
}
-
+
/*!
* @if jp
* @brief [CORBA interface] RTC が Alive 状態であるかどうか確認する。
@@ -456,7 +456,7 @@
}
return false;
}
-
+
/*!
* @if jp
* @brief [CORBA interface] ExecutionContextを取得する
@@ -494,7 +494,7 @@
return ExecutionContext::_nil();
}
-
+
/*!
* @if jp
* @brief [CORBA interface] ExecutionContextListを取得する
@@ -510,7 +510,7 @@
#ifndef ORB_IS_RTORB
ExecutionContextList_var execlist;
execlist = new ExecutionContextList();
-
+
CORBA_SeqUtil::for_each(m_ecMine, ec_copy(execlist));
#else // ORB_IS_RTORB
ExecutionContextList_var execlist;
@@ -528,7 +528,7 @@
++j;
}
}
-#endif // ORB_IS_RTORB
+#endif // ORB_IS_RTORB
return execlist._retn();
}
@@ -545,9 +545,9 @@
RTC_TRACE(("get_participating_contexts()"));
ExecutionContextList_var execlist;
execlist = new ExecutionContextList();
-
+
CORBA_SeqUtil::for_each(m_ecOther, ec_copy(execlist));
-
+
return execlist._retn();
}
@@ -567,12 +567,12 @@
CORBA::Long num;
num = CORBA_SeqUtil::find(m_ecMine, ec_find(cxt));
if (num != -1)
- {
+ {
return (ExecutionContextHandle_t)num;
}
num = CORBA_SeqUtil::find(m_ecOther, ec_find(cxt));
if (num != -1)
- {
+ {
return (ExecutionContextHandle_t)(ECOTHER_OFFSET + num);
}
return (ExecutionContextHandle_t)(-1);
@@ -600,7 +600,7 @@
{
return -1;
}
-
+
// if m_ecOther has nil element, insert attached ec to there.
for (::CORBA::ULong i(0), len(m_ecOther.length()); i < len; ++i)
{
@@ -616,12 +616,12 @@
// no space in the list, push back ec to the last.
CORBA_SeqUtil::
push_back(m_ecOther, ExecutionContextService::_duplicate(ecs));
-
+
UniqueId ec_id((m_ecOther.length() - 1) + ECOTHER_OFFSET);
onAttachExecutionContext(ec_id);
return ec_id;
}
-
+
UniqueId
RTObject_impl::bindContext(ExecutionContext_ptr exec_context)
{
@@ -636,7 +636,7 @@
{
return -1;
}
-
+
// if m_ecMine has nil element, insert attached ec to there.
for (::CORBA::ULong i(0), len(m_ecMine.length()); i < len; ++i)
{
@@ -651,7 +651,7 @@
// no space in the list, push back ec to the last.
CORBA_SeqUtil::
push_back(m_ecMine, ExecutionContextService::_duplicate(ecs));
-
+
UniqueId ec_id(m_ecMine.length() - 1);
return ec_id;
}
@@ -673,7 +673,7 @@
// ID: offset - : participating ec
// owned ec index = ID
// participate ec index = ID - offset
- if ((CORBA::ULong)ec_id < ECOTHER_OFFSET ||
+ if ((CORBA::ULong)ec_id < ECOTHER_OFFSET ||
(CORBA::ULong)(ec_id - ECOTHER_OFFSET) > len)
{
return RTC::BAD_PARAMETER;
@@ -684,16 +684,16 @@
{
return RTC::BAD_PARAMETER;
}
-
+
m_ecOther[index] = ::RTC::ExecutionContextService::_nil();
onDetachExecutionContext(ec_id);
return RTC::RTC_OK;
}
-
+
//============================================================
// RTC::RTObject
//============================================================
-
+
/*!
* @if jp
* @brief [RTObject CORBA interface] コンポーネントプロファイルを取得する
@@ -710,17 +710,17 @@
ComponentProfile_var profile
= new ComponentProfile();
#ifndef ORB_IS_RTORB
- profile->instance_name =
+ profile->instance_name =
CORBA::string_dup(m_properties["instance_name"].c_str());
- profile->type_name =
+ profile->type_name =
CORBA::string_dup(m_properties["type_name"].c_str());
- profile->description =
+ profile->description =
CORBA::string_dup(m_properties["description"].c_str());
- profile->version =
+ profile->version =
CORBA::string_dup(m_properties["version"].c_str());
- profile->vendor =
+ profile->vendor =
CORBA::string_dup(m_properties["vendor"].c_str());
- profile->category =
+ profile->category =
CORBA::string_dup(m_properties["category"].c_str());
profile->port_profiles = m_portAdmin.getPortProfileList();
#else // ORB_IS_RTORB
@@ -742,7 +742,7 @@
assert(false);
return 0;
}
-
+
/*!
* @if jp
* @brief [RTObject CORBA interface] ポートを取得する
@@ -764,8 +764,8 @@
assert(false);
return 0;
}
-
-
+
+
//============================================================
// RTC::ComponentAction
//============================================================
@@ -823,7 +823,7 @@
postOnInitialize(0, ret);
return ret;
}
-
+
/*!
* @if jp
* @brief [ComponentAction CORBA interface] RTC の終了
@@ -848,7 +848,7 @@
postOnFinalize(0, ret);
return ret;
}
-
+
/*!
* @if jp
* @brief [ComponentAction CORBA interface] RTC の開始
@@ -873,7 +873,7 @@
postOnStartup(ec_id, ret);
return ret;
}
-
+
/*!
* @if jp
* @brief [ComponentAction CORBA interface] RTC の停止
@@ -898,7 +898,7 @@
postOnShutdown(ec_id, ret);
return ret;
}
-
+
/*!
* @if jp
* @brief [ComponentAction CORBA interface] RTC の活性化
@@ -925,7 +925,7 @@
postOnActivated(ec_id, ret);
return ret;
}
-
+
/*!
* @if jp
* @brief [ComponentAction CORBA interface] RTC の非活性化
@@ -951,7 +951,7 @@
postOnDeactivated(ec_id, ret);
return ret;
}
-
+
/*!
* @if jp
* @brief [ComponentAction CORBA interface] RTC のエラー状態への遷移
@@ -976,7 +976,7 @@
postOnAborting(ec_id, ret);
return ret;
}
-
+
/*!
* @if jp
* @brief [ComponentAction CORBA interface] RTC のエラー処理
@@ -1002,7 +1002,7 @@
postOnError(ec_id, ret);
return ret;
}
-
+
/*!
* @if jp
* @brief [ComponentAction CORBA interface] RTC のリセット
@@ -1027,12 +1027,12 @@
postOnReset(ec_id, ret);
return ret;
}
-
+
/*!
* @if jp
* @brief [DataFlowComponentAction CORBA interface] RTC の定常処理(第一周期)
* @else
- * @brief [DataFlowComponentAction CORBA interface] Primary Periodic
+ * @brief [DataFlowComponentAction CORBA interface] Primary Periodic
* Operation of RTC
* @endif
*/
@@ -1055,12 +1055,12 @@
postOnExecute(ec_id, ret);
return ret;
}
-
+
/*!
* @if jp
* @brief [DataFlowComponentAction CORBA interface] RTC の定常処理(第二周期)
* @else
- * @brief [DataFlowComponentAction CORBA interface] Secondary Periodic
+ * @brief [DataFlowComponentAction CORBA interface] Secondary Periodic
* Operation of RTC
* @endif
*/
@@ -1082,7 +1082,7 @@
postOnStateUpdate(ec_id, ret);
return ret;
}
-
+
/*!
* @if jp
* @brief [DataFlowComponentAction CORBA interface] 実行周期変更通知
@@ -1107,13 +1107,13 @@
postOnRateChanged(ec_id, ret);
return ret;
}
-
+
//============================================================
// SDO interfaces
//============================================================
/*!
* @if jp
- * @brief [SDO interface] Organization リストの取得
+ * @brief [SDO interface] Organization リストの取得
* @else
* @brief [SDO interface] Get Organization list
* @endif
@@ -1135,7 +1135,7 @@
}
return new SDOPackage::OrganizationList();
}
-
+
// SDOPackage::SDO
/*!
* @if jp
@@ -1145,7 +1145,7 @@
* @endif
*/
char* RTObject_impl::get_sdo_id()
- throw (CORBA::SystemException,
+ throw (CORBA::SystemException,
SDOPackage::NotAvailable, SDOPackage::InternalError)
{
RTC_TRACE(("get_sdo_id()"));
@@ -1160,7 +1160,7 @@
throw SDOPackage::InternalError("get_sdo_id()");
}
}
-
+
/*!
* @if jp
* @brief [SDO interface] SDO タイプの取得
@@ -1169,7 +1169,7 @@
* @endif
*/
char* RTObject_impl::get_sdo_type()
- throw (CORBA::SystemException,
+ throw (CORBA::SystemException,
SDOPackage::NotAvailable, SDOPackage::InternalError)
{
RTC_TRACE(("get_sdo_type()"));
@@ -1186,16 +1186,16 @@
sdo_type = "";
return sdo_type._retn();
}
-
+
/*!
* @if jp
- * @brief [SDO interface] SDO DeviceProfile リストの取得
+ * @brief [SDO interface] SDO DeviceProfile リストの取得
* @else
* @brief [SDO interface] Get SDO DeviceProfile list
* @endif
*/
SDOPackage::DeviceProfile* RTObject_impl::get_device_profile()
- throw (CORBA::SystemException,
+ throw (CORBA::SystemException,
SDOPackage::NotAvailable, SDOPackage::InternalError)
{
RTC_TRACE(("get_device_profile()"));
@@ -1218,13 +1218,13 @@
//------------------------------------------------------------
/*!
* @if jp
- * @brief [SDO interface] SDO ServiceProfile の取得
+ * @brief [SDO interface] SDO ServiceProfile の取得
* @else
* @brief [SDO interface] Get SDO ServiceProfile
* @endif
*/
SDOPackage::ServiceProfileList* RTObject_impl::get_service_profiles()
- throw (CORBA::SystemException,
+ throw (CORBA::SystemException,
SDOPackage::NotAvailable, SDOPackage::InternalError)
{
RTC_TRACE(("get_service_profiles()"));
@@ -1242,17 +1242,17 @@
}
return sprofiles._retn();
}
-
+
/*!
* @if jp
- * @brief [SDO interface] 特定のServiceProfileの取得
+ * @brief [SDO interface] 特定のServiceProfileの取得
* @else
* @brief [SDO interface] Get specified ServiceProfile
* @endif
*/
SDOPackage::ServiceProfile*
RTObject_impl::get_service_profile(const char* id)
- throw (CORBA::SystemException,
+ throw (CORBA::SystemException,
SDOPackage::InvalidParameter, SDOPackage::NotAvailable,
SDOPackage::InternalError)
{
@@ -1262,7 +1262,7 @@
InvalidParameter("get_service_profile(): Empty name.");
}
RTC_TRACE(("get_service_profile(%s))", id));
-
+
SDOPackage::ServiceProfile_var prof;
try
{
@@ -1280,7 +1280,7 @@
}
return prof._retn();
}
-
+
/*!
* @if jp
* @brief [SDO interface] 指定された SDO Service の取得
@@ -1289,7 +1289,7 @@
* @endif
*/
SDOPackage::SDOService_ptr RTObject_impl::get_sdo_service(const char* id)
- throw (CORBA::SystemException,
+ throw (CORBA::SystemException,
SDOPackage::InvalidParameter, SDOPackage::NotAvailable,
SDOPackage::InternalError)
{
@@ -1314,16 +1314,16 @@
}
return sdo;
}
-
+
/*!
* @if jp
- * @brief [SDO interface] Configuration オブジェクトの取得
+ * @brief [SDO interface] Configuration オブジェクトの取得
* @else
* @brief [SDO interface] Get Configuration object
* @endif
*/
SDOPackage::Configuration_ptr RTObject_impl::get_configuration()
- throw (CORBA::SystemException,
+ throw (CORBA::SystemException,
SDOPackage::InterfaceNotImplemented, SDOPackage::NotAvailable,
SDOPackage::InternalError)
{
@@ -1348,16 +1348,16 @@
}
return SDOPackage::Configuration::_nil();
}
-
+
/*!
* @if jp
- * @brief [SDO interface] Monitoring オブジェクトの取得
+ * @brief [SDO interface] Monitoring オブジェクトの取得
* @else
* @brief [SDO interface] Get Monitoring object
* @endif
*/
SDOPackage::Monitoring_ptr RTObject_impl::get_monitoring()
- throw (CORBA::SystemException,
+ throw (CORBA::SystemException,
SDOPackage::InterfaceNotImplemented, SDOPackage::NotAvailable,
SDOPackage::InternalError)
{
@@ -1365,16 +1365,16 @@
throw SDOPackage::InterfaceNotImplemented();
return SDOPackage::Monitoring::_nil();
}
-
+
/*!
* @if jp
- * @brief [SDO interface] Organization リストの取得
+ * @brief [SDO interface] Organization リストの取得
* @else
* @brief [SDO interface] Get Organization list
* @endif
*/
SDOPackage::OrganizationList* RTObject_impl::get_organizations()
- throw (CORBA::SystemException,
+ throw (CORBA::SystemException,
SDOPackage::NotAvailable, SDOPackage::InternalError)
{
RTC_TRACE(("get_organizations()"));
@@ -1391,16 +1391,16 @@
}
return new SDOPackage::OrganizationList(0);
}
-
+
/*!
* @if jp
- * @brief [SDO interface] SDO Status リストの取得
+ * @brief [SDO interface] SDO Status リストの取得
* @else
* @brief [SDO interface] Get SDO Status list
* @endif
*/
SDOPackage::NVList* RTObject_impl::get_status_list()
- throw (CORBA::SystemException,
+ throw (CORBA::SystemException,
SDOPackage::NotAvailable, SDOPackage::InternalError)
{
RTC_TRACE(("get_status_list()"));
@@ -1416,16 +1416,16 @@
}
return new SDOPackage::NVList(0);
}
-
+
/*!
* @if jp
- * @brief [SDO interface] SDO Status の取得
+ * @brief [SDO interface] SDO Status の取得
* @else
* @brief [SDO interface] Get SDO Status
* @endif
*/
CORBA::Any* RTObject_impl::get_status(const char* name)
- throw (CORBA::SystemException,
+ throw (CORBA::SystemException,
SDOPackage::InvalidParameter, SDOPackage::NotAvailable,
SDOPackage::InternalError)
{
@@ -1446,7 +1446,7 @@
}
return new CORBA::Any();
}
-
+
//============================================================
// Local methods
//============================================================
@@ -1469,7 +1469,7 @@
m_profile.instance_name = (char *)m_properties["instance_name"].c_str();
#endif // ORB_IS_RTORB
}
-
+
/*!
* @if jp
* @brief [local interface] Naming Server 情報の取得
@@ -1482,7 +1482,7 @@
RTC_TRACE(("getNamingNames()"));
return coil::split(m_properties["naming.names"], ",");
}
-
+
/*!
* @if jp
* @brief [local interface] オブジェクトリファレンスの設定
@@ -1495,7 +1495,7 @@
RTC_TRACE(("setObjRef()"));
m_objref = RTC::RTObject::_duplicate(rtobj);
}
-
+
/*!
* @if jp
* @brief [local interface] オブジェクトリファレンスの取得
@@ -1509,7 +1509,7 @@
return m_objref;
}
-
+
/*!
* @if jp
* @brief [local interface] RTC のプロパティを設定する
@@ -1537,7 +1537,7 @@
m_profile.category = (char*)m_properties["category"].c_str();
#endif //ORB_IS_RTORB
}
-
+
/*!
* @if jp
* @brief [local interface] RTC のプロパティを取得する
@@ -1550,7 +1550,7 @@
RTC_TRACE(("getProperties()"));
return m_properties;
}
-
+
/*!
* @if jp
* @brief コンフィギュレーションパラメータの更新(ID指定)
@@ -1564,7 +1564,7 @@
m_configsets.update(config_set);
return;
}
-
+
/*!
* @if jp
* @brief [local interface] Port を登録する
@@ -1586,7 +1586,7 @@
onAddPort(port.getPortProfile());
return m_portAdmin.addPort(port);
}
-
+
void RTObject_impl::registerPort(PortService_ptr port)
{
RTC_TRACE(("registerPort(PortBase&)"));
@@ -1613,9 +1613,9 @@
std::string tmp(port.getName());
coil::vstring vtmp = coil::split(tmp, ".");
propkey += vtmp.back();
- m_properties.getNode(propkey)
+ m_properties.getNode(propkey)
<< m_properties.getNode("port.corba");
-
+
port.init(m_properties.getNode(propkey));
return addPort((PortBase&)port);
}
@@ -1638,7 +1638,7 @@
<< m_properties.getNode("port.inport.dataport");
bool ret(addPort(inport));
-
+
if (!ret)
{
RTC_ERROR(("addInPort() failed."));
@@ -1672,14 +1672,14 @@
OutPortBase& outport)
{
RTC_TRACE(("addOutPort(%s)", name));
-
+
std::string propkey("port.outport.");
propkey += name;
- m_properties.getNode(propkey)
+ m_properties.getNode(propkey)
<< m_properties.getNode("port.outport.dataport");
-
+
bool ret(addPort(outport));
-
+
if (!ret)
{
RTC_ERROR(("addOutPort() failed."));
@@ -1690,7 +1690,7 @@
m_outports.push_back(&outport);
return ret;
}
-
+
void RTObject_impl::registerOutPort(const char* name,
OutPortBase& outport)
{
@@ -1701,7 +1701,7 @@
RTC_ERROR(("addOutPort(%s) failed.", name));
}
}
-
+
/*!
* @if jp
* @brief [local interface] DataInPort を削除する
@@ -1996,14 +1996,14 @@
* @return 読み込み結果(全ポートの読み込み成功:true，失敗:false)
* @else
* @brief Readout the value from All InPorts.
- * @return result (Successful:true, Failed:false)
+ * @return result (Successful:true, Failed:false)
* @endif
*/
bool RTObject_impl::readAll()
{
RTC_TRACE(("readAll()"));
- std::vector<InPortBase*>::iterator it = m_inports.begin();
- std::vector<InPortBase*>::iterator it_end = m_inports.end();
+ std::vector<InPortBase*>::iterator it = m_inports.begin();
+ std::vector<InPortBase*>::iterator it_end = m_inports.end();
bool ret(true);
while ( it != it_end )
@@ -2027,15 +2027,15 @@
* @brief 全 OutPort のwrite()メソッドをコールする。
* @return 読み込み結果(全ポートへの書き込み成功:true，失敗:false)
* @else
- * @brief The write() method of all OutPort is called.
+ * @brief The write() method of all OutPort is called.
* @return result (Successful:true, Failed:false)
* @endif
*/
bool RTObject_impl::writeAll()
{
RTC_TRACE(("writeAll()"));
- std::vector<OutPortBase*>::iterator it = m_outports.begin();
- std::vector<OutPortBase*>::iterator it_end = m_outports.end();
+ std::vector<OutPortBase*>::iterator it = m_outports.begin();
+ std::vector<OutPortBase*>::iterator it_end = m_outports.end();
bool ret(true);
@@ -2062,14 +2062,14 @@
* readAll()が呼出されるようになる。
* パラメータがfalseの場合は、readAll()呼出を無効にする。
*
- * @param read(default:true)
+ * @param read(default:true)
* (readAll()メソッド呼出あり:true, readAll()メソッド呼出なし:false)
*
* @else
*
- * @brief Set whether to execute the readAll() method.
+ * @brief Set whether to execute the readAll() method.
*
- * Set whether to execute the readAll() method.
+ * Set whether to execute the readAll() method.
*
* @param read(default:true)
* (readAll() is called:true, readAll() isn't called:false)
@@ -2092,14 +2092,14 @@
* writeAll()が呼出されるようになる。
* パラメータがfalseの場合は、writeAll()呼出を無効にする。
*
- * @param write(default:true)
+ * @param write(default:true)
* (writeAll()メソッド呼出あり:true, writeAll()メソッド呼出なし:false)
*
* @else
*
- * @brief Set whether to execute the writeAll() method.
+ * @brief Set whether to execute the writeAll() method.
*
- * Set whether to execute the writeAll() method.
+ * Set whether to execute the writeAll() method.
*
* @param write(default:true)
* (writeAll() is called:true, writeAll() isn't called:false)
@@ -2170,7 +2170,7 @@
m_eclist.clear();
}
}
-
+
/*!
* @if jp
* @brief PreComponentActionListener リスナを追加する
@@ -2188,8 +2188,8 @@
m_actionListeners.
preaction_[listener_type].addListener(listener, autoclean);
}
-
-
+
+
/*!
* @if jp
* @brief PreComponentActionListener リスナを削除する
@@ -2386,7 +2386,7 @@
* @if jp
* @brief ConfigurationParamListener を追加する
* @else
- * @brief Adding ConfigurationParamListener
+ * @brief Adding ConfigurationParamListener
* @endif
*/
void RTObject_impl::
@@ -2401,7 +2401,7 @@
* @if jp
* @brief ConfigurationParamListener を削除する
* @else
- * @brief Removing ConfigurationParamListener
+ * @brief Removing ConfigurationParamListener
* @endif
*/
void RTObject_impl::
@@ -2415,7 +2415,7 @@
* @if jp
* @brief ConfigurationSetListener を追加する
* @else
- * @brief Adding ConfigurationSetListener
+ * @brief Adding ConfigurationSetListener
* @endif
*/
void RTObject_impl::
@@ -2430,7 +2430,7 @@
* @if jp
* @brief ConfigurationSetListener を削除する
* @else
- * @brief Removing ConfigurationSetListener
+ * @brief Removing ConfigurationSetListener
* @endif
*/
void RTObject_impl::
@@ -2444,7 +2444,7 @@
* @if jp
* @brief ConfigurationSetNameListener を追加する
* @else
- * @brief Adding ConfigurationSetNameListener
+ * @brief Adding ConfigurationSetNameListener
* @endif
*/
void RTObject_impl::
@@ -2459,7 +2459,7 @@
* @if jp
* @brief ConfigurationSetNameListener を削除する
* @else
- * @brief Removing ConfigurationSetNameListener
+ * @brief Removing ConfigurationSetNameListener
* @endif
*/
void RTObject_impl::
@@ -2468,8 +2468,8 @@
{
m_configsets.removeConfigurationSetNameListener(type, listener);
}
-
-
+
+
/*!
* @if jp
* @brief RTC を終了する
@@ -2671,7 +2671,7 @@
}
return RTC::RTC_OK;
}
-
+
/*!
* @brief finding existing EC from the factory
*/
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoConfiguration.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoConfiguration.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoConfiguration.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -31,48 +31,48 @@
* @if jp
*
* @brief SDO ConfigurationSetを プロパティに格納
- *
+ *
* SDO ConfigurationSetを RTC用プロパティに格納する。
*
* @param prop 格納先プロパティ
* @param conf SDO ConfigurationSet
- *
+ *
* @else
*
* @brief Store SDO ConfigurationSet to properties
- *
+ *
* Store SDO ConfigurationSet to properties for RTC.
*
* @param prop Properties to store
* @param conf SDO ConfigurationSet
- *
+ *
* @endif
*/
- void
+ void
toProperties(coil::Properties& prop, const SDOPackage::ConfigurationSet& conf)
{
NVUtil::copyToProperties(prop, conf.configuration_data);
}
-
+
/*!
* @if jp
*
* @brief プロパティを SDO ConfigurationSetに変換
- *
+ *
* RTC用プロパティをSDO ConfigurationSetに変換する。
*
* @param conf 格納先 SDO ConfigurationSet
* @param prop プロパティ
- *
+ *
* @else
*
* @brief Convert properties into SDO ConfigurationSet
- *
+ *
* Convert properties for RTC into SDO ConfigurationSet.
*
* @param conf SDO ConfigurationSet to store
* @param prop Properties
- *
+ *
* @endif
*/
void
@@ -88,11 +88,11 @@
#endif // ORB_IS_RTORB
NVUtil::copyFromProperties(conf.configuration_data, prop);
}
-
+
//============================================================
// Ctor and Dtor
//============================================================
-
+
/* @if jp
* @brief コンストラクタ
* @else
@@ -106,7 +106,7 @@
{
m_objref = this->_this();
}
-
+
/* @if jp
* @brief 仮想デストラクタ
* @else
@@ -117,9 +117,9 @@
{
}
-
+
//============================================================
- // Basic Configuration
+ // Basic Configuration
//============================================================
/* @if jp
* @brief [CORBA interface] SDO の DeviceProfile をセットする
@@ -146,7 +146,7 @@
}
return true;
}
-
+
/*!
* @if jp
* @brief [CORBA interface] SDO の ServiceProfile のセット
@@ -175,14 +175,14 @@
}
return false;
}
-
+
/*!
* @if jp
* @brief [CORBA interface] Organization の追加
* @else
* @brief [CORBA interface] Add Organization
* @endif
- */
+ */
CORBA::Boolean
Configuration_impl::add_organization(Organization_ptr org)
throw (CORBA::SystemException,
@@ -202,14 +202,14 @@
}
return true;
}
-
+
/*!
* @if jp
* @brief [CORBA interface] ServiceProfile の削除
* @else
* @brief [CORBA interface] Remove ServiceProfile
* @endif
- */
+ */
CORBA::Boolean
Configuration_impl::remove_service_profile(const char* id)
throw (CORBA::SystemException,
@@ -226,12 +226,12 @@
}
return false;
}
-
+
/*!
* @if jp
* @brief [CORBA interface] Organization の参照の削除
* @else
- * @brief [CORBA interface] Remove the reference of Organization
+ * @brief [CORBA interface] Remove the reference of Organization
* @endif
*/
CORBA::Boolean
@@ -253,7 +253,7 @@
}
return true;
}
-
+
//============================================================
// Configuration Parameter manipulation
//============================================================
@@ -263,7 +263,7 @@
* @else
* @brief [CORBA interface] Get a list of configuration parameters
* @endif
- */
+ */
ParameterList*
Configuration_impl::get_configuration_parameters()
throw (CORBA::SystemException,
@@ -285,7 +285,7 @@
// never reach here
return new ParameterList(0);
}
-
+
/*!
* @if jp
* @brief [CORBA interface] Configuration parameter の値のリストの取得
@@ -302,7 +302,7 @@
Guard guard(m_config_mutex);
NVList_var nvlist;
nvlist = new NVList((CORBA::ULong)0);
-
+
/*
CORBA::Long index;
index = getActiveConfigIndex();
@@ -313,7 +313,7 @@
*/
return nvlist._retn();
}
-
+
/*!
* @if jp
* @brief [CORBA interface] Configuration parameter の値の取得
@@ -328,24 +328,24 @@
{
RTC_TRACE(("get_configuration_parameter_value(%s)", name));
if (std::string(name).empty()) throw InvalidParameter("Name is empty.");
-
+
// CORBA::Long index;
CORBA::Any_var value;
value = new CORBA::Any();
/*
index = getActiveConfigIndex();
if (index < 0) throw InternalError("No active configuration.");
-
+
CORBA::Long item;
item = CORBA_SeqUtil::find(m_configurations[index].configuration_data,
nv_name(name));
- if (item < 0) throw InvalidParameter("No such name.");
-
+ if (item < 0) throw InvalidParameter("No such name.");
+
value = new CORBA::Any(m_configurations[index].configuration_data[item].value);
*/
return value._retn();
}
-
+
/*!
* @if jp
* @brief [CORBA interface] Configuration パラメータの変更
@@ -362,23 +362,23 @@
RTC_TRACE(("set_configuration_parameter(%s, value)", name));
/*
if (name == "") throw InvalidParameter("Name is empty.");
-
+
CORBA::Long index(getActiveConfigIndex());
if (index < 0) throw InternalError("No active config.");
-
+
CORBA::Long item;
item = CORBA_SeqUtil::find(m_configurations[index].configuration_data,
nv_name(name));
if (item < 0) throw InvalidParameter("No such name.");
-
+
m_configurations[index].configuration_data[item].value = value;
*/
return true;
}
-
+
/*!
* @if jp
- * @brief [CORBA interface] ConfigurationSet リストの取得
+ * @brief [CORBA interface] ConfigurationSet リストの取得
* @else
* @brief [CORBA interface] Get a list of ConfigurationSet
* @endif
@@ -392,9 +392,9 @@
try
{
Guard guard(m_config_mutex);
-
+
std::vector<coil::Properties*> cf(m_configsets.getConfigurationSets());
- ConfigurationSetList_var config_sets =
+ 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());
@@ -403,7 +403,7 @@
{
toConfigurationSet(config_sets[i], *(cf[i]));
}
-
+
return config_sets._retn();
}
catch (CORBA::SystemException& e)
@@ -424,7 +424,7 @@
// never reach here
return new ConfigurationSetList(0);
}
-
+
/*!
* @if jp
* @brief [CORBA interface] ConfigurationSet の取得
@@ -439,11 +439,11 @@
{
RTC_TRACE(("get_configuration_set(%s)", id));
if (std::string(id).empty()) throw InternalError("ID is empty");
- // Originally getConfigurationSet raises InvalidParameter according to the
+ // Originally getConfigurationSet raises InvalidParameter according to the
// SDO specification. However, SDO's IDL lacks InvalidParameter.
-
+
Guard guard(m_config_mutex);
-
+
try
{
if (!m_configsets.haveConfig(id))
@@ -457,9 +457,9 @@
RTC_ERROR(("Unknown exception"));
throw InternalError("Unknown exception");
}
-
+
const coil::Properties& configset(m_configsets.getConfigurationSet(id));
-
+
try
{
ConfigurationSet_var config;
@@ -477,7 +477,7 @@
RTC_FATAL(("never reach here"));
return new ConfigurationSet();
}
-
+
/*!
* @if jp
* @brief [CORBA interface] ConfigurationSet をセットする
@@ -494,12 +494,12 @@
RTC_TRACE(("set_configuration_set_values()"));
std::string id(configuration_set.id);
if (id.empty()) throw InvalidParameter("ID is empty.");
-
+
try
{
coil::Properties conf(id.c_str());
toProperties(conf, configuration_set);
-
+
//------------------------------------------------------------
// Because the format of port-name had been changed from
// <port_name> to <instance_name>.<port_name>, the following
@@ -537,14 +537,14 @@
}
return true;
}
-
+
/*!
* @if jp
* @brief [CORBA interface] アクティブな ConfigurationSet を取得する
* @else
* @brief [CORBA interface] Get active ConfigurationSet
* @endif
- */
+ */
ConfigurationSet*
Configuration_impl::get_active_configuration_set()
throw (CORBA::SystemException,
@@ -552,8 +552,8 @@
{
RTC_TRACE(("get_active_configuration_set()"));
// activeなConfigurationSetは無い
- if (!m_configsets.isActive()) throw NotAvailable();
-
+ if (!m_configsets.isActive()) throw NotAvailable();
+
try
{
Guard gurad(m_config_mutex);
@@ -570,7 +570,7 @@
// never reach here
return new ConfigurationSet();
}
-
+
/*!
* @if jp
* @brief [CORBA interface] ConfigurationSet を追加する
@@ -604,7 +604,7 @@
}
return true;
}
-
+
/*!
* @if jp
* @brief [CORBA interface] ConfigurationSet を削除する
@@ -620,7 +620,7 @@
RTC_TRACE(("remove_configuration_set(%s)", id));
if (std::string(id).empty())
throw InvalidParameter("ID is empty.");
-
+
try
{
Guard guard(m_config_mutex);
@@ -633,14 +633,14 @@
}
return false;
}
-
+
/*!
* @if jp
* @brief [CORBA interface] ConfigurationSet のアクティブ化
* @else
* @brief [CORBA interface] Activate ConfigurationSet
* @endif
- */
+ */
CORBA::Boolean
Configuration_impl::activate_configuration_set(const char* id)
throw (CORBA::SystemException,
@@ -649,7 +649,7 @@
RTC_TRACE(("activate_configuration_set(%s)", id));
if (std::string(id).empty())
throw InvalidParameter("ID is empty.");
-
+
if (m_configsets.activateConfigurationSet(id))
{
return true;
@@ -671,11 +671,11 @@
*/
return false;
}
-
+
//============================================================
// Local interfaces
//============================================================
-
+
/*!
* @if jp
* @brief オブジェクト リファレンスを取得する
@@ -687,7 +687,7 @@
{
return m_objref;
}
-
+
/*!
* @if jp
* @brief SDO の DeviceProfile を取得する
@@ -699,7 +699,7 @@
{
return m_deviceProfile;
}
-
+
/*!
* @if jp
* @brief SDO の Organization リストを取得する
@@ -711,7 +711,7 @@
{
return m_organizations;
}
-
+
/*!
* @if jp
* @brief UUIDを生成する
@@ -724,7 +724,7 @@
coil::UUID_Generator uugen;
uugen.init();
std::auto_ptr<coil::UUID> uuid(uugen.generateUUID(2, 0x01));
-
+
return (const char*) uuid->to_string();
}
}; // namespace SDOPackage
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoOrganization.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoOrganization.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SdoOrganization.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -17,7 +17,7 @@
*
*/
-#include <coil/UUID.h>
+#include <coil/UUID.h>
#include <rtm/SdoOrganization.h>
#include <rtm/CORBA_SeqUtil.h>
#include <memory>
@@ -62,7 +62,7 @@
m_dependency = OWN;
m_objref = this->_this();
}
-
+
/* @if jp
* @brief 仮想デストラクタ
* @else
@@ -72,7 +72,7 @@
Organization_impl::~Organization_impl()
{
}
-
+
/*!
* @if jp
* @brief [CORBA interface] Organization ID を取得する
@@ -87,7 +87,7 @@
RTC_TRACE(("get_organization_id() = %s", m_pId.c_str()));
return CORBA::string_dup(m_pId.c_str());
}
-
+
/*!
* @if jp
* @brief [CORBA interface] OrganizationProperty の取得
@@ -105,7 +105,7 @@
prop = new OrganizationProperty(m_orgProperty);
return prop._retn();
}
-
+
/*!
* @if jp
* @brief [CORBA interface] OrganizationProperty の特定の値の取得
@@ -121,13 +121,13 @@
RTC_TRACE(("get_organization_property_value(%s)", name));
if (std::string(name).empty())
throw InvalidParameter("Empty name.");
-
+
CORBA::Long index;
index = CORBA_SeqUtil::find(m_orgProperty.properties, nv_name(name));
-
+
if (index < 0)
throw InvalidParameter("Not found.");
-
+
try
{
CORBA::Any_var value;
@@ -141,7 +141,7 @@
// never reach here
return new CORBA::Any();
}
-
+
/*!
* @if jp
* @brief [CORBA interface] OrganizationProperty のセット
@@ -168,7 +168,7 @@
}
return false;
}
-
+
/*!
* @if jp
* @brief [CORBA interface] OrganizationProperty の値のセット
@@ -187,7 +187,7 @@
{
throw InvalidParameter("set_organization_property_value(): Enpty name.");
}
-
+
CORBA::Long index;
index = CORBA_SeqUtil::find(m_orgProperty.properties, nv_name(name));
if (index < 0)
@@ -203,14 +203,14 @@
}
return true;
}
-
+
/*!
* @if jp
* @brief [CORBA interface] OrganizationProperty の削除
* @else
* @brief [CORBA interface] Remove specified OrganizationProperty
* @endif
- */
+ */
CORBA::Boolean
Organization_impl::remove_organization_property(const char* name)
throw (CORBA::SystemException,
@@ -219,12 +219,12 @@
RTC_TRACE(("remove_organization_property(%s)", name));
if (std::string(name).empty())
throw InvalidParameter("remove_organization_property(): Enpty name.");
-
+
CORBA::Long index;
index = CORBA_SeqUtil::find(m_orgProperty.properties, nv_name(name));
if (index < 0)
throw InvalidParameter("remove_organization_property(): Not found.");
-
+
try
{
CORBA_SeqUtil::erase(m_orgProperty.properties, index);
@@ -236,7 +236,7 @@
}
return false;
}
-
+
/*!
* @if jp
* @brief [CORBA interface] Organization のオーナーを取得する
@@ -251,7 +251,7 @@
RTC_TRACE(("get_owner()"));
return m_varOwner._retn();
}
-
+
/*!
* @if jp
* @brief [CORBA interface] Organization にオーナーをセットする
@@ -277,7 +277,7 @@
}
return true;
}
-
+
/*!
* @if jp
* @brief [CORBA interface] Organization のメンバーを取得する
@@ -301,7 +301,7 @@
throw InternalError("get_members()");
}
}
-
+
/*!
* @if jp
* @brief [CORBA interface] SDO の セット
@@ -327,7 +327,7 @@
}
return true;
}
-
+
/*!
* @if jp
* @brief [CORBA interface] SDO メンバーの追加
@@ -354,7 +354,7 @@
}
return false;
}
-
+
/*!
* @if jp
* @brief [CORBA interface] SDO メンバーの削除
@@ -373,16 +373,16 @@
RTC_ERROR(("remove_member(): Enpty name."));
throw InvalidParameter("remove_member(): Enpty name.");
}
-
+
CORBA::Long index;
index = CORBA_SeqUtil::find(m_memberList, sdo_id(id));
-
+
if (index < 0)
{
RTC_ERROR(("remove_member(): Not found."));
throw InvalidParameter("remove_member(): Not found.");
}
-
+
try
{
CORBA_SeqUtil::erase(m_memberList, index);
@@ -395,7 +395,7 @@
}
return false;
}
-
+
/*!
* @if jp
* @brief [CORBA interface] Organization の DependencyType を取得
@@ -410,7 +410,7 @@
RTC_TRACE(("get_dependency()"));
return m_dependency;
}
-
+
/*!
* @if jp
* @brief [CORBA interface] Organization の DependencyType をセットする
Modified: branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SystemLogger.cpp
===================================================================
--- branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SystemLogger.cpp 2017-01-18 04:00:44 UTC (rev 2855)
+++ branches/DEV_IQ_2016/OpenRTM-aist/src/lib/rtm/SystemLogger.cpp 2017-01-18 04:28:17 UTC (rev 2856)
@@ -159,7 +159,7 @@
timer = tm.sec();
date = gmtime_r(&timer, date);
-
+
strftime(buf, sizeof(buf), m_dateFormat.c_str(), date);
std::string fmt(buf);
More information about the openrtm-commit
mailing list