[openrtm-commit:00667] r2312 - in trunk/OpenRTM-aist: etc src/lib/rtm

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2012-02-07 11:55:32 +0900 (Tue, 07 Feb 2012)
New Revision: 2312

Modified:
   trunk/OpenRTM-aist/etc/rtc.conf.sample
   trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp
Log:
[compat,impl,func/doc] logger.clock_type option is introduced. refs #2361


Modified: trunk/OpenRTM-aist/etc/rtc.conf.sample
===================================================================
--- trunk/OpenRTM-aist/etc/rtc.conf.sample	2012-02-07 02:48:25 UTC (rev 2311)
+++ trunk/OpenRTM-aist/etc/rtc.conf.sample	2012-02-07 02:55:32 UTC (rev 2312)
@@ -350,6 +350,22 @@
 #
 logger.log_level: NORMAL
 
+#
+# Logger's clock time
+#
+# logger.clock_type option specifies a type of clock to be used for
+# timestamp of log message. Now these three types are available.
+#
+# - system: system clock [default]
+# - logical: logical clock
+# - adjusted: adjusted clock
+#
+# To use logical time clock, call and set time by the following
+# function in somewhere.
+# coil::ClockManager::instance().getClock("logical").settime()
+#
+logger.clock_type: system
+
 #============================================================
 # Timer configuration
 #============================================================

Modified: trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp	2012-02-07 02:48:25 UTC (rev 2311)
+++ trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp	2012-02-07 02:55:32 UTC (rev 2312)
@@ -1147,7 +1147,7 @@
 
     // 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());
 	
@@ -1158,7 +1158,7 @@
                  
 	
     RTC_INFO(("%s", m_config["openrtm.version"].c_str()));
-    RTC_INFO(("Copyright (C) 2003-2010"));
+    RTC_INFO(("Copyright (C) 2003-2012"));
     RTC_INFO(("  Noriaki Ando"));
     RTC_INFO(("  Intelligent Systems Research Institute, AIST"));
     RTC_INFO(("Manager starting."));