OpenRTM-aist » OpenRTM-aist (Python)

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",