[openrtm-commit:03317] r3280 - in trunk/OpenRTM-aist: examples/StaticFsm src/lib/coil src/lib/rtm

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2018-03-28 15:49:24 +0900 (Wed, 28 Mar 2018)
New Revision: 3280

Modified:
   trunk/OpenRTM-aist/examples/StaticFsm/rtc.conf
   trunk/OpenRTM-aist/src/lib/coil/CMakeLists.txt
   trunk/OpenRTM-aist/src/lib/rtm/CMakeLists.txt
   trunk/OpenRTM-aist/src/lib/rtm/InPort.h
   trunk/OpenRTM-aist/src/lib/rtm/ManagerServant.h
Log:
[compat,bugfix,->RELENG_2_0] fixed bug.

Modified: trunk/OpenRTM-aist/examples/StaticFsm/rtc.conf
===================================================================
--- trunk/OpenRTM-aist/examples/StaticFsm/rtc.conf	2018-03-28 05:16:12 UTC (rev 3279)
+++ trunk/OpenRTM-aist/examples/StaticFsm/rtc.conf	2018-03-28 06:49:24 UTC (rev 3280)
@@ -7,23 +7,24 @@
 #example.Display.config_file: display.conf
 
 
-manager.local_service.org.openrtm.local_service.nameservice.file_nameservice.base_path: ./
-manager.local_service.org.openrtm.local_service.nameservice.file_nameservice.file_structure: flat
-manager.local_service.org.openrtm.local_service.nameservice.file_nameservice.context_delimiter: .
+#manager.local_service.org.openrtm.local_service.nameservice.file_nameservice.base_path: ./
+#manager.local_service.org.openrtm.local_service.nameservice.file_nameservice.file_structure: flat
+#manager.local_service.org.openrtm.local_service.nameservice.file_nameservice.context_delimiter: .
 
-manager.local_service.modules: \
-    ../../src/ext/sdo/fsm4rtc_observer/.libs/ComponentObserverConsumer.so(ComponentObserverConsumerInit), \
-    ../../src/ext/sdo/extended_fsm/.libs/ExtendedFsmServiceProvider.so(ExtendedFsmServiceProviderInit), \
-    ../../src/ext/local_service/nameservice_file/.libs/FileNameservice.so(FileNameserviceInit)
+#manager.local_service.modules: \
+#    ../../src/ext/sdo/fsm4rtc_observer/.libs/ComponentObserverConsumer.so(ComponentObserverConsumerInit), \
+#    ../../src/ext/sdo/extended_fsm/.libs/ExtendedFsmServiceProvider.so(ExtendedFsmServiceProviderInit), \
+#    ../../src/ext/local_service/nameservice_file/.libs/FileNameservice.so(FileNameserviceInit)
 
-manager.modules.load_path: ./, ./.libs/
-manager.modules.preload: Microwave.so
+#manager.modules.load_path: ./, ./.libs/
+manager.modules.load_path: ./
+manager.modules.preload: Microwave
 manager.components.precreate: Microwave
 manager.components.preactivation: Inputbutton0, Microwave0
 manager.components.preconnect: \
-  Inputbutton0.open:Microwave0.event(fsm_event_name=open), \
-  Inputbutton0.close:Microwave0.event(fsm_event_name=close), \
-  Inputbutton0.minute:Microwave0.event(fsm_event_name=minute), \
-  Inputbutton0.start:Microwave0.event(fsm_event_name=start), \
-  Inputbutton0.stop:Microwave0.event(fsm_event_name=stop), \
-  Inputbutton0.tick:Microwave0.event(fsm_event_name=tick)
+  Inputbutton0.open?port=Microwave0.event&fsm_event_name=open, \
+  Inputbutton0.close?port=Microwave0.event&fsm_event_name=close, \
+  Inputbutton0.minute?port=Microwave0.event&fsm_event_name=minute, \
+  Inputbutton0.start?port=Microwave0.event&fsm_event_name=start, \
+  Inputbutton0.stop?port=Microwave0.event&fsm_event_name=stop, \
+  Inputbutton0.tick?port=Microwave0.event&fsm_event_name=tick

