[openrtm-commit:02855] r3050 - in trunk/OpenRTM-aist: examples examples/Throughput examples/Throughput/scripts src/ext/ec/rtpreempt src/lib/coil/win32/coil src/lib/rtm
openrtm @ openrtm.org
openrtm @ openrtm.org
2017年 10月 3日 (火) 15:07:16 JST
Author: miyamoto
Date: 2017-10-03 15:07:16 +0900 (Tue, 03 Oct 2017)
New Revision: 3050
Added:
trunk/OpenRTM-aist/examples/Throughput/scripts/
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_direct.bat
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_direct.conf
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_samecomp.bat
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_samecomp.conf
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_sameproc.bat
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_sameproc.conf
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_twonode_1.bat
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_twonode_1.conf
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_twonode_2.bat
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_twonode_2.conf
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_twoproc.bat
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_twoproc_1.conf
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_twoproc_2.conf
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_direct.bat
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_direct.conf
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_samecomp.bat
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_samecomp.conf
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_sameproc.bat
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_sameproc.conf
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_twonode_1.bat
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_twonode_1.conf
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_twonode_2.bat
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_twonode_2.conf
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_twoproc.bat
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_twoproc_1.conf
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_twoproc_2.conf
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_direct.bat
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_direct.conf
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_samecomp.bat
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_samecomp.conf
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_sameproc.bat
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_sameproc.conf
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_twonode_1.bat
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_twonode_1.conf
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_twonode_2.bat
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_twonode_2.conf
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_twoproc.bat
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_twoproc_1.conf
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_twoproc_2.conf
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_direct.bat
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_direct.conf
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_samecomp.bat
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_samecomp.conf
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_sameproc.bat
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_sameproc.conf
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_twonode_1.bat
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_twonode_1.conf
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_twonode_2.bat
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_twonode_2.conf
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_twoproc.bat
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_twoproc_1.conf
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_twoproc_2.conf
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_direct.bat
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_direct.conf
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_samecomp.bat
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_samecomp.conf
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_sameproc.bat
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_sameproc.conf
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_twonode_1.bat
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_twonode_1.conf
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_twonode_2.bat
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_twonode_2.conf
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_twoproc.bat
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_twoproc_1.conf
trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_twoproc_2.conf
Modified:
trunk/OpenRTM-aist/examples/CMakeLists.txt
trunk/OpenRTM-aist/examples/Throughput/CMakeLists.txt
trunk/OpenRTM-aist/examples/Throughput/Throughput.cpp
trunk/OpenRTM-aist/examples/Throughput/Throughput.h
trunk/OpenRTM-aist/examples/Throughput/ThroughputComp.cpp
trunk/OpenRTM-aist/src/ext/ec/rtpreempt/RTPreemptEC.cpp
trunk/OpenRTM-aist/src/lib/coil/win32/coil/Time.h
trunk/OpenRTM-aist/src/lib/rtm/OutPort.h
Log:
[compat, example] add batch files.
Modified: trunk/OpenRTM-aist/examples/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/CMakeLists.txt 2017-09-27 07:13:10 UTC (rev 3049)
+++ trunk/OpenRTM-aist/examples/CMakeLists.txt 2017-10-03 06:07:16 UTC (rev 3050)
@@ -8,5 +8,6 @@
add_subdirectory(ConfigSample)
add_subdirectory(Composite)
add_subdirectory(Analyzer)
+add_subdirectory(Throughput)
#add_subdirectory(FileTest)
Modified: trunk/OpenRTM-aist/examples/Throughput/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/CMakeLists.txt 2017-09-27 07:13:10 UTC (rev 3049)
+++ trunk/OpenRTM-aist/examples/Throughput/CMakeLists.txt 2017-10-03 06:07:16 UTC (rev 3050)
@@ -47,6 +47,8 @@
install(TARGETS ${target}Comp RUNTIME DESTINATION examples)
if(WIN32)
install(TARGETS ${target} RUNTIME DESTINATION examples)
+ file(GLOB script_files "scripts/*")
+ install(FILES ${script_files} DESTINATION examples)
else(WIN32)
install(TARGETS ${target} LIBRARY DESTINATION examples)
endif(WIN32)
Modified: trunk/OpenRTM-aist/examples/Throughput/Throughput.cpp
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/Throughput.cpp 2017-09-27 07:13:10 UTC (rev 3049)
+++ trunk/OpenRTM-aist/examples/Throughput/Throughput.cpp 2017-10-03 06:07:16 UTC (rev 3050)
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- C++ -*-
/*!
* @file Throughput.cpp
* @brief Clock Throughput Component
@@ -262,7 +262,7 @@
std::cout << "\tsendcount: " << m_sendcount << std::endl;
#endif // DEBUG
- coil::sleep(0.5); // sleep for calculating measurement statistics
+ coil::sleep(m_sleep_time); // sleep for calculating measurement statistics
// calculation is triggered data size change
// to finish the last calculation, size 0 array is sent
Modified: trunk/OpenRTM-aist/examples/Throughput/Throughput.h
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/Throughput.h 2017-09-27 07:13:10 UTC (rev 3049)
+++ trunk/OpenRTM-aist/examples/Throughput/Throughput.h 2017-10-03 06:07:16 UTC (rev 3050)
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- C++ -*-
/*!
* @file Throughput.h
* @brief Clock Throughput Component
Modified: trunk/OpenRTM-aist/examples/Throughput/ThroughputComp.cpp
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/ThroughputComp.cpp 2017-09-27 07:13:10 UTC (rev 3049)
+++ trunk/OpenRTM-aist/examples/Throughput/ThroughputComp.cpp 2017-10-03 06:07:16 UTC (rev 3050)
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- C++ -*-
/*!
* @file ThroughputComp.cpp
* @brief Standalone component
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_direct.bat
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_direct.bat (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_direct.bat 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1 @@
+.\ThroughputComp.exe -f rtc_double_direct.conf
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_direct.conf
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_direct.conf (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_direct.conf 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,10 @@
+logger.enable: NO
+#logger.log_level: TRACE
+naming.formats: %n.rtc
+corba.args: -ORBgiopMaxMsgSize 209715200
+manager.components.precreate: Throughput
+manager.components.preconnect: Throughput0.out:Throughput1.in(dataflow_type=push&interface_type=direct)
+manager.components.preactivation: Throughput0
+example.Throughput.conf.default.maxsize: 100000000
+example.Throughput.conf.default.datatype: double
+example.Throughput.conf.default.filesuffix: -direct
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_samecomp.bat
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_samecomp.bat (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_samecomp.bat 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1 @@
+.\ThroughputComp.exe -f rtc_double_samecomp.conf
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_samecomp.conf
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_samecomp.conf (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_samecomp.conf 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,9 @@
+logger.enable: NO
+naming.formats: %n.rtc
+corba.args: -ORBgiopMaxMsgSize 209715200
+manager.components.precreate:
+manager.components.preconnect: Throughput0.out:Throughput0.in(dataflow_type=push&interface_type=corba_cdr)
+manager.components.preactivation: Throughput0
+example.Throughput.conf.default.maxsize: 100000000
+example.Throughput.conf.default.datatype: double
+example.Throughput.conf.default.filesuffix: -sameproc
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_sameproc.bat
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_sameproc.bat (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_sameproc.bat 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1 @@
+.\ThroughputComp.exe -f rtc_double_sameproc.conf
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_sameproc.conf
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_sameproc.conf (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_sameproc.conf 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,9 @@
+logger.enable: NO
+naming.formats: %n.rtc
+corba.args: -ORBgiopMaxMsgSize 209715200
+manager.components.precreate: Throughput
+manager.components.preconnect: Throughput0.out:Throughput1.in(dataflow_type=push&interface_type=corba_cdr)
+manager.components.preactivation: Throughput0
+example.Throughput.conf.default.maxsize: 100000000
+example.Throughput.conf.default.datatype: double
+example.Throughput.conf.default.filesuffix: -sameproc
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_twonode_1.bat
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_twonode_1.bat (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_twonode_1.bat 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1 @@
+.\ThroughputComp.exe -f rtc_double_twoproc_1.conf -o "corba.nameservers:%1"
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_twonode_1.conf
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_twonode_1.conf (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_twonode_1.conf 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,7 @@
+logger.enable: NO
+naming.formats: %n_1.rtc
+corba.args: -ORBgiopMaxMsgSize 209715200
+manager.components.precreate:
+example.Throughput.conf.default.maxsize: 100000000
+example.Throughput.conf.default.datatype: double
+example.Throughput.conf.default.filesuffix: -twonode
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_twonode_2.bat
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_twonode_2.bat (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_twonode_2.bat 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,5 @@
+start .\ThroughputComp.exe -f rtc_double_twonode_2.conf
+TIMEOUT /T 3
+cmd /c rtcon /localhost/Throughput0_1.rtc:out /localhost/Throughput0_2.rtc:in
+
+cmd /c rtact /localhost/Throughput0_1.rtc
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_twonode_2.conf
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_twonode_2.conf (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_twonode_2.conf 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,7 @@
+logger.enable: NO
+naming.formats: %n_2.rtc
+corba.args: -ORBgiopMaxMsgSize 209715200
+manager.components.precreate:
+example.Throughput.conf.default.maxsize: 100000000
+example.Throughput.conf.default.datatype: double
+example.Throughput.conf.default.filesuffix: -twonode
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_twoproc.bat
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_twoproc.bat (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_twoproc.bat 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,6 @@
+start .\ThroughputComp.exe -f rtc_double_twoproc_1.conf
+start .\ThroughputComp.exe -f rtc_double_twoproc_2.conf
+TIMEOUT /T 3
+cmd /c rtcon /localhost/Throughput0_1.rtc:out /localhost/Throughput0_2.rtc:in
+
+cmd /c rtact /localhost/Throughput0_1.rtc
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_twoproc_1.conf
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_twoproc_1.conf (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_twoproc_1.conf 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,7 @@
+logger.enable: NO
+naming.formats: %n_1.rtc
+corba.args: -ORBgiopMaxMsgSize 209715200
+manager.components.precreate:
+example.Throughput.conf.default.maxsize: 100000000
+example.Throughput.conf.default.datatype: double
+example.Throughput.conf.default.filesuffix: -twoproc
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_twoproc_2.conf
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_twoproc_2.conf (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_double_twoproc_2.conf 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,7 @@
+logger.enable: NO
+naming.formats: %n_2.rtc
+corba.args: -ORBgiopMaxMsgSize 209715200
+manager.components.precreate:
+example.Throughput.conf.default.maxsize: 100000000
+example.Throughput.conf.default.datatype: double
+example.Throughput.conf.default.filesuffix: -twoproc
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_direct.bat
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_direct.bat (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_direct.bat 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1 @@
+.\ThroughputComp.exe -f rtc_float_direct.conf
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_direct.conf
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_direct.conf (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_direct.conf 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,9 @@
+logger.enable: NO
+naming.formats: %n.rtc
+corba.args: -ORBgiopMaxMsgSize 209715200
+manager.components.precreate: Throughput
+manager.components.preconnect: Throughput0.out:Throughput1.in(dataflow_type=push&interface_type=direct)
+manager.components.preactivation: Throughput0
+example.Throughput.conf.default.maxsize: 100000000
+example.Throughput.conf.default.datatype: short
+example.Throughput.conf.default.filesuffix: -direct
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_samecomp.bat
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_samecomp.bat (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_samecomp.bat 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1 @@
+.\ThroughputComp.exe -f rtc_float_samecomp.conf
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_samecomp.conf
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_samecomp.conf (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_samecomp.conf 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,9 @@
+logger.enable: NO
+naming.formats: %n.rtc
+corba.args: -ORBgiopMaxMsgSize 209715200
+manager.components.precreate:
+manager.components.preconnect: Throughput0.out:Throughput0.in(dataflow_type=push&interface_type=corba_cdr)
+manager.components.preactivation: Throughput0
+example.Throughput.conf.default.maxsize: 100000000
+example.Throughput.conf.default.datatype: short
+example.Throughput.conf.default.filesuffix: -sameproc
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_sameproc.bat
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_sameproc.bat (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_sameproc.bat 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1 @@
+.\ThroughputComp.exe -f rtc_float_sameproc.conf
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_sameproc.conf
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_sameproc.conf (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_sameproc.conf 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,9 @@
+logger.enable: NO
+naming.formats: %n.rtc
+corba.args: -ORBgiopMaxMsgSize 209715200
+manager.components.precreate: Throughput
+manager.components.preconnect: Throughput0.out:Throughput1.in(dataflow_type=push&interface_type=corba_cdr)
+manager.components.preactivation: Throughput0
+example.Throughput.conf.default.maxsize: 100000000
+example.Throughput.conf.default.datatype: short
+example.Throughput.conf.default.filesuffix: -sameproc
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_twonode_1.bat
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_twonode_1.bat (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_twonode_1.bat 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1 @@
+.\ThroughputComp.exe -f rtc_float_twoproc_1.conf -o "corba.nameservers:%1"
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_twonode_1.conf
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_twonode_1.conf (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_twonode_1.conf 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,7 @@
+logger.enable: NO
+naming.formats: %n_1.rtc
+corba.args: -ORBgiopMaxMsgSize 209715200
+manager.components.precreate:
+example.Throughput.conf.default.maxsize: 100000000
+example.Throughput.conf.default.datatype: float
+example.Throughput.conf.default.filesuffix: -twonode
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_twonode_2.bat
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_twonode_2.bat (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_twonode_2.bat 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,5 @@
+start .\ThroughputComp.exe -f rtc_float_twonode_2.conf
+TIMEOUT /T 3
+cmd /c rtcon /localhost/Throughput0_1.rtc:out /localhost/Throughput0_2.rtc:in
+
+cmd /c rtact /localhost/Throughput0_1.rtc
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_twonode_2.conf
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_twonode_2.conf (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_twonode_2.conf 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,7 @@
+logger.enable: NO
+naming.formats: %n_2.rtc
+corba.args: -ORBgiopMaxMsgSize 209715200
+manager.components.precreate:
+example.Throughput.conf.default.maxsize: 100000000
+example.Throughput.conf.default.datatype: float
+example.Throughput.conf.default.filesuffix: -twonode
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_twoproc.bat
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_twoproc.bat (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_twoproc.bat 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,6 @@
+start .\ThroughputComp.exe -f rtc_float_twoproc_1.conf
+start .\ThroughputComp.exe -f rtc_float_twoproc_2.conf
+TIMEOUT /T 3
+cmd /c rtcon /localhost/Throughput0_1.rtc:out /localhost/Throughput0_2.rtc:in
+
+cmd /c rtact /localhost/Throughput0_1.rtc
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_twoproc_1.conf
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_twoproc_1.conf (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_twoproc_1.conf 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,7 @@
+logger.enable: NO
+naming.formats: %n_1.rtc
+corba.args: -ORBgiopMaxMsgSize 209715200
+manager.components.precreate:
+example.Throughput.conf.default.maxsize: 100000000
+example.Throughput.conf.default.datatype: float
+example.Throughput.conf.default.filesuffix: -twoproc
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_twoproc_2.conf
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_twoproc_2.conf (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_float_twoproc_2.conf 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,7 @@
+logger.enable: NO
+naming.formats: %n_2.rtc
+corba.args: -ORBgiopMaxMsgSize 209715200
+manager.components.precreate:
+example.Throughput.conf.default.maxsize: 100000000
+example.Throughput.conf.default.datatype: float
+example.Throughput.conf.default.filesuffix: -twoproc
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_direct.bat
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_direct.bat (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_direct.bat 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1 @@
+.\ThroughputComp.exe -f rtc_long_direct.conf
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_direct.conf
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_direct.conf (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_direct.conf 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,9 @@
+logger.enable: NO
+naming.formats: %n.rtc
+corba.args: -ORBgiopMaxMsgSize 209715200
+manager.components.precreate: Throughput
+manager.components.preconnect: Throughput0.out:Throughput1.in(dataflow_type=push&interface_type=direct)
+manager.components.preactivation: Throughput0
+example.Throughput.conf.default.maxsize: 100000000
+example.Throughput.conf.default.datatype: long
+example.Throughput.conf.default.filesuffix: -direct
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_samecomp.bat
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_samecomp.bat (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_samecomp.bat 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1 @@
+.\ThroughputComp.exe -f rtc_long_samecomp.conf
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_samecomp.conf
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_samecomp.conf (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_samecomp.conf 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,9 @@
+logger.enable: NO
+naming.formats: %n.rtc
+corba.args: -ORBgiopMaxMsgSize 209715200
+manager.components.precreate:
+manager.components.preconnect: Throughput0.out:Throughput0.in(dataflow_type=push&interface_type=corba_cdr)
+manager.components.preactivation: Throughput0
+example.Throughput.conf.default.maxsize: 100000000
+example.Throughput.conf.default.datatype: long
+example.Throughput.conf.default.filesuffix: -sameproc
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_sameproc.bat
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_sameproc.bat (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_sameproc.bat 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1 @@
+.\ThroughputComp.exe -f rtc_long_sameproc.conf
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_sameproc.conf
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_sameproc.conf (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_sameproc.conf 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,9 @@
+logger.enable: NO
+naming.formats: %n.rtc
+corba.args: -ORBgiopMaxMsgSize 209715200
+manager.components.precreate: Throughput
+manager.components.preconnect: Throughput0.out:Throughput1.in(dataflow_type=push&interface_type=corba_cdr)
+manager.components.preactivation: Throughput0
+example.Throughput.conf.default.maxsize: 100000000
+example.Throughput.conf.default.datatype: long
+example.Throughput.conf.default.filesuffix: -sameproc
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_twonode_1.bat
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_twonode_1.bat (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_twonode_1.bat 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1 @@
+.\ThroughputComp.exe -f rtc_long_twoproc_1.conf -o "corba.nameservers:%1"
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_twonode_1.conf
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_twonode_1.conf (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_twonode_1.conf 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,7 @@
+logger.enable: NO
+naming.formats: %n_1.rtc
+corba.args: -ORBgiopMaxMsgSize 209715200
+manager.components.precreate:
+example.Throughput.conf.default.maxsize: 100000000
+example.Throughput.conf.default.datatype: long
+example.Throughput.conf.default.filesuffix: -twonode
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_twonode_2.bat
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_twonode_2.bat (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_twonode_2.bat 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,5 @@
+start .\ThroughputComp.exe -f rtc_long_twonode_2.conf
+TIMEOUT /T 3
+cmd /c rtcon /localhost/Throughput0_1.rtc:out /localhost/Throughput0_2.rtc:in
+
+cmd /c rtact /localhost/Throughput0_1.rtc
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_twonode_2.conf
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_twonode_2.conf (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_twonode_2.conf 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,7 @@
+logger.enable: NO
+naming.formats: %n_2.rtc
+corba.args: -ORBgiopMaxMsgSize 209715200
+manager.components.precreate:
+example.Throughput.conf.default.maxsize: 100000000
+example.Throughput.conf.default.datatype: long
+example.Throughput.conf.default.filesuffix: -twonode
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_twoproc.bat
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_twoproc.bat (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_twoproc.bat 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,6 @@
+start .\ThroughputComp.exe -f rtc_long_twoproc_1.conf
+start .\ThroughputComp.exe -f rtc_long_twoproc_2.conf
+TIMEOUT /T 3
+cmd /c rtcon /localhost/Throughput0_1.rtc:out /localhost/Throughput0_2.rtc:in
+
+cmd /c rtact /localhost/Throughput0_1.rtc
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_twoproc_1.conf
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_twoproc_1.conf (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_twoproc_1.conf 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,7 @@
+logger.enable: NO
+naming.formats: %n_1.rtc
+corba.args: -ORBgiopMaxMsgSize 209715200
+manager.components.precreate:
+example.Throughput.conf.default.maxsize: 100000000
+example.Throughput.conf.default.datatype: long
+example.Throughput.conf.default.filesuffix: -twoproc
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_twoproc_2.conf
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_twoproc_2.conf (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_long_twoproc_2.conf 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,7 @@
+logger.enable: NO
+naming.formats: %n_2.rtc
+corba.args: -ORBgiopMaxMsgSize 209715200
+manager.components.precreate:
+example.Throughput.conf.default.maxsize: 100000000
+example.Throughput.conf.default.datatype: long
+example.Throughput.conf.default.filesuffix: -twoproc
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_direct.bat
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_direct.bat (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_direct.bat 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1 @@
+.\ThroughputComp.exe -f rtc_octet_direct.conf
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_direct.conf
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_direct.conf (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_direct.conf 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,9 @@
+logger.enable: NO
+naming.formats: %n.rtc
+corba.args: -ORBgiopMaxMsgSize 209715200
+manager.components.precreate: Throughput
+manager.components.preconnect: Throughput0.out:Throughput1.in(dataflow_type=push&interface_type=direct)
+manager.components.preactivation: Throughput0
+example.Throughput.conf.default.maxsize: 100000000
+example.Throughput.conf.default.datatype: octet
+example.Throughput.conf.default.filesuffix: -direct
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_samecomp.bat
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_samecomp.bat (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_samecomp.bat 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1 @@
+.\ThroughputComp.exe -f rtc_octet_samecomp.conf
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_samecomp.conf
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_samecomp.conf (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_samecomp.conf 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,9 @@
+logger.enable: NO
+naming.formats: %n.rtc
+corba.args: -ORBgiopMaxMsgSize 209715200
+manager.components.precreate:
+manager.components.preconnect: Throughput0.out:Throughput0.in(dataflow_type=push&interface_type=corba_cdr)
+manager.components.preactivation: Throughput0
+example.Throughput.conf.default.maxsize: 100000000
+example.Throughput.conf.default.datatype: octet
+example.Throughput.conf.default.filesuffix: -sameproc
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_sameproc.bat
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_sameproc.bat (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_sameproc.bat 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1 @@
+.\ThroughputComp.exe -f rtc_octet_sameproc.conf
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_sameproc.conf
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_sameproc.conf (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_sameproc.conf 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,9 @@
+logger.enable: NO
+naming.formats: %n.rtc
+corba.args: -ORBgiopMaxMsgSize 209715200
+manager.components.precreate: Throughput
+manager.components.preconnect: Throughput0.out:Throughput1.in(dataflow_type=push&interface_type=corba_cdr)
+manager.components.preactivation: Throughput0
+example.Throughput.conf.default.maxsize: 100000000
+example.Throughput.conf.default.datatype: octet
+example.Throughput.conf.default.filesuffix: -sameproc
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_twonode_1.bat
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_twonode_1.bat (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_twonode_1.bat 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1 @@
+.\ThroughputComp.exe -f rtc_octet_twoproc_1.conf -o "corba.nameservers:%1"
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_twonode_1.conf
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_twonode_1.conf (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_twonode_1.conf 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,7 @@
+logger.enable: NO
+naming.formats: %n_1.rtc
+corba.args: -ORBgiopMaxMsgSize 209715200
+manager.components.precreate:
+example.Throughput.conf.default.maxsize: 100000000
+example.Throughput.conf.default.datatype: octet
+example.Throughput.conf.default.filesuffix: -twonode
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_twonode_2.bat
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_twonode_2.bat (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_twonode_2.bat 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,5 @@
+start .\ThroughputComp.exe -f rtc_octet_twonode_2.conf
+TIMEOUT /T 3
+cmd /c rtcon /localhost/Throughput0_1.rtc:out /localhost/Throughput0_2.rtc:in
+
+cmd /c rtact /localhost/Throughput0_1.rtc
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_twonode_2.conf
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_twonode_2.conf (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_twonode_2.conf 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,7 @@
+logger.enable: NO
+naming.formats: %n_2.rtc
+corba.args: -ORBgiopMaxMsgSize 209715200
+manager.components.precreate:
+example.Throughput.conf.default.maxsize: 100000000
+example.Throughput.conf.default.datatype: octet
+example.Throughput.conf.default.filesuffix: -twonode
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_twoproc.bat
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_twoproc.bat (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_twoproc.bat 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,6 @@
+start .\ThroughputComp.exe -f rtc_octet_twoproc_1.conf
+start .\ThroughputComp.exe -f rtc_octet_twoproc_2.conf
+TIMEOUT /T 3
+cmd /c rtcon /localhost/Throughput0_1.rtc:out /localhost/Throughput0_2.rtc:in
+
+cmd /c rtact /localhost/Throughput0_1.rtc
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_twoproc_1.conf
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_twoproc_1.conf (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_twoproc_1.conf 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,7 @@
+logger.enable: NO
+naming.formats: %n_1.rtc
+corba.args: -ORBgiopMaxMsgSize 209715200
+manager.components.precreate:
+example.Throughput.conf.default.maxsize: 100000000
+example.Throughput.conf.default.datatype: octet
+example.Throughput.conf.default.filesuffix: -twoproc
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_twoproc_2.conf
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_twoproc_2.conf (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_octet_twoproc_2.conf 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,7 @@
+logger.enable: NO
+naming.formats: %n_2.rtc
+corba.args: -ORBgiopMaxMsgSize 209715200
+manager.components.precreate:
+example.Throughput.conf.default.maxsize: 100000000
+example.Throughput.conf.default.datatype: octet
+example.Throughput.conf.default.filesuffix: -twoproc
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_direct.bat
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_direct.bat (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_direct.bat 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1 @@
+.\ThroughputComp.exe -f rtc_short_direct.conf
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_direct.conf
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_direct.conf (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_direct.conf 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,9 @@
+logger.enable: NO
+naming.formats: %n.rtc
+corba.args: -ORBgiopMaxMsgSize 209715200
+manager.components.precreate: Throughput
+manager.components.preconnect: Throughput0.out:Throughput1.in(dataflow_type=push&interface_type=direct)
+manager.components.preactivation: Throughput0
+example.Throughput.conf.default.maxsize: 100000000
+example.Throughput.conf.default.datatype: short
+example.Throughput.conf.default.filesuffix: -direct
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_samecomp.bat
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_samecomp.bat (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_samecomp.bat 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1 @@
+.\ThroughputComp.exe -f rtc_long_sameproc.conf
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_samecomp.conf
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_samecomp.conf (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_samecomp.conf 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,9 @@
+logger.enable: NO
+naming.formats: %n.rtc
+corba.args: -ORBgiopMaxMsgSize 209715200
+manager.components.precreate:
+manager.components.preconnect: Throughput0.out:Throughput0.in(dataflow_type=push&interface_type=corba_cdr)
+manager.components.preactivation: Throughput0
+example.Throughput.conf.default.maxsize: 100000000
+example.Throughput.conf.default.datatype: short
+example.Throughput.conf.default.filesuffix: -samecomp
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_sameproc.bat
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_sameproc.bat (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_sameproc.bat 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1 @@
+.\ThroughputComp.exe -f rtc_long_samecomp.conf
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_sameproc.conf
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_sameproc.conf (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_sameproc.conf 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,9 @@
+logger.enable: NO
+naming.formats: %n.rtc
+corba.args: -ORBgiopMaxMsgSize 209715200
+manager.components.precreate: Throughput
+manager.components.preconnect: Throughput0.out:Throughput1.in(dataflow_type=push&interface_type=corba_cdr)
+manager.components.preactivation: Throughput0
+example.Throughput.conf.default.maxsize: 100000000
+example.Throughput.conf.default.datatype: short
+example.Throughput.conf.default.filesuffix: -sameproc
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_twonode_1.bat
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_twonode_1.bat (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_twonode_1.bat 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1 @@
+.\ThroughputComp.exe -f rtc_short_twoproc_1.conf -o "corba.nameservers:%1"
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_twonode_1.conf
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_twonode_1.conf (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_twonode_1.conf 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,7 @@
+logger.enable: NO
+naming.formats: %n_1.rtc
+corba.args: -ORBgiopMaxMsgSize 209715200
+manager.components.precreate:
+example.Throughput.conf.default.maxsize: 100000000
+example.Throughput.conf.default.datatype: short
+example.Throughput.conf.default.filesuffix: -twonode
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_twonode_2.bat
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_twonode_2.bat (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_twonode_2.bat 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,5 @@
+start .\ThroughputComp.exe -f rtc_short_twonode_2.conf
+TIMEOUT /T 3
+cmd /c rtcon /localhost/Throughput0_1.rtc:out /localhost/Throughput0_2.rtc:in
+
+cmd /c rtact /localhost/Throughput0_1.rtc
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_twonode_2.conf
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_twonode_2.conf (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_twonode_2.conf 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,7 @@
+logger.enable: NO
+naming.formats: %n_2.rtc
+corba.args: -ORBgiopMaxMsgSize 209715200
+manager.components.precreate:
+example.Throughput.conf.default.maxsize: 100000000
+example.Throughput.conf.default.datatype: short
+example.Throughput.conf.default.filesuffix: -twonode
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_twoproc.bat
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_twoproc.bat (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_twoproc.bat 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,6 @@
+start .\ThroughputComp.exe -f rtc_short_twoproc_1.conf
+start .\ThroughputComp.exe -f rtc_short_twoproc_2.conf
+TIMEOUT /T 3
+cmd /c rtcon /localhost/Throughput0_1.rtc:out /localhost/Throughput0_2.rtc:in
+
+cmd /c rtact /localhost/Throughput0_1.rtc
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_twoproc_1.conf
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_twoproc_1.conf (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_twoproc_1.conf 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,7 @@
+logger.enable: NO
+naming.formats: %n_1.rtc
+corba.args: -ORBgiopMaxMsgSize 209715200
+manager.components.precreate:
+example.Throughput.conf.default.maxsize: 100000000
+example.Throughput.conf.default.datatype: short
+example.Throughput.conf.default.filesuffix: -twoproc
\ No newline at end of file
Added: trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_twoproc_2.conf
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_twoproc_2.conf (rev 0)
+++ trunk/OpenRTM-aist/examples/Throughput/scripts/rtc_short_twoproc_2.conf 2017-10-03 06:07:16 UTC (rev 3050)
@@ -0,0 +1,7 @@
+logger.enable: NO
+naming.formats: %n_2.rtc
+corba.args: -ORBgiopMaxMsgSize 209715200
+manager.components.precreate:
+example.Throughput.conf.default.maxsize: 100000000
+example.Throughput.conf.default.datatype: short
+example.Throughput.conf.default.filesuffix: -twoproc
\ No newline at end of file
Modified: trunk/OpenRTM-aist/src/ext/ec/rtpreempt/RTPreemptEC.cpp
===================================================================
--- trunk/OpenRTM-aist/src/ext/ec/rtpreempt/RTPreemptEC.cpp 2017-09-27 07:13:10 UTC (rev 3049)
+++ trunk/OpenRTM-aist/src/ext/ec/rtpreempt/RTPreemptEC.cpp 2017-10-03 06:07:16 UTC (rev 3050)
@@ -29,7 +29,7 @@
#include <coil/TimeValue.h>
#include <rtm/RTObjectStateMachine.h>
-#include <RTPreemptEC.h>
+#include <rtm/RTPreemptEC.h>
#define MAX_SAFE_STACK (8*1024)
#define NSEC_PER_SEC 1000000000
Modified: trunk/OpenRTM-aist/src/lib/coil/win32/coil/Time.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/win32/coil/Time.h 2017-09-27 07:13:10 UTC (rev 3049)
+++ trunk/OpenRTM-aist/src/lib/coil/win32/coil/Time.h 2017-10-03 06:07:16 UTC (rev 3050)
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- C++ -*-
/*!
* @file Time_win32.h
* @brief Time functions
@@ -42,13 +42,13 @@
/*!
* @if jp
- * @brief wè³ê½bÔÍðx~·é
+ * @brief 指定された秒間は処理を休止する
*
- * wè³ê½bÔÍðx~·éB
+ * 指定された秒間は処理を休止する。
*
- * @param seconds b
+ * @param seconds 秒数
*
- * @return 0: ¬÷
+ * @return 0: 成功
*
* @else
* @brief Stop a processing at specified second time
@@ -72,13 +72,13 @@
/*!
* @if jp
- * @brief wè³ê½bÔÍðx~·é
+ * @brief 指定された秒間は処理を休止する
*
- * wè³ê½bÔÍðx~·éB
+ * 指定された秒間は処理を休止する。
*
- * @param interval TimeValueIuWFNg
+ * @param interval TimeValueオブジェクト
*
- * @return 0: ¬÷, != 0: ¸s
+ * @return 0: 成功, != 0: 失敗
*
* @else
* @brief Stop a processing at specified second time
@@ -147,13 +147,13 @@
/*!
* @if jp
- * @brief wè³ê½}CNbÔÍðx~·é
+ * @brief 指定されたマイクロ秒間は処理を休止する
*
- * wè³ê½}CNbÔÍðx~·éB
+ * 指定されたマイクロ秒間は処理を休止する。
*
- * @param usec }CNb
+ * @param usec マイクロ秒数
*
- * @return 0: ¬÷, != 0: ¸s
+ * @return 0: 成功, != 0: 失敗
*
* @else
* @brief Stop a processing at specified micro second time
@@ -215,14 +215,14 @@
/*!
* @if jp
- * @brief Æ^C][ðæ¾·é
+ * @brief 時刻とタイムゾーンを取得する
*
- * Æ^C][ðæ¾·éB
+ * 時刻とタイムゾーンを取得する。
*
- * @param tv \¢Ì
- * @param tz ^C][\¢Ì
+ * @param tv 時刻構造体
+ * @param tz タイムゾーン構造体
*
- * @return 0: ¬÷
+ * @return 0: 成功
*
* @else
* @brief Get the time and timezone
@@ -238,45 +238,60 @@
*/
inline int gettimeofday(struct timeval *tv, struct timezone *tz)
{
- FILETIME ftime;
- LARGE_INTEGER lint;
- __int64 val64;
- static int tzflag;
- if (tv != NULL)
+ LARGE_INTEGER frequency;
+ BOOL ret = QueryPerformanceFrequency(&frequency);
+
+ if (ret == 0)
{
- ::GetSystemTimeAsFileTime(&ftime);
- lint.LowPart = ftime.dwLowDateTime;
- lint.HighPart = ftime.dwHighDateTime;
- val64 = lint.QuadPart;
- val64 = val64 - EPOCHFILETIME;
- val64 = val64 / 10;
- tv->tv_sec = (long)(val64 / 1000000);
- tv->tv_usec = (long)(val64 % 1000000);
- }
- if (tz)
- {
- if (!tzflag)
+ FILETIME ftime;
+ LARGE_INTEGER lint;
+ __int64 val64;
+ static int tzflag;
+ if (tv != NULL)
{
- ::_tzset();
- ++tzflag;
+ ::GetSystemTimeAsFileTime(&ftime);
+ lint.LowPart = ftime.dwLowDateTime;
+ lint.HighPart = ftime.dwHighDateTime;
+ val64 = lint.QuadPart;
+ val64 = val64 - EPOCHFILETIME;
+ val64 = val64 / 10;
+ tv->tv_sec = (long)(val64 / 1000000);
+ tv->tv_usec = (long)(val64 % 1000000);
}
- long tzone = 0;
- ::_get_timezone(&tzone);
- tz->tz_minuteswest = tzone / 60;
- int dlight = 0;
- ::_get_daylight(&dlight);
- tz->tz_dsttime = dlight;
+ if (tz)
+ {
+ if (!tzflag)
+ {
+ ::_tzset();
+ ++tzflag;
+ }
+ long tzone = 0;
+ ::_get_timezone(&tzone);
+ tz->tz_minuteswest = tzone / 60;
+ int dlight = 0;
+ ::_get_daylight(&dlight);
+ tz->tz_dsttime = dlight;
+ }
}
+ else
+ {
+ LARGE_INTEGER current;
+ QueryPerformanceCounter(¤t);
+ LONGLONG current_time = (current.QuadPart*1000000) / frequency.QuadPart;
+ tv->tv_sec = (long)(current_time / 1000000);
+ tv->tv_usec = (long)(current_time % 1000000);
+
+ }
return 0;
}
/*!
* @if jp
- * @brief ðæ¾·é
+ * @brief 時刻を取得する
*
- * ðæ¾·éB
+ * 時刻を取得する。
*
- * @return TimeValueIuWFNg
+ * @return TimeValueオブジェクト
*
* @else
* @brief Get the time
@@ -296,14 +311,14 @@
/*!
* @if jp
- * @brief Æ^C][ðÝè·é
+ * @brief 時刻とタイムゾーンを設定する
*
- * Æ^C][ðÝè·éB
+ * 時刻とタイムゾーンを設定する。
*
- * @param tv \¢Ì
- * @param tz ^C][\¢Ì
+ * @param tv 時刻構造体
+ * @param tz タイムゾーン構造体
*
- * @return 0: ¬÷
+ * @return 0: 成功
*
* @else
* @brief Set the time and timezone
Modified: trunk/OpenRTM-aist/src/lib/rtm/OutPort.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/OutPort.h 2017-09-27 07:13:10 UTC (rev 3049)
+++ trunk/OpenRTM-aist/src/lib/rtm/OutPort.h 2017-10-03 06:07:16 UTC (rev 3050)
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- C++ -*-
/*!
* @file OutPort.h
* @brief OutPort class
@@ -37,13 +37,13 @@
/*!
* @if jp
- * @brief ¥Ç¡¼¥¿¤Ë¥¿¥¤¥à¥¹¥¿¥ó¥×¤ò¥»¥Ã¥È¤¹¤ë
+ * @brief データにタイムスタンプをセットする
*
- * ¥Ç¡¼¥¿¥Ý¡¼¥È¤Î¥Ç¡¼¥¿¤ËÂФ·¤Æ¥¿¥¤¥à¥¹¥¿¥ó¥×¤ò¥»¥Ã¥È¤¹¤ë¡£¥Ç¡¼¥¿¥Ý¡¼¥È
- * ¤Î¥Ç¡¼¥¿¤Ï¹½Â¤ÂΤΥá¥ó¥Ð¡¼¤È¤·¤Æ tm.sec, tm.nsec ¤ò»ý¤ÄɬÍפ¬¤¢¤ë¡£
+ * データポートのデータに対してタイムスタンプをセットする。データポート
+ * のデータは構造体のメンバーとして tm.sec, tm.nsec を持つ必要がある。
*
- * @param data ¥¿¥¤¥à¥¹¥¿¥ó¥×¤ò¥»¥Ã¥È¤¹¤ë¥Ç¡¼¥¿¡£¼Â¹Ô¸å¼Â¹Ô»þ¤Î¥¿¥¤¥à¥¹
- * ¥¿¥ó¥×¤¬¥»¥Ã¥È¤µ¤ì¤ë
+ * @param data タイムスタンプをセットするデータ。実行後実行時のタイムス
+ * タンプがセットされる
*
* @else
* @brief Setting timestamp to data
@@ -72,21 +72,21 @@
*
* @class OutPort
*
- * @brief OutPort ¥Æ¥ó¥×¥ì¡¼¥È¥¯¥é¥¹
+ * @brief OutPort テンプレートクラス
*
- * OutPort ¥Æ¥ó¥×¥ì¡¼¥È¥¯¥é¥¹¡¢¥Æ¥ó¥×¥ì¡¼¥È¤Î°ú¿ô¤È¤·¤Æ¡¢OutPort¤¬
- * °·¤¦¥Ç¡¼¥¿·¿ DataType ¤ò¤È¤ë¡£
+ * OutPort テンプレートクラス、テンプレートの引数として、OutPortが
+ * 扱うデータ型 DataType をとる。
*
*
- * OnWrite·Ï¥³¡¼¥ë¥Ð¥Ã¥¯ (½ñ¹þ¤ß¤Ëµ¯°ø¤¹¤ë¥¤¥Ù¥ó¥È¤Ë¤è¤ê¥³¡¼¥ë¤µ¤ì¤ë)
+ * OnWrite系コールバック (書込みに起因するイベントによりコールされる)
*
* - void OnWrite<DataType>::operator()(const DataType):
- * OutPort::write() ¤ò¸Æ¤Ó½Ð¤·½ñ¤¹þ¤ß¤ò¹Ô¤¦ºÝ¤Ë¥³¡¼¥ë¤µ¤ì¤ë¡£
+ * OutPort::write() を呼び出し書き込みを行う際にコールされる。
*
* - DataType OnWriteConvert<DataType>::operator()(const DataType):
- * OutPort::write() ¤ò¸Æ¤Ó½Ð¤·¡¢¥Ç¡¼¥¿¤ò¥Ð¥Ã¥Õ¥¡¤Ë½ñ¤¹þ¤àÁ°¤Ë¸Æ¤Ð¤ì
- * ¥Ç¡¼¥¿¤ÎÊÑ´¹¤ò¹Ô¤¦¡£operator()()¤ÎÌá¤êÃͤ¬¥·¥ê¥¢¥é¥¤¥º¤µ¤ì¥Ð¥Ã¥Õ¥¡¤Ë
- * ½ñ¤¹þ¤Þ¤ì¤ë¡£
+ * OutPort::write() を呼び出し、データをバッファに書き込む前に呼ばれ
+ * データの変換を行う。operator()()の戻り値がシリアライズされバッファに
+ * 書き込まれる。
*
* @since 0.2.0
*
@@ -110,13 +110,13 @@
/*!
* @if jp
*
- * @brief ¥³¥ó¥¹¥È¥é¥¯¥¿
+ * @brief コンストラクタ
*
- * ¥³¥ó¥¹¥È¥é¥¯¥¿
+ * コンストラクタ
*
- * @param name ¥Ý¡¼¥È̾
- * @param value ¤³¤Î¥Ý¡¼¥È¤Ë¥Ð¥¤¥ó¥É¤µ¤ì¤ë¥Ç¡¼¥¿ÊÑ¿ô
- * @param length ¥Ð¥Ã¥Õ¥¡Ä¹(¥Ç¥Õ¥©¥ë¥ÈÃÍ:8)
+ * @param name ポート名
+ * @param value このポートにバインドされるデータ変数
+ * @param length バッファ長(デフォルト値:8)
*
* @else
*
@@ -149,9 +149,9 @@
/*!
* @if jp
*
- * @brief ¥Ç¥¹¥È¥é¥¯¥¿
+ * @brief デストラクタ
*
- * ¥Ç¥¹¥È¥é¥¯¥¿
+ * デストラクタ
*
* @else
*
@@ -168,22 +168,22 @@
/*!
* @if jp
*
- * @brief ¥Ç¡¼¥¿½ñ¤¹þ¤ß
+ * @brief データ書き込み
*
- * ¥Ý¡¼¥È¤Ø¥Ç¡¼¥¿¤ò½ñ¤¹þ¤à¡£
+ * ポートへデータを書き込む。
*
- * - ¥³¡¼¥ë¥Ð¥Ã¥¯¥Õ¥¡¥ó¥¯¥¿ OnWrite ¤¬¥»¥Ã¥È¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢
- * OutPort ¤¬ÊÝ»ý¤¹¤ë¥Ð¥Ã¥Õ¥¡¤Ë½ñ¤¹þ¤àÁ°¤Ë OnWrite ¤¬¸Æ¤Ð¤ì¤ë¡£
- * - OutPort ¤¬ÊÝ»ý¤¹¤ë¥Ð¥Ã¥Õ¥¡¤¬¥ª¡¼¥Ð¡¼¥Õ¥í¡¼¤ò¸¡½Ð¤Ç¤¤ë¥Ð¥Ã¥Õ¥¡¤Ç¤¢¤ê¡¢
- * ¤«¤Ä¡¢½ñ¤¹þ¤àºÝ¤Ë¥Ð¥Ã¥Õ¥¡¤¬¥ª¡¼¥Ð¡¼¥Õ¥í¡¼¤ò¸¡½Ð¤·¤¿¾ì¹ç¡¢
- * ¥³¡¼¥ë¥Ð¥Ã¥¯¥Õ¥¡¥ó¥¯¥¿ OnOverflow ¤¬¸Æ¤Ð¤ì¤ë¡£
- * - ¥³¡¼¥ë¥Ð¥Ã¥¯¥Õ¥¡¥ó¥¯¥¿ OnWriteConvert ¤¬¥»¥Ã¥È¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢
- * ¥Ð¥Ã¥Õ¥¡½ñ¤¹þ¤ß»þ¤Ë¡¢ OnWriteConvert ¤Î operator() ¤ÎÌá¤êÃͤ¬
- * ¥Ð¥Ã¥Õ¥¡¤Ë½ñ¤¹þ¤Þ¤ì¤ë¡£
+ * - コールバックファンクタ OnWrite がセットされている場合、
+ * OutPort が保持するバッファに書き込む前に OnWrite が呼ばれる。
+ * - OutPort が保持するバッファがオーバーフローを検出できるバッファであり、
+ * かつ、書き込む際にバッファがオーバーフローを検出した場合、
+ * コールバックファンクタ OnOverflow が呼ばれる。
+ * - コールバックファンクタ OnWriteConvert がセットされている場合、
+ * バッファ書き込み時に、 OnWriteConvert の operator() の戻り値が
+ * バッファに書き込まれる。
*
- * @param value ½ñ¤¹þ¤ßÂоݥǡ¼¥¿
+ * @param value 書き込み対象データ
*
- * @return ½ñ¤¹þ¤ß½èÍý·ë²Ì(½ñ¤¹þ¤ßÀ®¸ù:true¡¢½ñ¤¹þ¤ß¼ºÇÔ:false)
+ * @return 書き込み処理結果(書き込み成功:true、書き込み失敗:false)
*
* @else
*
@@ -217,7 +217,7 @@
}
{
Guard guard(m_profile_mutex);
- m_profile.properties[m_propValueIndex].value <<= value;
+ //m_profile.properties[m_propValueIndex].value <<= value;
}
bool result(true);
@@ -269,12 +269,12 @@
/*!
* @if jp
*
- * @brief ¥Ç¡¼¥¿½ñ¤¹þ¤ß
+ * @brief データ書き込み
*
- * ¥Ý¡¼¥È¤Ø¥Ç¡¼¥¿¤ò½ñ¤¹þ¤à¡£
- * ¥Ð¥¤¥ó¥É¤µ¤ì¤¿ÊÑ¿ô¤ËÀßÄꤵ¤ì¤¿Ãͤò¥Ý¡¼¥È¤Ë½ñ¤¹þ¤à¡£
+ * ポートへデータを書き込む。
+ * バインドされた変数に設定された値をポートに書き込む。
*
- * @return ½ñ¤¹þ¤ß½èÍý·ë²Ì(½ñ¤¹þ¤ßÀ®¸ù:true¡¢½ñ¤¹þ¤ß¼ºÇÔ:false)
+ * @return 書き込み処理結果(書き込み成功:true、書き込み失敗:false)
*
* @else
*
@@ -295,14 +295,14 @@
/*!
* @if jp
*
- * @brief ¥Ç¡¼¥¿½ñ¤¹þ¤ß
+ * @brief データ書き込み
*
- * ¥Ý¡¼¥È¤Ø¥Ç¡¼¥¿¤ò½ñ¤¹þ¤à¡£
- * ÀßÄꤵ¤ì¤¿Ãͤò¥Ý¡¼¥È¤Ë½ñ¤¹þ¤à¡£
+ * ポートへデータを書き込む。
+ * 設定された値をポートに書き込む。
*
- * @param value ½ñ¤¹þ¤ßÂоݥǡ¼¥¿
+ * @param value 書き込み対象データ
*
- * @return ½ñ¤¹þ¤ß½èÍý·ë²Ì(½ñ¤¹þ¤ßÀ®¸ù:true¡¢½ñ¤¹þ¤ß¼ºÇÔ:false)
+ * @return 書き込み処理結果(書き込み成功:true、書き込み失敗:false)
*
* @else
*
@@ -325,17 +325,17 @@
/*!
* @if jp
*
- * @brief ÆÃÄê¤Î¥³¥Í¥¯¥¿¤Ø¤Î½ñ¤¹þ¤ß¥¹¥Æ¡¼¥¿¥¹¤òÆÀ¤ë
+ * @brief 特定のコネクタへの書き込みステータスを得る
*
- * OutPort ¤ÏÀܳ¤´¤È¤Ë Connector ¤È¸Æ¤Ð¤ì¤ë²¾Áۥǡ¼¥¿¥Á¥ã¥Í¥ë¤ò»ý
- * ¤Ä¡£write() ´Ø¿ô¤Ï¤³¤ì¤é Connector ¤ËÂФ·¤Æ¥Ç¡¼¥¿¤ò½ñ¤¹þ¤à¤¬¡¢
- * ³Æ Connector ¤Ï½ñ¤¹þ¤ß¤´¤È¤Ë¥¹¥Æ¡¼¥¿¥¹¤òÊÖ¤¹¡£write() ´Ø¿ô¤Ç¤Ï¡¢
- * ¤¹¤Ù¤Æ¤Î Connector ¤¬Àµ¾ï½ªÎ»¤·¤¿¤È¤¤Î¤ß true ¤òÊÖ¤·¡¢¤½¤ì°Ê³°
- * ¤Ç¤Ï false ¤òÊֵѤ¹¤ë¡£¤³¤Î´Ø¿ô¤Ï write() ¤¬ false ¤Î¾ì¹ç¥¹¥Æ¡¼
- * ¥¿¥¹¤òÄ´¤Ù¤ë¤Î¤Ë»ÈÍѤ¹¤ë¤³¤È¤¬¤Ç¤¤ë¡£
+ * OutPort は接続ごとに Connector と呼ばれる仮想データチャネルを持
+ * つ。write() 関数はこれら Connector に対してデータを書き込むが、
+ * 各 Connector は書き込みごとにステータスを返す。write() 関数では、
+ * すべての Connector が正常終了したときのみ true を返し、それ以外
+ * では false を返却する。この関数は write() が false の場合ステー
+ * タスを調べるのに使用することができる。
*
- * @param index Connector ¤Î index
- * @return ¥¹¥Æ¡¼¥¿¥¹
+ * @param index Connector の index
+ * @return ステータス
*
* @else
*
@@ -361,16 +361,16 @@
/*!
* @if jp
*
- * @brief ÆÃÄê¤Î¥³¥Í¥¯¥¿¤Ø¤Î½ñ¤¹þ¤ß¥¹¥Æ¡¼¥¿¥¹¥ê¥¹¥È¤òÆÀ¤ë
+ * @brief 特定のコネクタへの書き込みステータスリストを得る
*
- * OutPort ¤ÏÀܳ¤´¤È¤Ë Connector ¤È¸Æ¤Ð¤ì¤ë²¾Áۥǡ¼¥¿¥Á¥ã¥Í¥ë¤ò»ý
- * ¤Ä¡£write() ´Ø¿ô¤Ï¤³¤ì¤é Connector ¤ËÂФ·¤Æ¥Ç¡¼¥¿¤ò½ñ¤¹þ¤à¤¬¡¢
- * ³Æ Connector ¤Ï½ñ¤¹þ¤ß¤´¤È¤Ë¥¹¥Æ¡¼¥¿¥¹¤òÊÖ¤¹¡£write() ´Ø¿ô¤Ç¤Ï¡¢
- * ¤¹¤Ù¤Æ¤Î Connector ¤¬Àµ¾ï½ªÎ»¤·¤¿¤È¤¤Î¤ß true ¤òÊÖ¤·¡¢¤½¤ì°Ê³°
- * ¤Ç¤Ï false ¤òÊֵѤ¹¤ë¡£¤³¤Î´Ø¿ô¤Ï write() ¤¬ false ¤Î¾ì¹ç¥¹¥Æ¡¼
- * ¥¿¥¹¤òÄ´¤Ù¤ë¤Î¤Ë»ÈÍѤ¹¤ë¤³¤È¤¬¤Ç¤¤ë¡£
+ * OutPort は接続ごとに Connector と呼ばれる仮想データチャネルを持
+ * つ。write() 関数はこれら Connector に対してデータを書き込むが、
+ * 各 Connector は書き込みごとにステータスを返す。write() 関数では、
+ * すべての Connector が正常終了したときのみ true を返し、それ以外
+ * では false を返却する。この関数は write() が false の場合ステー
+ * タスを調べるのに使用することができる。
*
- * @return ¥¹¥Æ¡¼¥¿¥¹¥ê¥¹¥È
+ * @return ステータスリスト
*
* @else
*
@@ -396,16 +396,16 @@
/*!
* @if jp
*
- * @brief OnWrite ¥³¡¼¥ë¥Ð¥Ã¥¯¤ÎÀßÄê
+ * @brief OnWrite コールバックの設定
*
- * write() ¸Æ¤Ó½Ð¤·»þ¤Ë¡¢³Æ¥³¥Í¥¯¥¿¤ËÂФ·¤Æ¥Ç¡¼¥¿¤ò½ñ¤¹þ¤àľÁ°¤Ë¸Æ
- * ¤Ð¤ì¤ë OnWrite ¥³¡¼¥ë¥Ð¥Ã¥¯¥Õ¥¡¥ó¥¯¥¿¤òÀßÄꤹ¤ë¡£¤³¤Î´Ø¿ô¤Ë¤è¤ê
- * ÀßÄꤵ¤ì¤¿¥Õ¥¡¥ó¥¯¥¿¥ª¥Ö¥¸¥§¥¯¥È¤Î½ê͸¢¤Ï¡¢¸Æ¤Ó½Ð¤·Â¦¤¬»ý¤Ä¡£¤·
- * ¤¿¤¬¤Ã const ¤Æ¡¢¤³¤Î¥Õ¥¡¥ó¥¯¥¿¥ª¥Ö¥¸¥§¥¯¥È¤Î²òÂÎÀÕǤ¤Ï¸Æ¤Ó½Ð¤·Â¦¤Ë¤¢¤ë¡£
- * ¥Õ¥¡¥ó¥¯¥¿¤ÎÀßÄê¤ò²ò½ü¤¹¤ë¾ì¹ç¤Ë¤Ï°ú¿ô¤Ë 0 ¤òÅϤ¹¤³¤È¤Ç¡¢¥³¡¼¥ë
- * ¥Ð¥Ã¥¯¤¬Ìµ¸ú¤È¤Ê¤ë¡£
+ * write() 呼び出し時に、各コネクタに対してデータを書き込む直前に呼
+ * ばれる OnWrite コールバックファンクタを設定する。この関数により
+ * 設定されたファンクタオブジェクトの所有権は、呼び出し側が持つ。し
+ * たがっ const て、このファンクタオブジェクトの解体責任は呼び出し側にある。
+ * ファンクタの設定を解除する場合には引数に 0 を渡すことで、コール
+ * バックが無効となる。
*
- * @param on_write OnWrite ¥³¡¼¥ë¥Ð¥Ã¥¯¥Õ¥¡¥ó¥¯¥¿
+ * @param on_write OnWrite コールバックファンクタ
*
* @else
*
@@ -430,21 +430,21 @@
/*!
* @if jp
*
- * @brief OnWriteConvert ¥³¡¼¥ë¥Ð¥Ã¥¯¤ÎÀßÄê
+ * @brief OnWriteConvert コールバックの設定
*
- * write() ¸Æ¤Ó½Ð¤·»þ¤Ë¡¢³Æ¥³¥Í¥¯¥¿¤ËÂФ·¤Æ¥Ç¡¼¥¿¤ò½ñ¤¹þ¤ßľÁ°¤Ë¸Æ
- * ¤Ð¤ì¡¢¥Ç¡¼¥¿ÊÑ´¹¤ò¹Ô¤¦ OnWriteConvert ¥³¡¼¥ë¥Ð¥Ã¥¯¥Õ¥¡¥ó¥¯¥¿¤òÀß
- * Äꤹ¤ë¡£°ú¿ô¤Ëľ¶á¤Ç½ñ¤¹þ¤Þ¤ì¤¿¥Ç¡¼¥¿¤¬Í¿¤¨¤é¤ì¡¢Ìá¤êÃͤ˼ºݤË
- * ¥³¥Í¥¯¥¿¤Þ¤¿¤Ï¥Ð¥Ã¥Õ¥¡¤Ë½ñ¤¹þ¤Þ¤ì¤ë¥Ç¡¼¥¿¤òÊÖ¤¹¥Õ¥¡¥ó¥¯¥¿¤òÀßÄê
- * ¤¹¤ë¡£¤³¤Î´Ø¿ô¤Ë¤è¤êÀßÄꤵ¤ì¤¿¥Õ¥¡¥ó¥¯¥¿¥ª¥Ö¥¸¥§¥¯¥È¤Î½ê͸¢¤Ï¡¢
- * ¸Æ¤Ó½Ð¤·Â¦¤¬»ý¤Ä¡£¤·¤¿¤¬¤Ã const ¤Æ¡¢¤³¤Î¥Õ¥¡¥ó¥¯¥¿¥ª¥Ö¥¸¥§¥¯¥È
- * ¤Î²òÂÎÀÕǤ¤Ï¸Æ¤Ó½Ð¤·Â¦¤Ë¤¢¤ë¡£¥Õ¥¡¥ó¥¯¥¿¤ÎÀßÄê¤ò²ò½ü¤¹¤ë¾ì¹ç¤Ë¤Ï
- * °ú¿ô¤Ë 0 ¤òÅϤ¹¤³¤È¤Ç¡¢¥³¡¼¥ë¥Ð¥Ã¥¯¤¬Ìµ¸ú¤È¤Ê¤ë¡£ ¥Ç¡¼¥¿½ñ¤¹þ¤ß
- * »þ¤Ë¸Æ¤Ð¤ì¤ë OnWriteConvert ¥³¡¼¥ë¥Ð¥Ã¥¯¥Õ¥¡¥ó¥¯¥¿¤òÀßÄꤹ¤ë¡£¤³
- * ¤Î¥³¡¼¥ë¥Ð¥Ã¥¯´Ø¿ô¤Î½èÍý·ë²Ì¤¬½ñ¤¹þ¤Þ¤ì¤ë¡£¤³¤Î¤¿¤á½ñ¤¹þ¤ß¥Ç¡¼
- * ¥¿¤Î¥Õ¥£¥ë¥¿¥ê¥ó¥°¤¬²Äǽ¤È¤Ê¤ë¡£
+ * write() 呼び出し時に、各コネクタに対してデータを書き込み直前に呼
+ * ばれ、データ変換を行う OnWriteConvert コールバックファンクタを設
+ * 定する。引数に直近で書き込まれたデータが与えられ、戻り値に実際に
+ * コネクタまたはバッファに書き込まれるデータを返すファンクタを設定
+ * する。この関数により設定されたファンクタオブジェクトの所有権は、
+ * 呼び出し側が持つ。したがっ const て、このファンクタオブジェクト
+ * の解体責任は呼び出し側にある。ファンクタの設定を解除する場合には
+ * 引数に 0 を渡すことで、コールバックが無効となる。 データ書き込み
+ * 時に呼ばれる OnWriteConvert コールバックファンクタを設定する。こ
+ * のコールバック関数の処理結果が書き込まれる。このため書き込みデー
+ * タのフィルタリングが可能となる。
*
- * @param on_wconvert OnWriteConvert ¥³¡¼¥ë¥Ð¥Ã¥¯¥Õ¥¡¥ó¥¯¥¿
+ * @param on_wconvert OnWriteConvert コールバックファンクタ
*
* @else
*
@@ -472,7 +472,7 @@
std::string m_typename;
/*!
* @if jp
- * @brief ¥Ð¥¤¥ó¥É¤µ¤ì¤ë T ·¿¤ÎÊÑ¿ô¤Ø¤Î»²¾È
+ * @brief バインドされる T 型の変数への参照
* @else
* @brief The reference to type-T variable that is bound.
* @endif
@@ -481,7 +481,7 @@
/*!
* @if jp
- * @brief OnWrite ¥³¡¼¥ë¥Ð¥Ã¥¯¥Õ¥¡¥ó¥¯¥¿¤Ø¤Î¥Ý¥¤¥ó¥¿
+ * @brief OnWrite コールバックファンクタへのポインタ
* @else
* @brief Pointer to OnWrite callback functor
* @endif
@@ -490,7 +490,7 @@
/*!
* @if jp
- * @brief OnWriteConvert ¥³¡¼¥ë¥Ð¥Ã¥¯¥Õ¥¡¥ó¥¯¥¿¤Ø¤Î¥Ý¥¤¥ó¥¿
+ * @brief OnWriteConvert コールバックファンクタへのポインタ
* @else
* @brief Pointer to OnWriteConvert callback functor
* @endif
More information about the openrtm-commit
mailing list