Actions
機能 #2339
closedRTCに継承されるプロパティ inherit_prop と取扱方法の変更, DefaultConfigurationの変更
Start date:
02/03/2012
Due date:
% Done:
100%
Estimated time:
Description
RTCに継承されるプロパティ inherit_prop に以下の修正を行う。
実行コンテキストのオプションは exec_cxt -> ec に変更。
synchronous transition関係のオプションが追加。
ecにperiodicとevent drivenの区別を無くする。
Manager.cpp
+ "ec.type",
+ "ec.rate",
+ "ec.synchronous_transition",
+ "ec.synchronous_activation",
+ "ec.synchronous_deactivation",
+ "ec.synchronous_reset",
+ "ec.transition_timeout",
+ "ec.activation_timeout",
+ "ec.deactivation_timeout",
+ "ec.reset_timeout",
"exec_cxt.periodic.type",
"exec_cxt.periodic.rate",
- "exec_cxt.evdriven.type",
さらに、存在しないプロパティは継承しないように変更。（でないと、空のプロパティが大量にできてしまうから。）
Manager.cpp
for (int i(0); inherit_prop[i][0] != '\0'; ++i)
{
const char* key(inherit_prop[i]);
- prop[key] = m_config[key];
+ if (m_config.findNode(key) != NULL)
+ {
+ prop[key] = m_config[key];
+ }
}
さらにDefaultConfigurationも変更
Index: DefaultConfiguration.h
===================================================================
--- DefaultConfiguration.h (revision 2275)
+++ DefaultConfiguration.h (working copy)
@@ -72,9 +72,10 @@
"corba.nameservers", "localhost",
"corba.master_manager", "localhost:2810",
"corba.nameservice.replace_endpoint", "NO",
- "exec_cxt.periodic.type", "PeriodicExecutionContext",
- "exec_cxt.periodic.rate", "1000",
- "exec_cxt.evdriven.type", "EventDrivenExecutionContext",
+ "ec.type", "PeriodicExecutionContext",
+ "ec.rate", "1000",
+ "ec.synchronous_transition", "YES",
+ "ec.transition_timeout", "0.5",
"manager.modules.load_path", "./",
"manager.modules.abs_path_allowed", "YES",
"manager.is_master", "NO",
Updated by n-ando over 12 years ago
rtc.confに於いてexec_cxtをec変更するのは取り止めにする。
- ec->exec_cxt (ただし、コンポーネント個別のconfigファイルでは個別ECの指定にec.を使用)
- synchronous_xxxはsync_xxxに変更
- exec_cxt.event_driven.type は実際には使用しないが予約
Index: Manager.cpp
===================================================================
--- Manager.cpp (revision 2290)
+++ Manager.cpp (working copy)
@@ -656,18 +656,17 @@
"os.hostname",
"corba.endpoint",
"corba.id",
- "ec.type",
- "ec.rate",
- "ec.synchronous_transition",
- "ec.synchronous_activation",
- "ec.synchronous_deactivation",
- "ec.synchronous_reset",
- "ec.transition_timeout",
- "ec.activation_timeout",
- "ec.deactivation_timeout",
- "ec.reset_timeout",
"exec_cxt.periodic.type",
"exec_cxt.periodic.rate",
+ "exec_cxt.event_driven.type",
+ "exec_cxt.sync_transition",
+ "exec_cxt.sync_activation",
+ "exec_cxt.sync_deactivation",
+ "exec_cxt.sync_reset",
+ "exec_cxt.transition_timeout",
+ "exec_cxt.activation_timeout",
+ "exec_cxt.deactivation_timeout",
+ "exec_cxt.reset_timeout",
"logger.enable",
"logger.log_level",
"naming.enable",
Updated by kurihara over 12 years ago
- Status changed from 担当 to 解決
- % Done changed from 0 to 100
r528 にて対応済み。
Actions