Modified: trunk/OpenRTM-aist/src/lib/coil/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/CMakeLists.txt	2018-03-28 05:16:12 UTC (rev 3279)
+++ trunk/OpenRTM-aist/src/lib/coil/CMakeLists.txt	2018-03-28 06:49:24 UTC (rev 3280)
@@ -95,6 +95,7 @@
 	${COIL_OS_DIR}/coil/UUID.h
 	${COIL_OS_DIR}/coil/atomic.h
 	${COIL_OS_DIR}/coil/SharedMemory.h
+	${COIL_OS_DIR}/coil/Affinity.h
 	${PROJECT_BINARY_DIR}/config_coil.h
 )
 
@@ -119,6 +120,7 @@
 	${COIL_OS_DIR}/coil/Time.cpp
 	${COIL_OS_DIR}/coil/UUID.cpp
 	${COIL_OS_DIR}/coil/SharedMemory.cpp
+	${COIL_OS_DIR}/coil/Affinity.cpp
 	${coil_headers}
 
 )
@@ -151,8 +153,6 @@
 #	set(coil_srcs ${coil_srcs} ${CMAKE_CURRENT_BINARY_DIR}/${COIL_PROJECT_NAME}.def)
 	
 else(WIN32)
-	set(coil_srcs ${coil_srcs} ${COIL_OS_DIR}/coil/Affinity.cpp)
-	set(coil_headers ${coil_headers} ${COIL_OS_DIR}/coil/Affinity.h)
 endif()
 
 

Modified: trunk/OpenRTM-aist/src/lib/rtm/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/CMakeLists.txt	2018-03-28 05:16:12 UTC (rev 3279)
+++ trunk/OpenRTM-aist/src/lib/rtm/CMakeLists.txt	2018-03-28 06:49:24 UTC (rev 3280)
@@ -258,6 +258,15 @@
 	SharedMemoryPort.h
 	Timestamp.h
 	SimulatorExecutionContext.h
+	DirectInPortBase.h
+	DirectOutPortBase.h
+	DirectPortBase.h
+	NumberingPolicyBase.h
+	NamingServiceNumberingPolicy.h
+	NodeNumberingPolicy.h
+	OutPortDirectConsumer.h
+	OutPortDirectProvider.h
+	CORBA_RTCUtil.h
 	${PROJECT_BINARY_DIR}/config_rtc.h
 	${PROJECT_BINARY_DIR}/version.h
 )
@@ -331,6 +340,12 @@
 	OutPortSHMProvider.cpp
 	SharedMemoryPort.cpp
 	SimulatorExecutionContext.cpp
+	NumberingPolicyBase.cpp
+	NamingServiceNumberingPolicy.cpp
+	NodeNumberingPolicy.cpp
+	OutPortDirectConsumer.cpp
+	OutPortDirectProvider.cpp
+	CORBA_RTCUtil.cpp
 	${rtm_headers}
 )
 

Modified: trunk/OpenRTM-aist/src/lib/rtm/InPort.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/InPort.h	2018-03-28 05:16:12 UTC (rev 3279)
+++ trunk/OpenRTM-aist/src/lib/rtm/InPort.h	2018-03-28 06:49:24 UTC (rev 3280)
@@ -93,7 +93,7 @@
    */
   template <class DataType>
   class InPort
-    : public InPortBase
+	  : public InPortBase, DirectInPortBase<DataType>
   {
   public:
     DATAPORTSTATUS_ENUM

Modified: trunk/OpenRTM-aist/src/lib/rtm/ManagerServant.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/ManagerServant.h	2018-03-28 05:16:12 UTC (rev 3279)
+++ trunk/OpenRTM-aist/src/lib/rtm/ManagerServant.h	2018-03-28 06:49:24 UTC (rev 3280)
@@ -702,6 +702,8 @@
 	* @endif
 	*/
 	void updateMasterManager();
+	std::string getParameterByModulename(const std::string param_name, std::string &module_name);
+	bool isProcessIDManager(std::string mgrname);
 
   private:
     typedef coil::Guard<coil::Mutex> Guard;