[openrtm-commit:00652] r2297 - trunk/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2012-02-04 02:18:45 +0900 (Sat, 04 Feb 2012)
New Revision: 2297

Modified:
   trunk/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h
   trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp
Log:
[compat,impl,func] ec->exec_cxt, synchronous->sync in rtc.conf. refs #2337

Modified: trunk/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h	2012-02-03 15:55:49 UTC (rev 2296)
+++ trunk/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h	2012-02-03 17:18:45 UTC (rev 2297)
@@ -72,10 +72,10 @@
     "corba.nameservers",                     "localhost",
     "corba.master_manager",                  "localhost:2810",
     "corba.nameservice.replace_endpoint",    "NO",
-    "ec.type",                               "PeriodicExecutionContext",
-    "ec.rate",                               "1000",
-    "ec.synchronous_transition",             "YES",
-    "ec.transition_timeout",                 "0.5",
+    "exec_cxt.periodic.type",                "PeriodicExecutionContext",
+    "exec_cxt.periodic.rate",                "1000",
+    "exec_cxt.sync_transition",              "YES",
+    "exec_cxt.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 15:55:49 UTC (rev 2296)
+++ trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp	2012-02-03 17:18:45 UTC (rev 2297)
@@ -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",