[openrtm-commit:02961] r3097 - in branches/RELENG_1_2/OpenRTM-aist: . etc examples/ExtTrigger examples/SimpleIO packages/rpm src/lib/rtm win32/OpenRTM-aist win32/OpenRTM-aist/examples
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 12月 10日 (日) 08:48:37 JST
Author: n-ando
Date: 2017-12-10 08:48:36 +0900 (Sun, 10 Dec 2017)
New Revision: 3097
Added:
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/examples/ExtTrigger/
Modified:
branches/RELENG_1_2/OpenRTM-aist/configure.ac
branches/RELENG_1_2/OpenRTM-aist/etc/component.conf
branches/RELENG_1_2/OpenRTM-aist/etc/rtc.conf.sample
branches/RELENG_1_2/OpenRTM-aist/examples/ExtTrigger/ConnectorComp.cpp
branches/RELENG_1_2/OpenRTM-aist/examples/ExtTrigger/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/examples/ExtTrigger/run.sh
branches/RELENG_1_2/OpenRTM-aist/examples/SimpleIO/ConnectorComp.cpp
branches/RELENG_1_2/OpenRTM-aist/packages/rpm/OpenRTM-aist.spec.in
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/ExecutionContextBase.h
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/ExecutionContextWorker.h
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/ExtTrigExecutionContext.cpp
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/ExtTrigExecutionContext.h
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Manager.cpp
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Manager.h
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/PeriodicExecutionContext.cpp
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/PeriodicExecutionContext.h
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/RTObject.cpp
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.cpp
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/examples/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/examples/example.yaml
Log:
merged changes from trunk/OpenRTM-aist r2795-2805 during 2016-11
[incompat,bugfix,EC,->RELENG_1_2] EC activation bug for multiple RTCs when they activated from participants RTCs. refs #3697
[incompat,bugfix,EC,->RELENG_1_2] Return code was added. refs #3697
[incompat,bugfix,EC,->RELENG_1_2]Modified for ExtTrigExecutionContext. #3697
[compat,bugfix,->RELENG_1_2]refs #3703
[compat,bugfix,->RELENG_1_2] Initialization of connector_id was corrected. refs #3708
[compat,->RELENG_1_2] ExtTrigger sample has been added in windows source package. refs #3709
[compat,1.2,->RELENG_1_2] Version number updated.
[incompat,->RELENG_1_2] CPU affinity setting has been added. refs #3711
[incompat,->RELENG_1_2] CPU affinity setting for ExecutionContext (only PeriodicEC) has been added. refs #3711
[incompat,->RELENG_1_2] CPU affinity setting for ExecutionContext (only PeriodicEC) has been added. refs #3711
Modified: branches/RELENG_1_2/OpenRTM-aist/configure.ac
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/configure.ac 2017-12-09 23:41:42 UTC (rev 3096)
+++ branches/RELENG_1_2/OpenRTM-aist/configure.ac 2017-12-09 23:48:36 UTC (rev 3097)
@@ -1690,6 +1690,7 @@
win32/OpenRTM-aist/examples/Makefile
win32/OpenRTM-aist/examples/Composite/Makefile
win32/OpenRTM-aist/examples/ConfigSample/Makefile
+ win32/OpenRTM-aist/examples/ExtTrigger/Makefile
win32/OpenRTM-aist/examples/LTTSample/Makefile
win32/OpenRTM-aist/examples/SimpleIO/Makefile
win32/OpenRTM-aist/examples/SeqIO/Makefile
Modified: branches/RELENG_1_2/OpenRTM-aist/etc/component.conf
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/etc/component.conf 2017-12-09 23:41:42 UTC (rev 3096)
+++ branches/RELENG_1_2/OpenRTM-aist/etc/component.conf 2017-12-09 23:48:36 UTC (rev 3097)
@@ -81,6 +81,17 @@
# exec_cxt.reset_timeout: 0.5
#
+# EC's CPU affinity setting
+#
+# This option make the EC bound to specific CPU(s). Options must
+# be one or more comma separated numbers to identify CPU ID. CPU ID
+# is started from 0, and maximum number is number of CPU core -1. If
+# invalid CPU ID is specified, all the CPU will be used for the EC.
+#
+# Example:
+# exec_cxt.cpu_affinity: 0, 1, 2, ...
+
+#
# Specifying Execution Contexts
#
# Default: No default
Modified: branches/RELENG_1_2/OpenRTM-aist/etc/rtc.conf.sample
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/etc/rtc.conf.sample 2017-12-09 23:41:42 UTC (rev 3096)
+++ branches/RELENG_1_2/OpenRTM-aist/etc/rtc.conf.sample 2017-12-09 23:48:36 UTC (rev 3097)
@@ -47,6 +47,21 @@
manager.shutdown_auto: YES
manager.auto_shutdown_duration: 10.0
+#------------------------------------------------------------
+# Manager process's CPU affinity setting
+#
+# This option make the process bound to specific CPU(s). Options must
+# be one or more comma separated numbers to identify CPU ID. CPU ID
+# is started from 0, and maximum number is number of CPU core -1. If
+# invalid CPU ID is specified, all the CPU will be used for the
+# process.
+#
+# Example:
+# manager.cpu_affinity: 0, 1, 2, ...
+#
+manager.cpu_affinity: 0
+
+
#============================================================
# CORBA configuration
#============================================================
Modified: branches/RELENG_1_2/OpenRTM-aist/examples/ExtTrigger/ConnectorComp.cpp
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/examples/ExtTrigger/ConnectorComp.cpp 2017-12-09 23:41:42 UTC (rev 3096)
+++ branches/RELENG_1_2/OpenRTM-aist/examples/ExtTrigger/ConnectorComp.cpp 2017-12-09 23:48:36 UTC (rev 3097)
@@ -62,7 +62,8 @@
int main (int argc, char** argv)
{
int _argc(0);
- char** _argv(0);
+ char** _argv;
+ _argv = 0;
std::string subs_type;
std::string period;
@@ -154,7 +155,7 @@
// connect ports
ConnectorProfile prof;
- prof.connector_id = "";
+ prof.connector_id = CORBA::string_dup("");
prof.name = CORBA::string_dup("connector0");
prof.ports.length(2);
prof.ports[0] = pin[(CORBA::ULong)0];
Modified: branches/RELENG_1_2/OpenRTM-aist/examples/ExtTrigger/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/examples/ExtTrigger/Makefile.am 2017-12-09 23:41:42 UTC (rev 3096)
+++ branches/RELENG_1_2/OpenRTM-aist/examples/ExtTrigger/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
@@ -19,23 +19,23 @@
sourcedir = $(exampledir)/src/ExtTrigger
# Standalone RTCs
-example_PROGRAMS = ConsoleInCompExt ConsoleOutCompExt ConnectorCompExt
+example_PROGRAMS = ExtConsoleInComp ExtConsoleOutComp ExtConnectorComp
example_DATA = rtc.conf
-ConsoleInCompExt_SOURCES = ConsoleInComp.cpp ConsoleIn.cpp ConsoleIn.h
-ConsoleInCompExt_LDADD = $(top_builddir)/src/lib/rtm/libRTC.la \
+ExtConsoleInComp_SOURCES = ConsoleInComp.cpp ConsoleIn.cpp ConsoleIn.h
+ExtConsoleInComp_LDADD = $(top_builddir)/src/lib/rtm/libRTC.la \
$(top_builddir)/src/lib/coil/lib/libcoil.la
-ConsoleInCompExt_LDFLAGS = -L$(top_builddir)/src/lib/rtm/.libs
+ExtConsoleInComp_LDFLAGS = -L$(top_builddir)/src/lib/rtm/.libs
-ConsoleOutCompExt_SOURCES = ConsoleOutComp.cpp ConsoleOut.cpp ConsoleOut.h
-ConsoleOutCompExt_LDADD = $(top_builddir)/src/lib/rtm/libRTC.la \
+ExtConsoleOutComp_SOURCES = ConsoleOutComp.cpp ConsoleOut.cpp ConsoleOut.h
+ExtConsoleOutComp_LDADD = $(top_builddir)/src/lib/rtm/libRTC.la \
$(top_builddir)/src/lib/coil/lib/libcoil.la
-ConsoleOutCompExt_LDFLAGS = -L$(top_builddir)/src/lib/rtm/.libs
+ExtConsoleOutComp_LDFLAGS = -L$(top_builddir)/src/lib/rtm/.libs
-ConnectorCompExt_SOURCES = ConnectorComp.cpp
-ConnectorCompExt_LDADD = $(top_builddir)/src/lib/rtm/libRTC.la \
+ExtConnectorComp_SOURCES = ConnectorComp.cpp
+ExtConnectorComp_LDADD = $(top_builddir)/src/lib/rtm/libRTC.la \
$(top_builddir)/src/lib/coil/lib/libcoil.la
-ConnectorCompExt_LDFLAGS = -L$(top_builddir)/src/lib/rtm/.libs
+ExtConnectorComp_LDFLAGS = -L$(top_builddir)/src/lib/rtm/.libs
# Example sources
source_DATA = $(ALL_SRC) $(EXTRA_DIST)
@@ -79,7 +79,7 @@
$(top_builddir)/build/vcprojtool.py vcproj \
--type EXE \
--vcversion "8.00" \
- --projectname "ConsoleInComp" \
+ --projectname "ExtConsoleInComp" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleIn_vc8.vcproj \
--yaml ../rtc.vcproj.yaml \
@@ -89,7 +89,7 @@
$(top_builddir)/build/vcprojtool.py vcproj \
--type DLL \
--vcversion "8.00" \
- --projectname "ConsoleIn" \
+ --projectname "ExtConsoleIn" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleInDll_vc8.vcproj \
--yaml ../rtcdll.vcproj.yaml \
@@ -99,7 +99,7 @@
$(top_builddir)/build/vcprojtool.py vcproj \
--type EXE \
--vcversion "8.00" \
- --projectname "ConsoleOutComp" \
+ --projectname "ExtConsoleOutComp" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleOut_vc8.vcproj \
--yaml ../rtc.vcproj.yaml \
@@ -109,7 +109,7 @@
$(top_builddir)/build/vcprojtool.py vcproj \
--type DLL \
--vcversion "8.00" \
- --projectname "ConsoleOut" \
+ --projectname "ExtConsoleOut" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleOutDll_vc8.vcproj \
--yaml ../rtcdll.vcproj.yaml \
@@ -116,12 +116,20 @@
--source ConsoleOut.cpp \
--header ConsoleOut.h
qkc -O- -sm $(win32_builddir)/ConsoleOutDll_vc8.vcproj
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --type EXE \
+ --vcversion "8.00" \
+ --projectname "ExtConnectorComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConnectorComp_vc8.vcproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source ConnectorComp.cpp
vc9proj:
$(top_builddir)/build/vcprojtool.py vcproj \
--type EXE \
--vcversion "9.00" \
- --projectname "ConsoleInComp" \
+ --projectname "ExtConsoleInComp" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleIn_vc9.vcproj \
--yaml ../rtc.vcproj.yaml \
@@ -131,7 +139,7 @@
$(top_builddir)/build/vcprojtool.py vcproj \
--type DLL \
--vcversion "9.00" \
- --projectname "ConsoleIn" \
+ --projectname "ExtConsoleIn" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleInDll_vc9.vcproj \
--yaml ../rtcdll.vcproj.yaml \
@@ -141,7 +149,7 @@
$(top_builddir)/build/vcprojtool.py vcproj \
--type EXE \
--vcversion "9.00" \
- --projectname "ConsoleOutComp" \
+ --projectname "ExtConsoleOutComp" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleOut_vc9.vcproj \
--yaml ../rtc.vcproj.yaml \
@@ -151,7 +159,7 @@
$(top_builddir)/build/vcprojtool.py vcproj \
--type DLL \
--vcversion "9.00" \
- --projectname "ConsoleOut" \
+ --projectname "ExtConsoleOut" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleOutDll_vc9.vcproj \
--yaml ../rtcdll.vcproj.yaml \
@@ -158,15 +166,23 @@
--source ConsoleOut.cpp \
--header ConsoleOut.h
qkc -O- -sm $(win32_builddir)/ConsoleOutDll_vc9.vcproj
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --type EXE \
+ --vcversion "9.00" \
+ --projectname "ExtConnectorComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConnectorComp_vc9.vcproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source ConnectorComp.cpp
vc10proj:
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type EXE \
--vcversion "10.00" \
- --projectname "ConsoleInComp" \
+ --projectname "ExtConsoleInComp" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleIn_vc10.vcxproj \
- --yaml ../rtc.vcxproj.yaml \
+ --yaml ../rtc.vcproj.yaml \
--source ConsoleIn.cpp ConsoleInComp.cpp \
--header ConsoleIn.h
qkc -O- -sm $(win32_builddir)/ConsoleIn_vc10.vcxproj
@@ -173,10 +189,10 @@
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type DLL \
--vcversion "10.00" \
- --projectname "ConsoleIn" \
+ --projectname "ExtConsoleIn" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleInDll_vc10.vcxproj \
- --yaml ../rtcdll.vcxproj.yaml \
+ --yaml ../rtcdll.vcproj.yaml \
--source ConsoleIn.cpp \
--header ConsoleIn.h
qkc -O- -sm $(win32_builddir)/ConsoleInDll_vc10.vcxproj
@@ -183,10 +199,10 @@
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type EXE \
--vcversion "10.00" \
- --projectname "ConsoleOutComp" \
+ --projectname "ExtConsoleOutComp" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleOut_vc10.vcxproj \
- --yaml ../rtc.vcxproj.yaml \
+ --yaml ../rtc.vcproj.yaml \
--source ConsoleOut.cpp ConsoleOutComp.cpp \
--header ConsoleOut.h
qkc -O- -sm $(win32_builddir)/ConsoleOut_vc10.vcxproj
@@ -193,22 +209,30 @@
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type DLL \
--vcversion "10.00" \
- --projectname "ConsoleOut" \
+ --projectname "ExtConsoleOut" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleOutDll_vc10.vcxproj \
- --yaml ../rtcdll.vcxproj.yaml \
+ --yaml ../rtcdll.vcproj.yaml \
--source ConsoleOut.cpp \
--header ConsoleOut.h
qkc -O- -sm $(win32_builddir)/ConsoleOutDll_vc10.vcxproj
-
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "10.00" \
+ --projectname "ExtConnectorComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConnectorComp_vc10.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source ConnectorComp.cpp
+
vc11proj:
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type EXE \
--vcversion "11.00" \
- --projectname "ConsoleInComp" \
+ --projectname "ExtConsoleInComp" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleIn_vc11.vcxproj \
- --yaml ../rtc.vcxproj.yaml \
+ --yaml ../rtc.vcproj.yaml \
--source ConsoleIn.cpp ConsoleInComp.cpp \
--header ConsoleIn.h
qkc -O- -sm $(win32_builddir)/ConsoleIn_vc11.vcxproj
@@ -215,10 +239,10 @@
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type DLL \
--vcversion "11.00" \
- --projectname "ConsoleIn" \
+ --projectname "ExtConsoleIn" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleInDll_vc11.vcxproj \
- --yaml ../rtcdll.vcxproj.yaml \
+ --yaml ../rtcdll.vcproj.yaml \
--source ConsoleIn.cpp \
--header ConsoleIn.h
qkc -O- -sm $(win32_builddir)/ConsoleInDll_vc11.vcxproj
@@ -225,10 +249,10 @@
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type EXE \
--vcversion "11.00" \
- --projectname "ConsoleOutComp" \
+ --projectname "ExtConsoleOutComp" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleOut_vc11.vcxproj \
- --yaml ../rtc.vcxproj.yaml \
+ --yaml ../rtc.vcproj.yaml \
--source ConsoleOut.cpp ConsoleOutComp.cpp \
--header ConsoleOut.h
qkc -O- -sm $(win32_builddir)/ConsoleOut_vc11.vcxproj
@@ -235,22 +259,30 @@
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type DLL \
--vcversion "11.00" \
- --projectname "ConsoleOut" \
+ --projectname "ExtConsoleOut" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleOutDll_vc11.vcxproj \
- --yaml ../rtcdll.vcxproj.yaml \
+ --yaml ../rtcdll.vcproj.yaml \
--source ConsoleOut.cpp \
--header ConsoleOut.h
qkc -O- -sm $(win32_builddir)/ConsoleOutDll_vc11.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "11.00" \
+ --projectname "ExtConnectorComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConnectorComp_vc11.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source ConnectorComp.cpp
vc12proj:
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type EXE \
--vcversion "12.00" \
- --projectname "ConsoleInComp" \
+ --projectname "ExtConsoleInComp" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleIn_vc12.vcxproj \
- --yaml ../rtc.vcxproj.yaml \
+ --yaml ../rtc.vcproj.yaml \
--source ConsoleIn.cpp ConsoleInComp.cpp \
--header ConsoleIn.h
qkc -O- -sm $(win32_builddir)/ConsoleIn_vc12.vcxproj
@@ -257,10 +289,10 @@
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type DLL \
--vcversion "12.00" \
- --projectname "ConsoleIn" \
+ --projectname "ExtConsoleIn" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleInDll_vc12.vcxproj \
- --yaml ../rtcdll.vcxproj.yaml \
+ --yaml ../rtcdll.vcproj.yaml \
--source ConsoleIn.cpp \
--header ConsoleIn.h
qkc -O- -sm $(win32_builddir)/ConsoleInDll_vc12.vcxproj
@@ -267,10 +299,10 @@
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type EXE \
--vcversion "12.00" \
- --projectname "ConsoleOutComp" \
+ --projectname "ExtConsoleOutComp" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleOut_vc12.vcxproj \
- --yaml ../rtc.vcxproj.yaml \
+ --yaml ../rtc.vcproj.yaml \
--source ConsoleOut.cpp ConsoleOutComp.cpp \
--header ConsoleOut.h
qkc -O- -sm $(win32_builddir)/ConsoleOut_vc12.vcxproj
@@ -277,22 +309,30 @@
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type DLL \
--vcversion "12.00" \
- --projectname "ConsoleOut" \
+ --projectname "ExtConsoleOut" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleOutDll_vc12.vcxproj \
- --yaml ../rtcdll.vcxproj.yaml \
+ --yaml ../rtcdll.vcproj.yaml \
--source ConsoleOut.cpp \
--header ConsoleOut.h
qkc -O- -sm $(win32_builddir)/ConsoleOutDll_vc12.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "12.00" \
+ --projectname "ExtConnectorComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConnectorComp_vc12.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source ConnectorComp.cpp
vc14proj:
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type EXE \
--vcversion "14.00" \
- --projectname "ConsoleInComp" \
+ --projectname "ExtConsoleInComp" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleIn_vc14.vcxproj \
- --yaml ../rtc.vcxproj.yaml \
+ --yaml ../rtc.vcproj.yaml \
--source ConsoleIn.cpp ConsoleInComp.cpp \
--header ConsoleIn.h
qkc -O- -sm $(win32_builddir)/ConsoleIn_vc14.vcxproj
@@ -299,10 +339,10 @@
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type DLL \
--vcversion "14.00" \
- --projectname "ConsoleIn" \
+ --projectname "ExtConsoleIn" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleInDll_vc14.vcxproj \
- --yaml ../rtcdll.vcxproj.yaml \
+ --yaml ../rtcdll.vcproj.yaml \
--source ConsoleIn.cpp \
--header ConsoleIn.h
qkc -O- -sm $(win32_builddir)/ConsoleInDll_vc14.vcxproj
@@ -309,10 +349,10 @@
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type EXE \
--vcversion "14.00" \
- --projectname "ConsoleOutComp" \
+ --projectname "ExtConsoleOutComp" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleOut_vc14.vcxproj \
- --yaml ../rtc.vcxproj.yaml \
+ --yaml ../rtc.vcproj.yaml \
--source ConsoleOut.cpp ConsoleOutComp.cpp \
--header ConsoleOut.h
qkc -O- -sm $(win32_builddir)/ConsoleOut_vc14.vcxproj
@@ -319,15 +359,23 @@
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type DLL \
--vcversion "14.00" \
- --projectname "ConsoleOut" \
+ --projectname "ExtConsoleOut" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleOutDll_vc14.vcxproj \
- --yaml ../rtcdll.vcxproj.yaml \
+ --yaml ../rtcdll.vcproj.yaml \
--source ConsoleOut.cpp \
--header ConsoleOut.h
qkc -O- -sm $(win32_builddir)/ConsoleOutDll_vc14.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "14.00" \
+ --projectname "ExtConnectorComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConnectorComp_vc14.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source ConnectorComp.cpp
-dist-hook: lst
+dist-hook: lst vcproj
clean-local:
rm -f \
Modified: branches/RELENG_1_2/OpenRTM-aist/examples/ExtTrigger/run.sh
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/examples/ExtTrigger/run.sh 2017-12-09 23:41:42 UTC (rev 3096)
+++ branches/RELENG_1_2/OpenRTM-aist/examples/ExtTrigger/run.sh 2017-12-09 23:48:36 UTC (rev 3097)
@@ -44,11 +44,11 @@
echo 'exec_cxt.periodic.type: ExtTrigExecutionContext' >> ./rtc.conf
echo 'exec_cxt.periodic.rate: 1000' >> ./rtc.conf
-$term -e ./ConsoleInCompExt &
-$term -e ./ConsoleOutCompExt &
+$term -e ./ExtConsoleInComp &
+$term -e ./ExtConsoleOutComp &
sleep 5
-./ConnectorCompExt
+./ExtConnectorComp
#sleep 10
#nspid=`ps -ax | grep 9876 | awk '{print $1}'`
Modified: branches/RELENG_1_2/OpenRTM-aist/examples/SimpleIO/ConnectorComp.cpp
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/examples/SimpleIO/ConnectorComp.cpp 2017-12-09 23:41:42 UTC (rev 3096)
+++ branches/RELENG_1_2/OpenRTM-aist/examples/SimpleIO/ConnectorComp.cpp 2017-12-09 23:48:36 UTC (rev 3097)
@@ -223,7 +223,7 @@
// connect ports
ConnectorProfile prof;
- prof.connector_id = (char*)"";
+ prof.connector_id = CORBA::string_dup("");
prof.name = CORBA::string_dup("connector0");
prof.ports.length(2);
prof.ports[0] = pin[(CORBA::ULong)0];
Modified: branches/RELENG_1_2/OpenRTM-aist/packages/rpm/OpenRTM-aist.spec.in
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/packages/rpm/OpenRTM-aist.spec.in 2017-12-09 23:41:42 UTC (rev 3096)
+++ branches/RELENG_1_2/OpenRTM-aist/packages/rpm/OpenRTM-aist.spec.in 2017-12-09 23:48:36 UTC (rev 3097)
@@ -144,6 +144,9 @@
#------------------------------------------------------------
# changelog section
%changelog
+* Wed Nov 16 2016 Noriaki Ando <n-ando at aist.go.jp> - 1.2.0-0._distname
+- The 1.2.0 release of OpenRTM-aist.
+
* Thu Jun 4 2011 Noriaki Ando <n-ando at aist.go.jp> - 1.1.0-0._distname
- CMakefile has been added.
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/ExecutionContextBase.h
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/ExecutionContextBase.h 2017-12-09 23:41:42 UTC (rev 3096)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/ExecutionContextBase.h 2017-12-09 23:48:36 UTC (rev 3097)
@@ -401,14 +401,14 @@
/*!
* @if jp
- * @brief ExecutionContext¤Î½èÍý¤ò¿Ê¤á¤ë
+ * @brief ExecutionContext¤Î½é´ü²½¤ò¹Ô¤¦
*
- * ExecutionContext¤Î½èÍý¤ò£±¼þ´üʬ¿Ê¤á¤ë¡£
+ * ExecutionContext¤Î½é´ü²½½èÍý
*
* @else
- * @brief Proceed with tick of ExecutionContext
+ * @brief Initialize the ExecutionContext
*
- * Proceed with tick of ExecutionContext for one period.
+ * This operation initialize the ExecutionContext
*
* @endif
*/
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/ExecutionContextWorker.h
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/ExecutionContextWorker.h 2017-12-09 23:41:42 UTC (rev 3096)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/ExecutionContextWorker.h 2017-12-09 23:48:36 UTC (rev 3097)
@@ -249,6 +249,11 @@
*/
RTC::ReturnCode_t stop(void);
+ RTC::ReturnCode_t startThread(void);
+
+ RTC::ReturnCode_t stopThread(void);
+
+
/*!
* @if jp
* @brief ExecutionContext ¤Î¼Â¹Ô¼þ´ü¤¬Êѹ¹¤µ¤ì¤¿
@@ -544,9 +549,7 @@
void invokeWorkerPreDo();
void invokeWorkerDo();
void invokeWorkerPostDo();
-
-
- protected:
+
/*!
* @if jp
* @brief ¥³¥ó¥Ý¡¼¥Í¥ó¥È¥ê¥¹¥È¤Î¹¹¿·
@@ -556,26 +559,6 @@
*/
void updateComponentList();
-
-
- /*!
- * @if jp
- * @brief ¥³¥ó¥Ý¡¼¥Í¥ó¥È¸¡º÷ÍÑ¥Õ¥¡¥ó¥¯¥¿
- * @else
- * @brief Functor to find the component
- * @endif
- */
-// struct find_comp
-// {
-// RTC::LightweightRTObject_var m_comp;
-// find_comp(RTC::LightweightRTObject_ptr comp)
-// : m_comp(RTC::LightweightRTObject::_duplicate(comp)) {}
-// bool operator()(RTObjectStateMachine* comp)
-// {
-// return comp->isEquivalent(m_comp);
-// }
-// };
-
//------------------------------------------------------------
// member variables
protected:
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/ExtTrigExecutionContext.cpp
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/ExtTrigExecutionContext.cpp 2017-12-09 23:41:42 UTC (rev 3096)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/ExtTrigExecutionContext.cpp 2017-12-09 23:48:36 UTC (rev 3097)
@@ -392,6 +392,33 @@
}
return RTC::RTC_OK;
}
+ // template virtual functions adding/removing component
+ /*!
+ * @brief onAddedComponent() template function
+ */
+ RTC::ReturnCode_t ExtTrigExecutionContext::
+ onAddedComponent(RTC::LightweightRTObject_ptr rtobj)
+ {
+ Guard guard(m_worker.mutex_);
+ if (m_worker.ticked_ == false)
+ {
+ ExecutionContextBase::m_worker.updateComponentList();
+ }
+ return RTC::RTC_OK;
+ }
+ /*!
+ * @brief onRemovedComponent() template function
+ */
+ RTC::ReturnCode_t ExtTrigExecutionContext::
+ onRemovedComponent(RTC::LightweightRTObject_ptr rtobj)
+ {
+ Guard guard(m_worker.mutex_);
+ if (m_worker.ticked_ == false)
+ {
+ ExecutionContextBase::m_worker.updateComponentList();
+ }
+ return RTC::RTC_OK;
+ }
/*!
* @brief onWaitingActivated() template function
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/ExtTrigExecutionContext.h
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/ExtTrigExecutionContext.h 2017-12-09 23:41:42 UTC (rev 3096)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/ExtTrigExecutionContext.h 2017-12-09 23:48:36 UTC (rev 3097)
@@ -589,6 +589,17 @@
* @brief onStarted() template function
*/
virtual RTC::ReturnCode_t onStarted();
+ // template virtual functions adding/removing component
+ /*!
+ * @brief onAddedComponent() template function
+ */
+ virtual RTC::ReturnCode_t
+ onAddedComponent(RTC::LightweightRTObject_ptr rtobj);
+ /*!
+ * @brief onRemovedComponent() template function
+ */
+ virtual RTC::ReturnCode_t
+ onRemovedComponent(RTC::LightweightRTObject_ptr rtobj);
/*!
* @brief onWaitingActivated() template function
*/
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Manager.cpp
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Manager.cpp 2017-12-09 23:41:42 UTC (rev 3096)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Manager.cpp 2017-12-09 23:48:36 UTC (rev 3097)
@@ -16,6 +16,7 @@
*
*/
+
#include <rtm/Manager.h>
#include <rtm/ManagerConfig.h>
#include <rtm/ModuleManager.h>
@@ -42,6 +43,13 @@
#include <rtm/LocalServiceAdmin.h>
#include <rtm/SystemLogger.h>
+#ifdef RTM_OS_LINUX
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif // _GNU_SOURCE
+#include <pthread.h>
+#endif // RTM_OS_LINUX
+
#if defined(minor)
#undef minor
#endif
@@ -819,6 +827,7 @@
"exec_cxt.activation_timeout",
"exec_cxt.deactivation_timeout",
"exec_cxt.reset_timeout",
+ "exec_cxt.cpu_affinity",
"logger.enable",
"logger.log_level",
"naming.enable",
@@ -1217,13 +1226,13 @@
if (coil::toBool(m_config["timer.enable"], "YES", "NO", true))
{
coil::TimeValue tm(0, 100000);
- std::string tick(m_config["timer.tick"]);
- if (!tick.empty())
- {
- tm = atof(tick.c_str());
- m_timer = new coil::Timer(tm);
- m_timer->start();
- }
+ std::string tick(m_config["timer.tick"]);
+ if (!tick.empty())
+ {
+ tm = atof(tick.c_str());
+ m_timer = new coil::Timer(tm);
+ m_timer->start();
+ }
}
if (coil::toBool(m_config["manager.shutdown_auto"], "YES", "NO", true) &&
@@ -1732,6 +1741,12 @@
PeriodicExecutionContextInit(this);
ExtTrigExecutionContextInit(this);
OpenHRPExecutionContextInit(this);
+
+ // initialize CPU affinity
+#ifdef RTM_OS_LINUX
+ initCpuAffinity();
+#endif // RTM_OS_LINUX
+
return true;
}
@@ -1750,6 +1765,52 @@
return true;
}
+ void Manager::initCpuAffinity()
+ {
+ RTC_TRACE(("initCpuAffinity()"));
+#ifdef RTM_OS_LINUX
+ if (m_config.findNode("manager.cpu_affinity") == 0) { return; }
+
+ std::string& affinity(m_config["manager.cpu_affinity"]);
+ RTC_DEBUG(("CPU affinity property: %s", affinity.c_str()));
+
+ coil::vstring tmp = coil::split(affinity, ",", true);
+
+ pid_t pid = getpid();
+ cpu_set_t cpu_set; CPU_ZERO(&cpu_set);
+
+ for (size_t i(0); i < tmp.size(); ++i)
+ {
+ int num;
+ if (coil::stringTo(num, tmp[i].c_str()))
+ {
+ CPU_SET(num, &cpu_set);
+ RTC_DEBUG(("CPU affinity mask set to %d", num));
+ }
+ }
+
+ int result = sched_setaffinity(pid, sizeof(cpu_set_t), &cpu_set);
+ if (result != 0)
+ {
+ RTC_ERROR(("pthread_getaffinity_np():"
+ "CPU affinity mask setting failed"));
+ }
+ CPU_ZERO(&cpu_set);
+ result = sched_getaffinity(pid, sizeof(cpu_set_t), &cpu_set);
+ if (result != 0)
+ {
+ RTC_ERROR(("pthread_getaffinity_np(): returned error."));
+ }
+ for (size_t j(0); j < CPU_SETSIZE; ++j)
+ {
+ if (CPU_ISSET(j, &cpu_set))
+ {
+ RTC_DEBUG(("Current CPU affinity mask is %d.", j));
+ }
+ }
+#endif // RTM_OS_LINUX
+ }
+
/*!
* @if jp
* @brief Timer ¤Î½é´ü²½
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Manager.h
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Manager.h 2017-12-09 23:41:42 UTC (rev 3096)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Manager.h 2017-12-09 23:48:36 UTC (rev 3097)
@@ -1581,6 +1581,8 @@
*/
bool initFactories();
+ void initCpuAffinity();
+
/*!
* @if jp
* @brief Timer ¤Î½é´ü²½
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/PeriodicExecutionContext.cpp
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/PeriodicExecutionContext.cpp 2017-12-09 23:41:42 UTC (rev 3096)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/PeriodicExecutionContext.cpp 2017-12-09 23:48:36 UTC (rev 3097)
@@ -18,7 +18,10 @@
#include <algorithm>
#include <iostream>
-
+#ifdef RTM_OS_LINUX
+#define _GNU_SOURCE
+#include <pthread.h>
+#endif // RTM_OS_LINUX
#include <coil/Time.h>
#include <coil/TimeValue.h>
@@ -76,6 +79,16 @@
wait();
}
+ void PeriodicExecutionContext::init(coil::Properties& props)
+ {
+ RTC_TRACE(("init()"));
+ ExecutionContextBase::init(props);
+
+ setCpuAffinity(props);
+
+ RTC_DEBUG(("init() done"));
+ }
+
/*------------------------------------------------------------
* Start activity
* ACE_Task class method over ride.
@@ -109,6 +122,40 @@
{
RTC_TRACE(("svc()"));
int count(0);
+
+#ifdef RTM_OS_LINUX
+ pthread_t tid(pthread_self());
+ cpu_set_t cpu_set;
+ CPU_ZERO(&cpu_set);
+
+ for (size_t i(0); i < m_cpu.size(); ++i)
+ {
+ RTC_DEBUG(("CPU affinity mask set to %d", m_cpu[i]));
+ CPU_SET(m_cpu[i], &cpu_set);
+ }
+
+ int result = pthread_setaffinity_np(tid, sizeof(cpu_set_t), &cpu_set);
+ if (result != 0)
+ {
+ RTC_ERROR(("pthread_getaffinity_np():"
+ "CPU affinity mask setting failed"));
+ }
+ CPU_ZERO(&cpu_set);
+ tid = pthread_self();
+ result = pthread_getaffinity_np(tid, sizeof(cpu_set_t), &cpu_set);
+ if (result != 0)
+ {
+ RTC_ERROR(("pthread_getaffinity_np(): returned error."));
+ }
+ for (size_t j(0); j < CPU_SETSIZE; ++j)
+ {
+ if (CPU_ISSET(j, &cpu_set))
+ {
+ RTC_DEBUG(("Current CPU affinity mask is %d.", j));
+ }
+ }
+#endif // RTM_OS_LINUX
+
do
{
ExecutionContextBase::invokeWorkerPreDo();
@@ -394,6 +441,33 @@
m_workerthread.running_ = false;
return RTC::RTC_OK;
}
+ // template virtual functions adding/removing component
+ /*!
+ * @brief onAddedComponent() template function
+ */
+ RTC::ReturnCode_t PeriodicExecutionContext::
+ onAddedComponent(RTC::LightweightRTObject_ptr rtobj)
+ {
+ Guard guard(m_workerthread.mutex_);
+ if (m_workerthread.running_ == false)
+ {
+ m_worker.updateComponentList();
+ }
+ return RTC::RTC_OK;
+ }
+ /*!
+ * @brief onRemovedComponent() template function
+ */
+ RTC::ReturnCode_t PeriodicExecutionContext::
+ onRemovedComponent(RTC::LightweightRTObject_ptr rtobj)
+ {
+ Guard guard(m_workerthread.mutex_);
+ if (m_workerthread.running_ == false)
+ {
+ m_worker.updateComponentList();
+ }
+ return RTC::RTC_OK;
+ }
/*!
* @brief onWaitingActivated() template function
@@ -530,6 +604,28 @@
return RTC::RTC_OK;
}
+ void PeriodicExecutionContext::setCpuAffinity(coil::Properties& props)
+ {
+ RTC_TRACE(("setCpuAffinity()"));
+ std::cout << props;
+ std::string affinity;
+ getProperty(props, "cpu_affinity", affinity);
+ RTC_DEBUG(("CPU affinity property: %s", affinity.c_str()));
+
+ coil::vstring tmp = coil::split(affinity, ",", true);
+ m_cpu.clear();
+
+ for (size_t i(0); i < tmp.size(); ++i)
+ {
+ int num;
+ if (coil::stringTo(num, tmp[i].c_str()))
+ {
+ m_cpu.push_back(num);
+ RTC_DEBUG(("CPU affinity int value: %d added.", num));
+ }
+ }
+ }
+
}; // namespace RTC
extern "C"
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/PeriodicExecutionContext.h
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/PeriodicExecutionContext.h 2017-12-09 23:41:42 UTC (rev 3096)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/PeriodicExecutionContext.h 2017-12-09 23:48:36 UTC (rev 3097)
@@ -102,6 +102,21 @@
/*!
* @if jp
+ * @brief ExecutionContext¤Î½é´ü²½¤ò¹Ô¤¦
+ *
+ * ExecutionContext¤Î½é´ü²½½èÍý
+ *
+ * @else
+ * @brief Initialize the ExecutionContext
+ *
+ * This operation initialize the ExecutionContext
+ *
+ * @endif
+ */
+ virtual void init(coil::Properties& props);
+
+ /*!
+ * @if jp
* @brief ExecutionContextÍÑ¥¢¥¯¥Æ¥£¥Ó¥Æ¥£¥¹¥ì¥Ã¥É¤òÀ¸À®¤¹¤ë
*
* Executioncontext ÍѤÎÆâÉô¥¢¥¯¥Æ¥£¥Ó¥Æ¥£¥¹¥ì¥Ã¥É¤òÀ¸À®¤·µ¯Æ°¤¹¤ë¡£
@@ -571,6 +586,18 @@
throw (CORBA::SystemException);
protected:
+ template <class T>
+ void getProperty(coil::Properties& prop, const char* key, T& value)
+ {
+ if (prop.findNode(key) != 0)
+ {
+ T tmp;
+ if (coil::stringTo(tmp, prop[key].c_str()))
+ {
+ value = tmp;
+ }
+ }
+ }
/*!
* @brief onStarted() template function
*/
@@ -579,7 +606,19 @@
* @brief onStopping() template function
*/
virtual RTC::ReturnCode_t onStopping();
+ // template virtual functions adding/removing component
/*!
+ * @brief onAddedComponent() template function
+ */
+ virtual RTC::ReturnCode_t
+ onAddedComponent(RTC::LightweightRTObject_ptr rtobj);
+ /*!
+ * @brief onRemovedComponent() template function
+ */
+ virtual RTC::ReturnCode_t
+ onRemovedComponent(RTC::LightweightRTObject_ptr rtobj);
+
+ /*!
* @brief onWaitingActivated() template function
*/
virtual RTC::ReturnCode_t
@@ -610,6 +649,11 @@
virtual RTC::ReturnCode_t
onReset(RTC_impl::RTObjectStateMachine* comp, long int count);
+ /*!
+ * @brief setting CPU affinity from given properties
+ */
+ virtual void setCpuAffinity(coil::Properties& props);
+
bool threadRunning()
{
Guard guard(m_svcmutex);
@@ -669,6 +713,11 @@
*/
bool m_nowait;
+ /*!
+ * @brief CPU affinity mask list
+ */
+ std::vector<int> m_cpu;
+
}; // class PeriodicExecutionContext
}; // namespace RTC
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/RTObject.cpp
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/RTObject.cpp 2017-12-09 23:41:42 UTC (rev 3096)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/RTObject.cpp 2017-12-09 23:48:36 UTC (rev 3097)
@@ -2527,6 +2527,7 @@
"activation_timeout",
"deactivation_timeout",
"reset_timeout",
+ "cpu_affinity",
""
};
coil::Properties* p = m_properties.findNode("exec_cxt");
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.cpp
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.cpp 2017-12-09 23:41:42 UTC (rev 3096)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/SdoServiceAdmin.cpp 2017-12-09 23:48:36 UTC (rev 3097)
@@ -208,7 +208,7 @@
return new SDOPackage::ServiceProfile(m_providers[i]->getProfile());
}
}
- throw new SDOPackage::InvalidParameter();
+ throw SDOPackage::InvalidParameter();
return new SDOPackage::ServiceProfile();
}
Modified: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep 2017-12-09 23:41:42 UTC (rev 3096)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep 2017-12-09 23:48:36 UTC (rev 3097)
@@ -30,3 +30,8 @@
LogicalTimeTriggeredEC: libcoil libRTC
LTTSample: libcoil libRTC
LTTSampleComp: libcoil libRTC
+ExtConsoleIn: libcoil libRTC
+ExtConsoleInComp: libcoil libRTC
+ExtConsoleOut: libcoil libRTC
+ExtConsoleOutComp: libcoil libRTC
+ExtConnectorComp: libcoil libRTC
Modified: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/examples/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/examples/Makefile.am 2017-12-09 23:41:42 UTC (rev 3096)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/examples/Makefile.am 2017-12-09 23:48:36 UTC (rev 3097)
@@ -4,7 +4,7 @@
##
## $Id$
##---------------------------------------------------------------------------
-SUBDIRS = Composite ConfigSample LTTSample SimpleIO SeqIO SimpleService USBCamera .
+SUBDIRS = Composite ConfigSample ExtTrigger LTTSample SimpleIO SeqIO SimpleService USBCamera .
wxs:
cp -p *.yaml ../installer/
Modified: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/examples/example.yaml
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/examples/example.yaml 2017-12-09 23:41:42 UTC (rev 3096)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/examples/example.yaml 2017-12-09 23:48:36 UTC (rev 3097)
@@ -110,4 +110,19 @@
ShortName: Sens.dll
Name: Sensor.dll
Source: ..\\examples\\Composite\\Sensor\\Release\\Sensor.dll
+ - Id: ExtConnectorComp.exe
+ ShortName: ExtConnect.exe
+ Name: ExtConnectorComp.exe
+ Source: ..\\examples\\ExtTrigger\\ConnectorComp\\Release\\ExtConnectorComp.exe
+ Shortcut: true
+ - Id: ExtConsoleInComp.exe
+ ShortName: ExtConsIn.exe
+ Name: ExtConsoleInComp.exe
+ Source: ..\\examples\\ExtTrigger\\ConsoleInComp\\Release\\ExtConsoleInComp.exe
+ Shortcut: true
+ - Id: ExtConsoleOutComp.exe
+ ShortName: ExtConsOut.exe
+ Name: ExtConsoleOutComp.exe
+ Source: ..\\examples\\ExtTrigger\\ConsoleOutComp\\Release\\ExtConsoleOutComp.exe
+ Shortcut: true
More information about the openrtm-commit
mailing list