[openrtm-commit:00642] r2290 - trunk/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2012-02-03 11:35:11 +0900 (Fri, 03 Feb 2012)
New Revision: 2290

Modified:
   trunk/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h
   trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp
Log:
[compat,impl,header,newfunc] Default and inherited configurations have been updated for new EC. Now non-empty properties are only inherited. refs #2337

Modified: trunk/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h	2012-02-03 02:33:33 UTC (rev 2289)
+++ trunk/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h	2012-02-03 02:35:11 UTC (rev 2290)
@@ -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",

Modified: trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp	2012-02-03 02:33:33 UTC (rev 2289)
+++ trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp	2012-02-03 02:35:11 UTC (rev 2290)
@@ -656,9 +656,18 @@
       "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.evdriven.type",
       "logger.enable",
       "logger.log_level",
       "naming.enable",
@@ -670,7 +679,10 @@
     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];
+          }
       }
       
     RTObject_impl* comp;