[openrtm-commit:02992] r3126 - in trunk/OpenRTM-aist/src/lib/rtm: . idl
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 12月 11日 (月) 15:13:10 JST
Author: miyamoto
Date: 2017-12-11 15:13:10 +0900 (Mon, 11 Dec 2017)
New Revision: 3126
Modified:
trunk/OpenRTM-aist/src/lib/rtm/CMakeLists.txt
trunk/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp
trunk/OpenRTM-aist/src/lib/rtm/ConnectorListener.cpp
trunk/OpenRTM-aist/src/lib/rtm/ConnectorListener.h
trunk/OpenRTM-aist/src/lib/rtm/InPortConsumer.h
trunk/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrConsumer.cpp
trunk/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrConsumer.h
trunk/OpenRTM-aist/src/lib/rtm/InPortDirectConsumer.cpp
trunk/OpenRTM-aist/src/lib/rtm/InPortDirectConsumer.h
trunk/OpenRTM-aist/src/lib/rtm/idl/CMakeLists.txt
Log:
[compat] refs #4391
Modified: trunk/OpenRTM-aist/src/lib/rtm/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/CMakeLists.txt 2017-12-11 03:27:45 UTC (rev 3125)
+++ trunk/OpenRTM-aist/src/lib/rtm/CMakeLists.txt 2017-12-11 06:13:10 UTC (rev 3126)
@@ -247,10 +247,20 @@
SdoServiceProviderBase.h
StateMachine.h
Typename.h
+ FsmActionListener.h
+ EventPort.h
+ Macho.h
+ StaticFSM.h
+ InPortSHMConsumer.h
+ InPortSHMProvider.h
+ OutPortSHMConsumer.h
+ OutPortSHMProvider.h
+ SharedMemoryPort.h
${PROJECT_BINARY_DIR}/config_rtc.h
${PROJECT_BINARY_DIR}/version.h
)
+
set(rtm_srcs
ConfigAdmin.cpp
ModuleManager.cpp
@@ -311,6 +321,13 @@
InPortConnector.cpp
OutPortConnector.cpp
NumberingPolicy.cpp
+ FsmActionListener.cpp
+ Macho.cpp
+ InPortSHMConsumer.cpp
+ InPortSHMProvider.cpp
+ OutPortSHMConsumer.cpp
+ OutPortSHMProvider.cpp
+ SharedMemoryPort.cpp
${rtm_headers}
)
@@ -324,19 +341,11 @@
endif(RTP)
endif(VXWORKS)
-set(rtm_headers ${rtm_headers} InPortSHMConsumer.h)
-set(rtm_srcs ${rtm_srcs} InPortSHMConsumer.cpp)
-set(rtm_headers ${rtm_headers} InPortSHMProvider.h)
-set(rtm_srcs ${rtm_srcs} InPortSHMProvider.cpp)
-set(rtm_headers ${rtm_headers} OutPortSHMConsumer.h)
-set(rtm_srcs ${rtm_srcs} OutPortSHMConsumer.cpp)
-set(rtm_headers ${rtm_headers} OutPortSHMProvider.h)
-set(rtm_srcs ${rtm_srcs} OutPortSHMProvider.cpp)
-set(rtm_headers ${rtm_headers} SharedMemoryPort.h)
-set(rtm_srcs ${rtm_srcs} SharedMemoryPort.cpp)
+
+
#message(STATUS ${ALL_IDL_SRCS})
#message(STATUS ${ORB_LIBRARIES})
Modified: trunk/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp 2017-12-11 03:27:45 UTC (rev 3125)
+++ trunk/OpenRTM-aist/src/lib/rtm/CORBA_IORUtil.cpp 2017-12-11 06:13:10 UTC (rev 3126)
@@ -48,7 +48,7 @@
/*!
* @if jp
- * @brief IOR ʸ»úÎó¤òIOR¹½Â¤ÂΤØÊÑ´¹¤¹¤E * @else
+ * @brief IOR ŽÊŽ¸Ž»”І¦ƒªORŽ¹Ž½ŽÂŽ¤ŽÂŽÎŽ¤ŽØŽÊŽÑŽ´Ž¹Ž¤Ž¹Ž¤¡¦ * @else
* @brief Convert from IOR string to IOR structure
* @endif
*/
@@ -115,7 +115,7 @@
/*!
* @if jp
- * @brief IOR¹½Â¤ÂΤòIORʸ»úÎó¤ØÊÑ´¹¤¹¤E * @else
+ * @brief IORŽ¹Ž½ŽÂŽ¤ŽÂŽÎŽ¤ƒªORŽÊŽ¸Ž»”І¦ŽØŽÊŽÑŽ´Ž¹Ž¤Ž¹Ž¤¡¦ * @else
* @brief Convert from IOR structure to IOR string
* @endif
*/
@@ -176,7 +176,7 @@
/*!
* @if jp
- * @brief IORÆâ¤Î¥¨¥ó¥É¥Ý¥¤¥ó¥È¤òÃÖ´¹¤¹¤E * @else
+ * @brief IORŽÆ䦎Ύ¥Ž¨Ž¥†§ŽÉŽ¥ŽÝŽ¥Ž¤Ž¥†§ŽÈŽ¤„ÅŽÖŽ´Ž¹Ž¤Ž¹Ž¤¡¦ * @else
* @brief Replace endpoint address in IOR entry
* @endif
*/
@@ -220,7 +220,7 @@
/*!
* @if jp
- * @brief IORʸ»úÎ󤫤é¾ðÊó¤òÃEФ·¥Õ¥©¡¼¥Þ¥Ã¥ÈºÑ¤ß¤Îʸ»úÎó¤È¤·¤ÆÊÖ¤¹
+ * @brief IORŽÊŽ¸Ž»”І¦Ž«Ž¤òÀ€Ì†¦„Å¡¦ŽÐŽ¤Ž·Ž¥ŽÕŽ¥Ž©Ž¡Ž¼Ž¥ŽÞŽ¥ŽÃŽ¥ŽÈŽºŽÑŽ¤ŽßŽ¤ŽÎŽÊŽ¸Ž»”І¦ŽÈŽ¤Ž·Ž¤ŽÆŽÊŽÖŽ¤Ž¹
* @else
* @brief Extracts information from IOR string and returns formatted string
* @endif
@@ -262,22 +262,24 @@
retstr << std::endl;
}
- {
-
+ else if (ior.profiles[count].tag == IOP::TAG_MULTIPLE_COMPONENTS)
+ {
retstr << "Multiple Component Profile ";
- IIOP::ProfileBody pBody;
- pBody.components);
+ IIOP::ProfileBody pBody;
+ IIOP::unmarshalMultiComponentProfile(ior.profiles[count],
+ pBody.components);
print_tagged_components(retstr, pBody.components);
retstr << std::endl;
-
- else
- retstr << "Unrecognised profile tag: 0x"
- << std::hex
- << (unsigned)(ior.profiles[count].tag)
- << std::dec
- << std::endl;
- }
+ }
+ else
+ {
+ retstr << "Unrecognised profile tag: 0x"
+ << std::hex
+ << (unsigned)(ior.profiles[count].tag)
+ << std::dec
+ << std::endl;
+ }
}
#else // ORB_IS_RTORB
retstr << "RtORB and ORBexpress does't support formatIORinfo() function." << std::endl;
@@ -288,7 +290,7 @@
#if !defined(ORB_IS_RTORB) && !defined(ORB_IS_ORBEXPRESS) && !defined(ORB_IS_TAO)
std::vector<IIOP::Address> getEndpoints(IOP::IOR& ior)
{
- //------------------------------------------------------------
+ std::vector<IIOP::Address> addr;
#ifndef ORB_IS_RTORB
if (ior.profiles.length() == 0 && strlen(ior.type_id) == 0)
{
Modified: trunk/OpenRTM-aist/src/lib/rtm/ConnectorListener.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/ConnectorListener.cpp 2017-12-11 03:27:45 UTC (rev 3125)
+++ trunk/OpenRTM-aist/src/lib/rtm/ConnectorListener.cpp 2017-12-11 06:13:10 UTC (rev 3126)
@@ -111,8 +111,8 @@
}
ConnectorDataListenerHolder::ReturnCode
- ConnectorDataListenerHolder::notify(ConnectorInfo& info,
- cdrMemoryStream& cdrdata)
+ ConnectorDataListenerHolder::notify(const ConnectorInfo& info,
+ const cdrMemoryStream& cdrdata)
{
Guard guard(m_mutex);
ConnectorListenerHolder::ReturnCode ret(NO_CHANGE);
@@ -183,7 +183,7 @@
}
ConnectorListenerHolder::ReturnCode
- ConnectorListenerHolder::notify(ConnectorInfo& info)
+ ConnectorListenerHolder::notify(const ConnectorInfo& info)
{
Guard guard(m_mutex);
ConnectorListenerHolder::ReturnCode ret;
Modified: trunk/OpenRTM-aist/src/lib/rtm/ConnectorListener.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/ConnectorListener.h 2017-12-11 03:27:45 UTC (rev 3125)
+++ trunk/OpenRTM-aist/src/lib/rtm/ConnectorListener.h 2017-12-11 06:13:10 UTC (rev 3126)
@@ -33,12 +33,16 @@
/*!
* @if jp
* @class ConnectorListenerStatus mixin class
- * @brief ConnectorListenerStatus mixin ¥¯¥é¥¹
+ * @brief ConnectorListenerStatus mixin ƒNƒ‰ƒX
*
- * ¤³¤Î¥¯¥é¥¹¤Ï¡¢enumÄEÁ¤µ¤E¿¥E¿¡¼¥ó¥³¡¼¥É¤ò¡¢ConnectorListener´Ø
- * Ï¢¤Î¥µ¥Ö¥¯¥é¥¹¤Ç¶¦ÄÌÍøÍѤ¹¤E¿¤á¤Î mixin ¥¯¥é¥¹¤Ç¤¢¤E£¤³¤Î¥E¿¡¼
- * ¥ó¥³¡¼¥É¤ò»ÈÍѤ¹¤E¯¥é¥¹¤Ç¤Ï¡¢ConnectorListenerStatus ¥¯¥é¥¹¤E * public ·Ñ¾µ¤·¡¢²¼¤Ëdefine ¤·¤Æ¤¢¤ECONNLISTENER_STATUS_ENUM ¤ò¥¯¥E * ¥¹Æâ¤Ëµ½Ò¤¹¤E³¤È¤ÇÍøÍѲÄǽ¤È¤Ê¤E£¤³¤Eˤè¤ê¡¢enum ¤E * ReturnCode ·¿¤È¤·¤Æ typedef ¤·¡¢°Ê¸EReturnCode ¤òÍøÍѤǤ¤E褦¤Ë
- * ¤¹¤EȤȤâ¤Ë¡¢Ì¾Á°¶õ´Ö¤Ë enum ÄEÁ¤µ¤E¿³Æ¼±Ê̻ҤòÅö³º¥¯¥é¥¹Ì¾Á°¶E * ´ÖÆâ¤ËƳÆþ¤¹¤E£
+ * ‚±‚̃Nƒ‰ƒX‚ÍAenum’è‹`‚³‚ꂽƒŠƒ^[ƒ“ƒR[ƒh‚ðAConnectorListenerŠÖ
+ * ˜A‚̃TƒuƒNƒ‰ƒX‚Å‹¤’Ê—˜—p‚·‚邽‚ß‚Ì mixin ƒNƒ‰ƒX‚Å‚ ‚éB‚±‚̃Šƒ^[
+ * ƒ“ƒR[ƒh‚ðŽg—p‚·‚éƒNƒ‰ƒX‚Å‚ÍAConnectorListenerStatus ƒNƒ‰ƒX‚ð
+ * public Œp³‚µA‰º‚Édefine ‚µ‚Ä‚ ‚é CONNLISTENER_STATUS_ENUM ‚ðƒNƒ‰
+ * ƒX“à‚É‹Lq‚·‚邱‚Æ‚Å—˜—p‰Â”\‚Æ‚È‚éB‚±‚ê‚É‚æ‚èAenum ‚ð
+ * ReturnCode Œ^‚Æ‚µ‚Ä typedef ‚µAˆÈŒã ReturnCode ‚ð—˜—p‚Å‚«‚é‚悤‚É
+ * ‚·‚é‚Æ‚Æ‚à‚ÉA–¼‘O‹óŠÔ‚É enum ’è‹`‚³‚ꂽŠeŽ¯•ÊŽq‚ð“–ŠYƒNƒ‰ƒX–¼‘O‹ó
+ * ŠÔ“à‚É“±“ü‚·‚éB
*
* @else
* @class DataPortStatus mixin class
@@ -73,13 +77,14 @@
/*!
* @if jp
*
-
- /*!
- * @if jp
- * ¤¤¤Æ¡¢¥¯¥é¥¹ÀEÀ¤ÎÀèƬ¤Ë¤ª¤¤¤Æ DATAPORTSTATUS_ENUM ¤òµºÜ¤¹¤EÀ¤±¤Ç¡¢
- * DataPortStatus ¤ÇÀEÀ¤µ¤EƤ¤¤Eenum ¥á¥ó¥Ð¤¬Ì¾Á°²ò·è±é»»»Ò¤Ê¤·¤Ë¥¢
- * ¥¯¥»¥¹²Äǽ¤Ë¤Ê¤E£
+ * @brief ::RTC::ConnDataPortStatus ұҟ
*
+ * ::RTC::DataPortStatus ‚Å錾‚³‚ê‚Ä‚¢‚é Enum ‚Ì‚·‚ׂẴƒ“ƒo‚ðƒl[ƒ€
+ * ƒXƒy[ƒX‚É“±“ü‚·‚邽‚߂̃}ƒNƒBDataPortStatus ‚ð—˜—p‚·‚éƒNƒ‰ƒX‚É‚¨
+ * ‚¢‚ÄAƒNƒ‰ƒX錾‚Ì擪‚É‚¨‚¢‚Ä DATAPORTSTATUS_ENUM ‚ð‹LÚ‚·‚邾‚¯‚ÅA
+ * DataPortStatus ‚Å錾‚³‚ê‚Ä‚¢‚é enum ƒƒ“ƒo‚ª–¼‘O‰ðŒˆ‰‰ŽZŽq‚È‚µ‚ɃA
+ * ƒNƒZƒX‰Â”\‚É‚È‚éB
+ *
* @else
*
* @brief Importing ::RTC::DataPortStatus macro
@@ -101,24 +106,19 @@
/*!
* @if jp
- * @brief ConnectorDataListener ¤Î¥¿¥¤¥×
+ * @brief ConnectorDataListener ‚̃^ƒCƒv
*
- * - ON_BUFFER_WRITE: ¥Ð¥Ã¥Õ¥¡½ñ¤¹þ¤ß»þ
- * - ON_BUFFER_FULL: ¥Ð¥Ã¥Õ¥¡¥Õ¥Eþ
- * - ON_BUFFER_WRITE_TIMEOUT: ¥Ð¥Ã¥Õ¥¡½ñ¤¹þ¤ß¥¿¥¤¥à¥¢¥¦¥È»þ
- * @brief ConnectorDataListener ¤Î¥¿¥¤¥×
+ * - ON_BUFFER_WRITE: ƒoƒbƒtƒ@‘‚«ž‚ÝŽž
+ * - ON_BUFFER_FULL: ƒoƒbƒtƒ@ƒtƒ‹Žž
+ * - ON_BUFFER_WRITE_TIMEOUT: ƒoƒbƒtƒ@‘‚«ž‚݃^ƒCƒ€ƒAƒEƒgŽž
+ * - ON_BUFFER_OVERWRITE: ƒoƒbƒtƒ@ã‘‚«Žž
+ * - ON_BUFFER_READ: ƒoƒbƒtƒ@“Ç‚Ýo‚µŽž
+ * - ON_SEND: InProt‚Ö‚Ì‘—MŽž
+ * - ON_RECEIVED: InProt‚Ö‚Ì‘—MŠ®—¹Žž
+ * - ON_RECEIVER_FULL: InProt‘¤ƒoƒbƒtƒ@ƒtƒ‹Žž
+ * - ON_RECEIVER_TIMEOUT: InProt‘¤ƒoƒbƒtƒ@ƒ^ƒCƒ€ƒAƒEƒgŽž
+ * - ON_RECEIVER_ERROR: InProt‘¤ƒGƒ‰[Žž
*
- * - ON_BUFFER_WRITE: ¥Ð¥Ã¥Õ¥¡½ñ¤¹þ¤ß»þ
- * - ON_BUFFER_FULL: ¥Ð¥Ã¥Õ¥¡¥Õ¥Eþ
- * - ON_BUFFER_WRITE_TIMEOUT: ¥Ð¥Ã¥Õ¥¡½ñ¤¹þ¤ß¥¿¥¤¥à¥¢¥¦¥È»þ
- * - ON_BUFFER_OVERWRITE: ¥Ð¥Ã¥Õ¥¡¾å½ñ¤»þ
- * - ON_BUFFER_READ: ¥Ð¥Ã¥Õ¥¡Æɤ߽Ф·»þ
- * - ON_SEND: InProt¤Ø¤ÎÁ÷¿®»þ
- * - ON_RECEIVED: InProt¤Ø¤ÎÁ÷¿®´°Î»»þ
- * - ON_RECEIVER_FULL: InProt¦¥Ð¥Ã¥Õ¥¡¥Õ¥Eþ
- * - ON_RECEIVER_TIMEOUT: InProt¦¥Ð¥Ã¥Õ¥¡¥¿¥¤¥à¥¢¥¦¥È»þ
- * - ON_RECEIVER_ERROR: InProt¦¥¨¥é¡¼»þ
- *
* @else
* @brief The types of ConnectorDataListener
* - ON_BUFFER_READ: At the time of buffer read
@@ -137,6 +137,11 @@
*/
enum ConnectorDataListenerType
{
+ ON_BUFFER_WRITE = 0,
+ ON_BUFFER_FULL,
+ ON_BUFFER_WRITE_TIMEOUT,
+ ON_BUFFER_OVERWRITE,
+ ON_BUFFER_READ,
ON_SEND,
ON_RECEIVED,
ON_RECEIVER_FULL,
@@ -143,30 +148,34 @@
ON_RECEIVER_TIMEOUT,
ON_RECEIVER_ERROR,
CONNECTOR_DATA_LISTENER_NUM
- ON_RECEIVED,
-
- /*!
- ON_RECEIVER_ERROR,
- CONNECTOR_DATA_LISTENER_NUM
};
/*!
* @if jp
- * @class ConnectorDataListener ¥¯¥é¥¹
- * @brief ConnectorDataListener ¥¯¥é¥¹
+ * @class ConnectorDataListener ƒNƒ‰ƒX
+ * @brief ConnectorDataListener ƒNƒ‰ƒX
*
- * ¥Ç¡¼¥¿¥Ý¡¼¥È¤Î Connector ¤Ë¤ª¤¤¤ÆȯÀ¸¤¹¤EƼE¤¥Ù¥ó¥È¤ËÂФ¹¤E³¡¼
- * ¥EХ寤ò¼Â¸½¤¹¤EE¹¥Ê¥¯¥é¥¹¤Î´ðÄE¯¥é¥¹¡£
+ * ƒf[ƒ^ƒ|[ƒg‚Ì Connector ‚É‚¨‚¢‚Ä”¶‚·‚éŠeŽíƒCƒxƒ“ƒg‚ɑ΂·‚éƒR[
+ * ƒ‹ƒoƒbƒN‚ðŽÀŒ»‚·‚郊ƒXƒiƒNƒ‰ƒX‚ÌŠî’êƒNƒ‰ƒXB
*
- * ¥³¥¢¥úÁ¸¥Ã¥¯¤¬OutPort¤ËÂФ·¤Æ¥Ç¡¼¥¿½ñ¤¹þ¤ß¡¢InPort¦¤Ç¥Ç¡¼¥¿¤¬¼E * ÆÀ¤µ¤EEޤǤδ֤ÇȯÀ¸¤¹¤EƼE¤¥Ù¥ó¥È¤ò¥Õ¥Ã¥¯¤¹¤E³¡¼¥EХ寤òÀß
- * Äꤹ¤E³¤È¤¬¤Ç¤¤E£¤Ê¤ª¡¢¥E¹¥Ê¡¼¥¯¥é¥¹¤Ï2¼Eฺߤ·¡¢¥Ð¥Ã¥Õ¥¡¥Õ
- * ¥EäÁ÷¿®»þ¤Î¥³¡¼¥EХ寤ǡ¢¤½¤Î»þÅÀ¤Ç͸ú¤Ê¥Ç¡¼¥¿¤ò¥Õ¥¡¥ó¥¯¥¿¤Î°E * ¿ô¤È¤·¤Æ¼õ¤±¼è¤EConnectorDataListener ¤Ç¤¢¤ê¡¢¤â¤¦°Eý¤Ï¥Ç¡¼¥¿¥¨
- * ¥ó¥×¥Æ¥£¤ä¥Ð¥Ã¥Õ¥¡Æɤ߹þ¤ß»þ¤Î¥¿¥¤¥à¥¢¥¦¥È¤Ê¤É¥Ç¡¼¥¿¤¬¼èÆÀ¤Ç¤¤Ê¤¤
- * ¾Eç¤Ê¤É¤Ë¥³¡¼¥Eµ¤EEÕ¥¡¥ó¥¯¥¿¤Î°ú¿ô¤Ë²¿¤â¤È¤é¤Ê¤é¤¤
- * ConnecotorListener ¤¬¤¢¤E£
+ * ƒRƒAƒƒWƒbƒN‚ªOutPort‚ɑ΂µ‚ăf[ƒ^‘‚«ž‚ÝAInPort‘¤‚Ńf[ƒ^‚ªŽæ
+ * “¾‚³‚ê‚é‚Ü‚Å‚ÌŠÔ‚Å”¶‚·‚éŠeŽíƒCƒxƒ“ƒg‚ðƒtƒbƒN‚·‚éƒR[ƒ‹ƒoƒbƒN‚ðÝ
+ * ’è‚·‚邱‚Æ‚ª‚Å‚«‚éB‚È‚¨AƒŠƒXƒi[ƒNƒ‰ƒX‚Í2Ží—Þ‘¶Ý‚µAƒoƒbƒtƒ@ƒt
+ * ƒ‹‚â‘—MŽž‚̃R[ƒ‹ƒoƒbƒN‚ÅA‚»‚ÌŽž“_‚Å—LŒø‚ȃf[ƒ^‚ðƒtƒ@ƒ“ƒNƒ^‚̈ø
+ * ”‚Æ‚µ‚Ď󂯎æ‚é ConnectorDataListener ‚Å‚ ‚èA‚à‚¤ˆê•û‚̓f[ƒ^ƒG
+ * ƒ“ƒvƒeƒB‚âƒoƒbƒtƒ@“Ç‚Ýž‚ÝŽž‚̃^ƒCƒ€ƒAƒEƒg‚Ȃǃf[ƒ^‚ªŽæ“¾‚Å‚«‚È‚¢
+ * ꇂȂǂɃR[ƒ‹‚³‚ê‚éƒtƒ@ƒ“ƒNƒ^‚̈ø”‚ɉ½‚à‚Æ‚ç‚È‚ç‚¢
+ * ConnecotorListener ‚ª‚ ‚éB
*
- * ¥Ç¡¼¥¿¥Ý¡¼¥È¤Ë¤Ï¡¢Àܳ»þ¤Ë¥Ç¡¼¥¿¤ÎÁ÷¼õ¿®ÊýË¡¤Ë¤Ä¤¤¤Æ¥Ç¡¼¥¿¥Õ¥ú½¼·¿¡¢
- * ¥µ¥Ö¥¹¥¯¥E×¥·¥ç¥ó·¿Åù¤òÀßÄꤹ¤E³¤È¤¬¤Ç¤¤E£
+ * ConnectorDataListener ƒNƒ‰ƒX‚É‚æ‚Á‚ăf[ƒ^‚ªŠÖ˜A‚·‚é“®ì‚ðƒtƒbƒN‚µ
+ * ‚½‚¢ê‡AˆÈ‰º‚Ì—á‚̂悤‚ÉA‚±‚̃Nƒ‰ƒX‚ðŒp³‚µAƒRƒlƒNƒ^‚Ìî•ñ‚ƃf[
+ * ƒ^‚ðˆø”‚ÉŽæ‚éˆÈ‰º‚̂悤‚ȃR[ƒ‹ƒoƒbƒNƒIƒuƒWƒFƒNƒg‚ð’è‹`‚µAƒf[ƒ^
+ * ƒ|[ƒg‚Ì“K؂ȃR[ƒ‹ƒoƒbƒNÝ’èŠÖ”‚©‚çƒR[ƒ‹ƒoƒbƒNƒIƒuƒWƒFƒNƒg‚ðƒZƒb
+ * ƒg‚·‚é•K—v‚ª‚ ‚éB‚È‚¨AData Listener ‚É‚ÍAƒf[ƒ^‚Æ‚µ‚ă}[ƒVƒƒƒŠ
+ * ƒ“ƒOŒã‚̃f[ƒ^‚ðˆø”‚ÉŽæ‚é ConnectorDataListener ‚ÆAƒf[ƒ^‚ð“Á’è
+ * ‚ÌŒ^‚ɃAƒ“ƒ}[ƒVƒƒƒ‹‚µ‚½Œã‚Ì’l‚ðˆø”‚ÉŽæ‚éA
+ * ConnectorDataListenerT ‚ª‚ ‚éBˆÈ‰º‚Ì—á‚ÍAConnectorDataListenerT
+ * ‚Ì’è‹`—á‚Å‚ ‚éB
*
* <pre>
* class MyDataListener
@@ -176,7 +185,7 @@
* MyDataListener(const char* name) : m_name(name) {}
* virtual ~MyDataListener() {}
* virtual ReturnCode operator()(ConnectorInfo& info, TimedLong& data)
- * - Push·¿: Subscription Type¤Ë¤è¤ê¤µ¤é¤Ë¥¤¥Ù¥ó¥È¤Î¼Eबʬ¤«¤EE£
+ * {
* std::cout << "Data Listener: " << m_name << std::endl;
* std::cout << "Data: " << data.data << std::endl;
* std::cout << "Profile::name: " << info.name << std::endl;
@@ -188,8 +197,8 @@
* };
* </pre>
*
- * ¤³¤Î¤è¤¦¤Ë¤·¤ÆÄEÁ¤µ¤E¿¥E¹¥Ê¥¯¥é¥¹¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ë¥Ç¡¼¥¿¥Ý¡¼¥È¤Ë
- * ÂФ·¤Æ¡¢°Ê²¼¤Î¤è¤¦¤Ë¥»¥Ã¥È¤µ¤EE£
+ * ‚±‚̂悤‚É‚µ‚Ä’è‹`‚³‚ꂽƒŠƒXƒiƒNƒ‰ƒX‚ÍAˆÈ‰º‚̂悤‚Ƀf[ƒ^ƒ|[ƒg‚É
+ * ‘΂µ‚ÄAˆÈ‰º‚̂悤‚ɃZƒbƒg‚³‚ê‚éB
*
* <pre>
* RTC::ReturnCode_t ConsoleIn::onInitialize()
@@ -200,16 +209,16 @@
* :
* </pre>
*
- * ÂE°ú¿ô¤Î "ON_BUFFER_WRITE" ¤Ï¡¢¥³¡¼¥EХ寤ò¥Õ¥Ã¥¯¤¹¤EÝ¥¤¥ó¥È¤Ç
- * ¤¢¤ê¡¢°Ê²¼¤ËÎóµó¤¹¤Eͤò¼è¤E³¤È¤¬²Äǽ¤Ç¤¢¤E£¥Ç¡¼¥¿¥Ý¡¼¥È¤Ë¤Ï¡¢ÀÜ
- * ³»þ¤Ë¥Ç¡¼¥¿¤ÎÁ÷¼õ¿®ÊýË¡¤Ë¤Ä¤¤¤Æ¡¢¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹·¿¡¢¥Ç¡¼¥¿¥Õ¥ú½¼
- * ·¿¡¢¥µ¥Ö¥¹¥¯¥E×¥·¥ç¥ó·¿Åù¤òÀßÄꤹ¤E³¤È¤¬¤Ç¤¤E¬¡¢¤³¤Eé¤ÎÀßÄê¤Ë
- * ¤è¤Eե寤µ¤EEÝ¥¤¥ó¥È¤Ï°Û¤Ê¤E£°Ê²¼¤Ë¡¢¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¤¬CORBA
- * CDR·¿¤Î¾Eç¤Î¥³¡¼¥EХ寰E÷¤ò¼¨¤¹¡£
+ * ‘æ1ˆø”‚Ì "ON_BUFFER_WRITE" ‚ÍAƒR[ƒ‹ƒoƒbƒN‚ðƒtƒbƒN‚·‚éƒ|ƒCƒ“ƒg‚Å
+ * ‚ ‚èAˆÈ‰º‚É—ñ‹“‚·‚é’l‚ðŽæ‚邱‚Æ‚ª‰Â”\‚Å‚ ‚éBƒf[ƒ^ƒ|[ƒg‚É‚ÍAÚ
+ * ‘±Žž‚Ƀf[ƒ^‚Ì‘—ŽóM•û–@‚ɂ‚¢‚ÄAƒCƒ“ƒ^[ƒtƒF[ƒXŒ^Aƒf[ƒ^ƒtƒ[
+ * Œ^AƒTƒuƒXƒNƒŠƒvƒVƒ‡ƒ“Œ^“™‚ðÝ’è‚·‚邱‚Æ‚ª‚Å‚«‚邪A‚±‚ê‚ç‚ÌÝ’è‚É
+ * ‚æ‚èƒtƒbƒN‚³‚ê‚éƒ|ƒCƒ“ƒg‚͈قȂéBˆÈ‰º‚ÉAƒCƒ“ƒ^[ƒtƒF[ƒX‚ªCORBA
+ * CDRŒ^‚Ìꇂ̃R[ƒ‹ƒoƒbƒNˆê——‚ðŽ¦‚·B
*
* OutPort:
- * - Push·¿: Subscription Type¤Ë¤è¤ê¤µ¤é¤Ë¥¤¥Ù¥ó¥È¤Î¼Eबʬ¤«¤EE£
- * - Flush: Flush·¿¤Ë¤Ï¥Ð¥Ã¥Õ¥¡¤¬¤Ê¤¤¤¿¤EON_BUFFER ·Ï¤Î¥¤¥Ù¥ó¥È¤ÏȯÀ¸¤·¤Ê¤¤
+ * - PushŒ^: Subscription Type‚É‚æ‚肳‚ç‚ɃCƒxƒ“ƒg‚ÌŽí—Þ‚ª•ª‚©‚ê‚éB
+ * - Flush: FlushŒ^‚ɂ̓oƒbƒtƒ@‚ª‚È‚¢‚½‚ß ON_BUFFER Œn‚̃Cƒxƒ“ƒg‚Í”¶‚µ‚È‚¢
* - ON_SEND
* - ON_RECEIVED
* - ON_RECEIVER_FULL
@@ -216,14 +225,7 @@
* - ON_RECEIVER_TIMEOUT
* - ON_RECEIVER_ERROR
* .
- * - Flush: Flush·¿¤Ë¤Ï¥Ð¥Ã¥Õ¥¡¤¬¤Ê¤¤¤¿¤EON_BUFFER ·Ï¤Î¥¤¥Ù¥ó¥È¤ÏȯÀ¸¤·¤Ê¤¤
- * - ON_SEND
- * - ON_RECEIVED
- * - ON_RECEIVER_FULL
- * - ON_RECEIVER_TIMEOUT
- * - ON_RECEIVER_ERROR
- * - ON_CONNECT
- * - ON_DISCONNECT
+ * - NewŒ^
* - ON_BUFFER_WRITE
* - ON_BUFFER_FULL
* - ON_BUFFER_WRITE_TIMEOUT
@@ -234,8 +236,8 @@
* - ON_RECEIVER_FULL
* - ON_RECEIVER_TIMEOUT
* - ON_RECEIVER_ERROR
- * - ON_SENDER_ERROR
- * - ON_CONNECT
+ * .
+ * - PeriodicŒ^
* - ON_BUFFER_WRITE
* - ON_BUFFER_FULL
* - ON_BUFFER_WRITE_TIMEOUT
@@ -245,42 +247,49 @@
* - ON_RECEIVER_FULL
* - ON_RECEIVER_TIMEOUT
* - ON_RECEIVER_ERROR
- * - ON_BUFFER_EMPTY
- * - ON_SENDER_EMPTY
- * - Pull·¿
+ * .
+ * .
+ * - PullŒ^
+ * - ON_BUFFER_WRITE
+ * - ON_BUFFER_FULL
+ * - ON_BUFFER_WRITE_TIMEOUT
+ * - ON_BUFFER_OVERWRITE
* - ON_BUFFER_READ
* - ON_SEND
+ * .
+ * InPort:
+ * - PushŒ^:
* - ON_BUFFER_WRITE
* - ON_BUFFER_FULL
* - ON_BUFFER_WRITE_TIMEOUT
* - ON_BUFFER_WRITE_OVERWRITE
- * - ON_BUFFER_EMPTY
- * - ON_BUFFER_READ_TIMEOUT
+ * - ON_BUFFER_READ
+ * - ON_BUFFER_READ_TIMEOUT
* - ON_RECEIVED
- * - ON_BUFFER_WRITE
- * - ON_BUFFER_FULL
- * - ON_BUFFER_WRITE_TIMEOUT
- * - ON_BUFFER_WRITE_OVERWRITE
- * - ON_RECEIVED
* - ON_RECEIVER_FULL
- *
- * @else
* - ON_RECEIVER_TIMEOUT
* - ON_RECEIVER_ERROR
- * - ON_CONNECT
- * - ON_DISCONNECT
- * - ON_CONNECT
- * - ON_DISCONNECT
+ * .
+ * - PullŒ^
+ * - ON_BUFFER_READ
*
+ * @else
* @class ConnectorDataListener class
* @brief ConnectorDataListener class
*
* This class is abstract base class for listener classes that
- * provides callbacks for various events in the data port's
+ * realize callbacks for various events in the data port's
* connectors.
+ *
+ * Callbacks can be hooked to the various kind of events which occur
+ * throgh OutPort side data write action to InPort side data-read
+ * action. Two types listener classes exist. One is
+ * ConnectorDataListener which receives valid data-port's data value
+ * at that time such as buffer-full event, data-send event, and so
+ * on. Other is ConnectorListener which does not receive any data
* such as buffer-empty event, buffer-read-timeout event and so on.
- * @endif
- */
+ *
+ * If you want to hook actions which related data-port's data by
* ConnectorDataListener, a class which inherits this class should
* be defined, and the functor should receive a connector
* information and a data value as arguments. And then, the defined
@@ -396,21 +405,15 @@
USE_CONNLISTENER_STATUS;
/*!
* @if jp
- class ConnectorDataListener
- {
- public:
- * ConnectorDataListenerType ¤òʸ»úÎó¤ËÊÑ´¹¤¹¤E *
- /*!
- * @if jp
- * @return ʸ»úÎóÊÑ´¹·EÌ
*
- * @brief ConnectorDataListenerType ¤òʸ»úÎó¤ËÊÑ´¹
+ * @brief ConnectorDataListenerType ‚𕶎š—ñ‚É•ÏŠ·
*
- * ConnectorDataListenerType ¤òʸ»úÎó¤ËÊÑ´¹¤¹¤E *
- * @param type ÊÑ´¹ÂÐ¾Ý ConnectorDataListenerType
+ * ConnectorDataListenerType ‚𕶎š—ñ‚É•ÏŠ·‚·‚é
*
- * @return ʸ»úÎóÊÑ´¹·EÌ
+ * @param type •ÏŠ·‘ÎÛ ConnectorDataListenerType
*
+ * @return •¶Žš—ñ•ÏŠ·Œ‹‰Ê
+ *
* @else
*
* @brief Convert ConnectorDataListenerType into the string.
@@ -445,7 +448,7 @@
/*!
* @if jp
- * @brief ¥Ç¥¹¥È¥é¥¯¥¿
+ * @brief ƒfƒXƒgƒ‰ƒNƒ^
* @else
* @brief Destructor
* @endif
@@ -455,10 +458,10 @@
/*!
* @if jp
*
- * @brief ²¾ÁÛ¥³¡¼¥EХ寥᥽¥Ã¥É
+ * @brief ‰¼‘zƒR[ƒ‹ƒoƒbƒNƒƒ\ƒbƒh
*
- * ¥Ç¡¼¥¿¥Ý¡¼¥È¤Î Connector ¤Ë¤ª¤¤¤ÆȯÀ¸¤¹¤EƼE¤¥Ù¥ó¥È¤ËÂФ¹¤E³¡¼
- * ¥EХ寥᥽¥Ã¥É
+ * ƒf[ƒ^ƒ|[ƒg‚Ì Connector ‚É‚¨‚¢‚Ä”¶‚·‚éŠeŽíƒCƒxƒ“ƒg‚ɑ΂·‚éƒR[
+ * ƒ‹ƒoƒbƒNƒƒ\ƒbƒh
*
* @else
*
@@ -468,22 +471,21 @@
*
* @endif
*/
- virtual void operator()(const ConnectorInfo& info,
+ virtual ReturnCode operator()(const ConnectorInfo& info,
const cdrMemoryStream& data) = 0;
- * ¥EХ寤ò¼Â¸½¤¹¤EE¹¥Ê¥¯¥é¥¹¤Î´ðÄE¯¥é¥¹¡£
- *
+ };
/*!
* @if jp
- * @class ConnectorDataListenerT ¥¯¥é¥¹
- * @brief ConnectorDataListenerT ¥¯¥é¥¹
+ * @class ConnectorDataListenerT ƒNƒ‰ƒX
+ * @brief ConnectorDataListenerT ƒNƒ‰ƒX
*
- * ¥Ç¡¼¥¿¥Ý¡¼¥È¤Î Connector ¤Ë¤ª¤¤¤ÆȯÀ¸¤¹¤EƼE¤¥Ù¥ó¥È¤ËÂФ¹¤E³¡¼
- * ¥EХ寤ò¼Â¸½¤¹¤EE¹¥Ê¥¯¥é¥¹¤Î´ðÄE¯¥é¥¹¡£
+ * ƒf[ƒ^ƒ|[ƒg‚Ì Connector ‚É‚¨‚¢‚Ä”¶‚·‚éŠeŽíƒCƒxƒ“ƒg‚ɑ΂·‚éƒR[
+ * ƒ‹ƒoƒbƒN‚ðŽÀŒ»‚·‚郊ƒXƒiƒNƒ‰ƒX‚ÌŠî’êƒNƒ‰ƒXB
*
- * ¤³¤Î¥¯¥é¥¹¤Ï¡¢operator()() ¤ÎÂE°ú¿ô¤Ë cdrMemoryStream ·¿¤Ç¤Ï¤Ê¤¯¡¢
- * ¼ÂºÝ¤Ë¥Ç¡¼¥¿¥Ý¡¼¥È¤Ç»ÈÍѤµ¤EEÑ¿ô·¿¤ò¥Æ¥ó¥×¥E¼¥È°ú¿ô¤È¤·¤Æ
- * ÅϤ¹¤³¤È¤¬¤Ç¤¤E£
+ * ‚±‚̃Nƒ‰ƒX‚ÍAoperator()() ‚Ì‘æ2ˆø”‚É cdrMemoryStream Œ^‚Å‚Í‚È‚A
+ * ŽÀۂɃf[ƒ^ƒ|[ƒg‚ÅŽg—p‚³‚ê‚é•Ï”Œ^‚ðƒeƒ“ƒvƒŒ[ƒgˆø”‚Æ‚µ‚Ä
+ * “n‚·‚±‚Æ‚ª‚Å‚«‚éB
*
* @else
* @class ConnectorDataListenerT class
@@ -498,7 +500,7 @@
* of cdrMemoryStream.
*
* @endif
- */
+ */
template <class DataType>
class ConnectorDataListenerT
: public ConnectorDataListener
@@ -506,7 +508,7 @@
public:
/*!
* @if jp
- * @brief ¥Ç¥¹¥È¥é¥¯¥¿
+ * @brief ƒfƒXƒgƒ‰ƒNƒ^
* @else
* @brief Destructor
* @endif
@@ -516,13 +518,13 @@
/*!
* @if jp
*
- * @brief ¥³¡¼¥EХ寥᥽¥Ã¥É
+ * @brief ƒR[ƒ‹ƒoƒbƒNƒƒ\ƒbƒh
*
- * ¥Ç¡¼¥¿¤ò¥Ç¡¼¥¿¥Ý¡¼¥È¤Ç»ÈÍѤµ¤EEÑ¿ô·¿¤ËÊÑ´¹¤·¤Æ ConnectorDataListenerT
- * ¤Î¥³¡¼¥EХ寥᥽¥Ã¥É¤ò¸Æ¤Ó½Ð¤¹¡£
+ * ƒf[ƒ^‚ðƒf[ƒ^ƒ|[ƒg‚ÅŽg—p‚³‚ê‚é•Ï”Œ^‚É•ÏŠ·‚µ‚Ä ConnectorDataListenerT
+ * ‚̃R[ƒ‹ƒoƒbƒNƒƒ\ƒbƒh‚ðŒÄ‚Ño‚·B
*
* @param info ConnectorInfo
- * @param cdrdata cdrMemoryStream·¿¤Î¥Ç¡¼¥¿
+ * @param cdrdata cdrMemoryStreamŒ^‚̃f[ƒ^
*
* @else
*
@@ -536,8 +538,8 @@
*
* @endif
*/
- virtual void operator()(const ConnectorInfo& info,
- const cdrMemoryStream& cdrdata)
+ virtual ReturnCode operator()(const ConnectorInfo& info,
+ const cdrMemoryStream& cdrdata)
{
DataType data;
#ifdef ORB_IS_ORBEXPRESS
@@ -578,21 +580,22 @@
}
data <<= cdr;
#endif
-
-
-
-
-
- this->operator()(info, data);
+ ReturnCode ret = this->operator()(info, data);
+ if (ret == DATA_CHANGED || ret == BOTH_CHANGED)
+ {
+ cdrdata.rewindPtrs();
+ data >>= cdrdata;
+ }
+ return ret;
}
/*!
* @if jp
*
- * @brief ²¾ÁÛ¥³¡¼¥EХ寥᥽¥Ã¥É
+ * @brief ‰¼‘zƒR[ƒ‹ƒoƒbƒNƒƒ\ƒbƒh
*
- * ¥Ç¡¼¥¿¥Ý¡¼¥È¤Î Connector ¤Ë¤ª¤¤¤ÆȯÀ¸¤¹¤EƼE¤¥Ù¥ó¥È¤ËÂФ¹¤E³¡¼
- * ¥EХ寥᥽¥Ã¥É
+ * ƒf[ƒ^ƒ|[ƒg‚Ì Connector ‚É‚¨‚¢‚Ä”¶‚·‚éŠeŽíƒCƒxƒ“ƒg‚ɑ΂·‚éƒR[
+ * ƒ‹ƒoƒbƒNƒƒ\ƒbƒh
*
* @else
*
@@ -603,19 +606,21 @@
*
* @endif
*/
- virtual void operator()(const ConnectorInfo& info,
- const DataType& data) = 0;
+ virtual ReturnCode operator()(const ConnectorInfo& info,
+ const DataType& data) = 0;
+ };
- * - ON_SENDER_ERROR: OutPort¦¥¨¥é¡¼»þ
- * - ON_CONNECT: Àܳ³ÎΩ»þ
/*!
* @if jp
- * @brief ConnectorListener ¤Î¥¿¥¤¥×
+ * @brief ConnectorListener ‚̃^ƒCƒv
*
- * - ON_BUFFER_EMPTY: ¥Ð¥Ã¥Õ¥¡¤¬¶õ¤Î¾EE * - ON_BUFFER_READTIMEOUT: ¥Ð¥Ã¥Õ¥¡¤¬¶õ¤Ç¥¿¥¤¥à¥¢¥¦¥È¤·¤¿¾EE * - ON_SENDER_EMPTY: OutPort¦¥Ð¥Ã¥Õ¥¡¤¬¶E * - ON_SENDER_TIMEOUT: OutPort¦¥¿¥¤¥à¥¢¥¦¥È»þ
- * - ON_SENDER_ERROR: OutPort¦¥¨¥é¡¼»þ
- * - ON_CONNECT: Àܳ³ÎΩ»þ
- * - ON_DISCONNECT: ÀܳÀÚÃÇ»þ
+ * - ON_BUFFER_EMPTY: ƒoƒbƒtƒ@‚ª‹ó‚Ìê‡
+ * - ON_BUFFER_READTIMEOUT: ƒoƒbƒtƒ@‚ª‹ó‚Ń^ƒCƒ€ƒAƒEƒg‚µ‚½ê‡
+ * - ON_SENDER_EMPTY: OutPort‘¤ƒoƒbƒtƒ@‚ª‹ó
+ * - ON_SENDER_TIMEOUT: OutPort‘¤ƒ^ƒCƒ€ƒAƒEƒgŽž
+ * - ON_SENDER_ERROR: OutPort‘¤ƒGƒ‰[Žž
+ * - ON_CONNECT: Ú‘±Šm—§Žž
+ * - ON_DISCONNECT: Ú‘±Ø’fŽž
*
* @else
* @brief The types of ConnectorListener
@@ -640,42 +645,51 @@
ON_CONNECT,
ON_DISCONNECT,
CONNECTOR_LISTENER_NUM
- * ¥Ç¡¼¥¿¥Ý¡¼¥È¤Î Connector ¤Ë¤ª¤¤¤ÆȯÀ¸¤¹¤EƼE¤¥Ù¥ó¥È¤ËÂФ¹¤E³¡¼
- * ¥EХ寤ò¼Â¸½¤¹¤EE¹¥Ê¥¯¥é¥¹¤Î´ðÄE¯¥é¥¹¡£
- *
+ };
+
+ /*!
* @if jp
- * @class ConnectorListener ¥¯¥é¥¹
- * @brief ConnectorListener ¥¯¥é¥¹
+ * @class ConnectorListener ƒNƒ‰ƒX
+ * @brief ConnectorListener ƒNƒ‰ƒX
*
- * ¥Ç¡¼¥¿¥Ý¡¼¥È¤Î Connector ¤Ë¤ª¤¤¤ÆȯÀ¸¤¹¤EƼE¤¥Ù¥ó¥È¤ËÂФ¹¤E³¡¼
- * ¥EХ寤ò¼Â¸½¤¹¤EE¹¥Ê¥¯¥é¥¹¤Î´ðÄE¯¥é¥¹¡£
+ * ƒf[ƒ^ƒ|[ƒg‚Ì Connector ‚É‚¨‚¢‚Ä”¶‚·‚éŠeŽíƒCƒxƒ“ƒg‚ɑ΂·‚éƒR[
+ * ƒ‹ƒoƒbƒN‚ðŽÀŒ»‚·‚郊ƒXƒiƒNƒ‰ƒX‚ÌŠî’êƒNƒ‰ƒXB
*
- * ¥³¥¢¥úÁ¸¥Ã¥¯¤¬OutPort¤ËÂФ·¤Æ¥Ç¡¼¥¿½ñ¤¹þ¤ß¡¢InPort¦¤Ç¥Ç¡¼¥¿¤¬¼E * ÆÀ¤µ¤EEޤǤδ֤ÇȯÀ¸¤¹¤EƼE¤¥Ù¥ó¥È¤ò¥Õ¥Ã¥¯¤¹¤E³¡¼¥EХ寤òÀß
- * Äꤹ¤E³¤È¤¬¤Ç¤¤E£¤Ê¤ª¡¢¥E¹¥Ê¡¼¥¯¥é¥¹¤Ï2¼Eฺߤ·¡¢¥Ð¥Ã¥Õ¥¡¥Õ
- * ¥EäÁ÷¿®»þ¤Î¥³¡¼¥EХ寤ǡ¢¤½¤Î»þÅÀ¤Ç͸ú¤Ê¥Ç¡¼¥¿¤ò¥Õ¥¡¥ó¥¯¥¿¤Î°E * ¿ô¤È¤·¤Æ¼õ¤±¼è¤EConnectorDataListener ¤Ç¤¢¤ê¡¢¤â¤¦°Eý¤Ï¥Ç¡¼¥¿¥¨
- * ¥ó¥×¥Æ¥£¤ä¥Ð¥Ã¥Õ¥¡Æɤ߹þ¤ß»þ¤Î¥¿¥¤¥à¥¢¥¦¥È¤Ê¤É¥Ç¡¼¥¿¤¬¼èÆÀ¤Ç¤¤Ê¤¤
- * ¾Eç¤Ê¤É¤Ë¥³¡¼¥Eµ¤EEÕ¥¡¥ó¥¯¥¿¤Î°ú¿ô¤Ë²¿¤â¤È¤é¤Ê¤é¤¤
- * ConnecotorListener ¤¬¤¢¤E£
+ * ƒRƒAƒƒWƒbƒN‚ªOutPort‚ɑ΂µ‚ăf[ƒ^‘‚«ž‚ÝAInPort‘¤‚Ńf[ƒ^‚ªŽæ
+ * “¾‚³‚ê‚é‚Ü‚Å‚ÌŠÔ‚Å”¶‚·‚éŠeŽíƒCƒxƒ“ƒg‚ðƒtƒbƒN‚·‚éƒR[ƒ‹ƒoƒbƒN‚ðÝ
+ * ’è‚·‚邱‚Æ‚ª‚Å‚«‚éB‚È‚¨AƒŠƒXƒi[ƒNƒ‰ƒX‚Í2Ží—Þ‘¶Ý‚µAƒoƒbƒtƒ@ƒt
+ * ƒ‹‚â‘—MŽž‚̃R[ƒ‹ƒoƒbƒN‚ÅA‚»‚ÌŽž“_‚Å—LŒø‚ȃf[ƒ^‚ðƒtƒ@ƒ“ƒNƒ^‚̈ø
+ * ”‚Æ‚µ‚Ď󂯎æ‚é ConnectorDataListener ‚Å‚ ‚èA‚à‚¤ˆê•û‚̓f[ƒ^ƒG
+ * ƒ“ƒvƒeƒB‚âƒoƒbƒtƒ@“Ç‚Ýž‚ÝŽž‚̃^ƒCƒ€ƒAƒEƒg‚Ȃǃf[ƒ^‚ªŽæ“¾‚Å‚«‚È‚¢
+ * ꇂȂǂɃR[ƒ‹‚³‚ê‚éƒtƒ@ƒ“ƒNƒ^‚̈ø”‚ɉ½‚à‚Æ‚ç‚È‚ç‚¢
+ * ConnecotorListener ‚ª‚ ‚éB
*
- * ¥Ç¡¼¥¿¥Ý¡¼¥È¤Ë¤Ï¡¢Àܳ»þ¤Ë¥Ç¡¼¥¿¤ÎÁ÷¼õ¿®ÊýË¡¤Ë¤Ä¤¤¤Æ¥Ç¡¼¥¿¥Õ¥ú½¼·¿¡¢
- * ¥µ¥Ö¥¹¥¯¥E×¥·¥ç¥ó·¿Åù¤òÀßÄꤹ¤E³¤È¤¬¤Ç¤¤E£
- * ConnectorDaataListener/ConnectorListener ¤Ï¶¦¤Ë¤Ë¡¢ÍÍ¡¹¤Ê¥¤¥Ù¥ó¥È
- * ¤ËÂФ¹¤E³¡¼¥EХ寤òÀßÄꤹ¤E³¤È¤¬¤Ç¤¤E¬¡¢¤³¤Eé¥Ç¡¼¥¿¥Õ¥ú½¼·¿
- * ¤ª¤è¤Ó¥µ¥Ö¥¹¥¯¥E×¥·¥ç¥ó·¿¤ÎÀßÄê¤Ë±þ¤¸¤Æ¡¢ÍøÍѤǤ¤Eâ¤Î¡¢¤Ç¤¤Ê¤¤
- * ¤â¤Î¡¢¤Þ¤¿¸Æ¤Ó½Ð¤µ¤EE¿¥¤¥ß¥ó¥°¤¬°Û¤Ê¤E£°Ê²¼¤Ë¡¢¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹
- * ¤¬CORBA CDR·¿¤Î¾Eç¤Î¥³¡¼¥EХ寰E÷¤ò¼¨¤¹¡£
+ * ConnectorListener ƒNƒ‰ƒX‚É‚æ‚Á‚ÄŠÖ˜A‚·‚é“®ì‚ðƒtƒbƒN‚µ‚½‚¢ê‡AˆÈ
+ * ‰º‚Ì—á‚̂悤‚ÉA‚±‚̃Nƒ‰ƒX‚ðŒp³‚µAƒRƒlƒNƒ^‚Ìî•ñ‚ðˆø”‚ÉŽæ‚éˆÈ‰º
+ * ‚̂悤‚ȃR[ƒ‹ƒoƒbƒNƒIƒuƒWƒFƒNƒg‚ð’è‹`‚µAƒf[ƒ^ƒ|[ƒg‚Ì“K؂ȃR[
+ * ƒ‹ƒoƒbƒNÝ’èŠÖ”‚©‚çƒR[ƒ‹ƒoƒbƒNƒIƒuƒWƒFƒNƒg‚ðƒZƒbƒg‚·‚é•K—v‚ª‚ ‚éB
*
+ * <pre>
+ * class MyListener
+ * : public ConnectorListener
+ * {
+ * public:
+ * MyListener(const char* name) : m_name(name) {}
+ * virtual ~MyListener() {}
+ * virtual ReturnCode operator()(ConnectorInfo& info)
+ * {
+ * std::cout << "Data Listener: " << m_name << std::endl;
* std::cout << "Profile::name: " << info.name << std::endl;
* std::cout << "Profile::id: " << info.id << std::endl;
* std::cout << "Profile::properties: " << std::endl;
* std::cout << info.properties;
- * - ON_RECEIVER_ERROR
+ * };
* std::string m_name;
* };
* </pre>
*
- * ¤³¤Î¤è¤¦¤Ë¤·¤ÆÄEÁ¤µ¤E¿¥E¹¥Ê¥¯¥é¥¹¤Ï¡¢°Ê²¼¤Î¤è¤¦¤Ë¥Ç¡¼¥¿¥Ý¡¼¥È¤Ë
- * ÂФ·¤Æ¡¢°Ê²¼¤Î¤è¤¦¤Ë¥»¥Ã¥È¤µ¤EE£
+ * ‚±‚̂悤‚É‚µ‚Ä’è‹`‚³‚ꂽƒŠƒXƒiƒNƒ‰ƒX‚ÍAˆÈ‰º‚̂悤‚Ƀf[ƒ^ƒ|[ƒg‚É
+ * ‘΂µ‚ÄAˆÈ‰º‚̂悤‚ɃZƒbƒg‚³‚ê‚éB
*
* <pre>
* RTC::ReturnCode_t ConsoleIn::onInitialize()
@@ -686,24 +700,24 @@
* :
* </pre>
*
- * ÂE°ú¿ô¤Î "ON_BUFFER_EMPTY" ¤Ï¡¢¥³¡¼¥EХ寤ò¥Õ¥Ã¥¯¤¹¤EÝ¥¤¥ó¥È¤Ç
- * ¤¢¤ê¡¢°Ê²¼¤ËÎóµó¤¹¤Eͤò¼è¤E³¤È¤¬²Äǽ¤Ç¤¢¤E£¥Ç¡¼¥¿¥Ý¡¼¥È¤Ë¤Ï¡¢ÀÜ
- * ³»þ¤Ë¥Ç¡¼¥¿¤ÎÁ÷¼õ¿®ÊýË¡¤Ë¤Ä¤¤¤Æ¡¢¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹·¿¡¢¥Ç¡¼¥¿¥Õ¥ú½¼
- * ·¿¡¢¥µ¥Ö¥¹¥¯¥E×¥·¥ç¥ó·¿Åù¤òÀßÄꤹ¤E³¤È¤¬¤Ç¤¤E¬¡¢¤³¤Eé¤ÎÀßÄê¤Ë
- * ¤è¤Eե寤µ¤EEÝ¥¤¥ó¥È¤Ï°Û¤Ê¤E£°Ê²¼¤Ë¡¢¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¤¬CORBA
- * CDR·¿¤Î¾Eç¤Î¥³¡¼¥EХ寰E÷¤ò¼¨¤¹¡£
+ * ‘æ1ˆø”‚Ì "ON_BUFFER_EMPTY" ‚ÍAƒR[ƒ‹ƒoƒbƒN‚ðƒtƒbƒN‚·‚éƒ|ƒCƒ“ƒg‚Å
+ * ‚ ‚èAˆÈ‰º‚É—ñ‹“‚·‚é’l‚ðŽæ‚邱‚Æ‚ª‰Â”\‚Å‚ ‚éBƒf[ƒ^ƒ|[ƒg‚É‚ÍAÚ
+ * ‘±Žž‚Ƀf[ƒ^‚Ì‘—ŽóM•û–@‚ɂ‚¢‚ÄAƒCƒ“ƒ^[ƒtƒF[ƒXŒ^Aƒf[ƒ^ƒtƒ[
+ * Œ^AƒTƒuƒXƒNƒŠƒvƒVƒ‡ƒ“Œ^“™‚ðÝ’è‚·‚邱‚Æ‚ª‚Å‚«‚邪A‚±‚ê‚ç‚ÌÝ’è‚É
+ * ‚æ‚èƒtƒbƒN‚³‚ê‚éƒ|ƒCƒ“ƒg‚͈قȂéBˆÈ‰º‚ÉAƒCƒ“ƒ^[ƒtƒF[ƒX‚ªCORBA
+ * CDRŒ^‚Ìꇂ̃R[ƒ‹ƒoƒbƒNˆê——‚ðŽ¦‚·B
*
* OutPort:
- * - Push·¿: Subscription Type¤Ë¤è¤ê¤µ¤é¤Ë¥¤¥Ù¥ó¥È¤Î¼Eबʬ¤«¤EE£
- * - Flush: Flush·¿¤Ë¤Ï¥Ð¥Ã¥Õ¥¡¤¬¤Ê¤¤¤¿¤EON_BUFFER ·Ï¤Î¥¤¥Ù¥ó¥È¤ÏȯÀ¸¤·¤Ê¤¤
+ * - PushŒ^: Subscription Type‚É‚æ‚肳‚ç‚ɃCƒxƒ“ƒg‚ÌŽí—Þ‚ª•ª‚©‚ê‚éB
+ * - Flush: FlushŒ^‚ɂ̓oƒbƒtƒ@‚ª‚È‚¢‚½‚ß ON_BUFFER Œn‚̃Cƒxƒ“ƒg‚Í”¶‚µ‚È‚¢
* - ON_CONNECT
* - ON_DISCONNECT
* .
- * - New·¿
+ * - NewŒ^
* - ON_CONNECT
* - ON_DISCONNECT
* .
- * - Periodic·¿
+ * - PeriodicŒ^
* - ON_BUFFER_EMPTY
* - ON_BUFFER_READ_TIMEOUT
* - ON_SENDER_EMPTY
@@ -711,17 +725,8 @@
* - ON_CONNECT
* - ON_DISCONNECT
* .
- * - ON_BUFFER_READ
- * - ON_SEND
- * - ON_RECEIVED
- * - ON_RECEIVER_FULL
- * - ON_SEND
- * - ON_RECEIVED
- * - ON_RECEIVER_FULL
- * - ON_RECEIVER_TIMEOUT
- * - ON_BUFFER_READ
* .
- * - ON_SEND
+ * - PullŒ^
* - ON_BUFFER_EMPTY
* - ON_BUFFER_READ_TIMEOUT
* - ON_SENDER_EMPTY
@@ -728,33 +733,42 @@
* - ON_SENDER_TIMEOUT
* - ON_SENDER_ERROR
* - ON_CONNECT
+ * - ON_DISCONNECT
+ * .
* InPort:
- * - Push·¿:
- * - ON_BUFFER_WRITE
- * - ON_BUFFER_FULL
- * - ON_BUFFER_WRITE_TIMEOUT
- * - ON_BUFFER_WRITE_OVERWRITE
- * - ON_RECEIVED
+ * - PushŒ^:
+ * - ON_BUFFER_EMPTY
+ * - ON_BUFFER_READ_TIMEOUT
+ * - ON_CONNECT
+ * - ON_DISCONNECT
+ * .
+ * - PullŒ^
+ * - ON_CONNECT
+ * - ON_DISCONNECT
*
- * - ON_RECEIVER_TIMEOUT
- * - ON_RECEIVER_ERROR
- * connectors.
- *
+ * @else
* @class ConnectorListener class
* @brief ConnectorListener class
*
* This class is abstract base class for listener classes that
- * provides callbacks for various events in the data port's
+ * realize callbacks for various events in the data port's
* connectors.
*
- * @endif
- */
- class ConnectorListener
- {
- public:
+ * Callbacks can be hooked to the various kind of events which occur
+ * throgh OutPort side data write action to InPort side data-read
+ * action. Two types listener classes exist. One is
+ * ConnectorDataListener which receives valid data-port's data value
+ * at that time such as buffer-full event, data-send event, and so
+ * on. Other is ConnectorListener which does not receive any data
+ * such as buffer-empty event, buffer-read-timeout event and so on.
+ *
+ * If you want to hook related actions by
+ * ConnectorListener, a class which inherits this class should
+ * be defined, and the functor should receive a connector
+ * information as an argument. And then, the defined
* class must be set to data-port object through its member
- * @if jp
- *
+ * function, as follows.
+ *
* <pre>
* class MyListener
* : public ConnectorListener
@@ -842,20 +856,14 @@
/*!
* @if jp
*
- * @brief ConnectorListenerType ¤òʸ»úÎó¤ËÊÑ´¹
+ * @brief ConnectorListenerType ‚𕶎š—ñ‚É•ÏŠ·
*
- * ConnectorListenerType ¤òʸ»úÎó¤ËÊÑ´¹¤¹¤E *
- * @param type ÊÑ´¹ÂÐ¾Ý ConnectorListenerType
+ * ConnectorListenerType ‚𕶎š—ñ‚É•ÏŠ·‚·‚é
*
- * @brief ConnectorListenerType ¤òʸ»úÎó¤ËÊÑ´¹
+ * @param type •ÏŠ·‘ÎÛ ConnectorListenerType
*
- * ConnectorListenerType ¤òʸ»úÎó¤ËÊÑ´¹¤¹¤E *
+ * @return •¶Žš—ñ•ÏŠ·Œ‹‰Ê
*
- * @param type ÊÑ´¹ÂÐ¾Ý ConnectorListenerType
- *
- * Convert ConnectorListenerType into the string.
- * @return ʸ»úÎóÊÑ´¹·EÌ
- *
* @else
*
* @brief Convert ConnectorListenerType into the string.
@@ -887,7 +895,7 @@
/*!
* @if jp
- * @brief ¥Ç¥¹¥È¥é¥¯¥¿
+ * @brief ƒfƒXƒgƒ‰ƒNƒ^
* @else
* @brief Destructor
* @endif
@@ -897,10 +905,10 @@
/*!
* @if jp
*
- * @brief ²¾ÁÛ¥³¡¼¥EХ寥᥽¥Ã¥É
+ * @brief ‰¼‘zƒR[ƒ‹ƒoƒbƒNƒƒ\ƒbƒh
*
- * ¥Ç¡¼¥¿¥Ý¡¼¥È¤Î Connector ¤Ë¤ª¤¤¤ÆȯÀ¸¤¹¤EƼE¤¥Ù¥ó¥È¤ËÂФ¹¤E³¡¼
- * ¥EХ寥᥽¥Ã¥É
+ * ƒf[ƒ^ƒ|[ƒg‚Ì Connector ‚É‚¨‚¢‚Ä”¶‚·‚éŠeŽíƒCƒxƒ“ƒg‚ɑ΂·‚éƒR[
+ * ƒ‹ƒoƒbƒNƒƒ\ƒbƒh
*
* @else
*
@@ -911,7 +919,7 @@
*
* @endif
*/
- virtual void operator()(const ConnectorInfo& info) = 0;
+ virtual ReturnCode operator()(const ConnectorInfo& info) = 0;
};
@@ -918,10 +926,10 @@
/*!
* @if jp
* @class ConnectorDataListenerHolder
- * @brief ConnectorDataListener ¥Û¥EÀ¥¯¥é¥¹
+ * @brief ConnectorDataListener ƒzƒ‹ƒ_ƒNƒ‰ƒX
*
+ * •¡”‚Ì ConnectorDataListener ‚ð•ÛŽ‚µŠÇ—‚·‚éƒNƒ‰ƒXB
*
- *
* @else
* @class ConnectorDataListenerHolder
* @brief ConnectorDataListener holder class
@@ -931,23 +939,23 @@
* @endif
*/
class ConnectorDataListenerHolder
+ : public ConnectorListenerStatus
{
typedef std::pair<ConnectorDataListener*, bool> Entry;
typedef coil::Guard<coil::Mutex> Guard;
public:
+ USE_CONNLISTENER_STATUS;
/*!
* @if jp
- * @brief ¥³¥ó¥¹¥È¥é¥¯¥¿
+ * @brief ƒRƒ“ƒXƒgƒ‰ƒNƒ^
* @else
* @brief Constructor
- * @brief ¥Ç¥¹¥È¥é¥¯¥¿
* @endif
*/
ConnectorDataListenerHolder();
/*!
- virtual ~ConnectorDataListenerHolder();
* @if jp
- * @brief ¥Ç¥¹¥È¥é¥¯¥¿
+ * @brief ƒfƒXƒgƒ‰ƒNƒ^
* @else
* @brief Destructor
* @endif
@@ -957,13 +965,13 @@
/*!
* @if jp
*
- * @brief ¥E¹¥Ê¡¼¤ÎÄɲÃ
+ * @brief ƒŠƒXƒi[‚̒ljÁ
*
- * ¥E¹¥Ê¡¼¤òÄɲ乤E£
+ * ƒŠƒXƒi[‚ð’ljÁ‚·‚éB
*
- * @param listener Äɲ乤EE¹¥Ê
- * @param autoclean true:¥Ç¥¹¥È¥é¥¯¥¿¤ÇºEE¹¤E
- * false:¥Ç¥¹¥È¥é¥¯¥¿¤ÇºEE·¤Ê¤¤
+ * @param listener ’ljÁ‚·‚郊ƒXƒi
+ * @param autoclean true:ƒfƒXƒgƒ‰ƒNƒ^‚Å휂·‚é,
+ * false:ƒfƒXƒgƒ‰ƒNƒ^‚Å휂µ‚È‚¢
* @else
*
* @brief Add the listener.
@@ -980,10 +988,11 @@
/*!
* @if jp
*
- * @brief ¥E¹¥Ê¡¼¤ÎºEE *
- * ¥E¹¥Ê¤òºEE¹¤E£
+ * @brief ƒŠƒXƒi[‚Ìíœ
*
- * @param listener ºEE¹¤EE¹¥Ê
+ * ƒŠƒXƒi‚ð휂·‚éB
+ *
+ * @param listener 휂·‚郊ƒXƒi
* @else
*
* @brief Remove the listener.
@@ -998,11 +1007,13 @@
/*!
* @if jp
*
- * @brief ¥E¹¥Ê¡¼¤Î¿ô¤òÆÀ¤E *
- * ¸½ºßÅÐÏ¿¤µ¤EƤ¤¤EE¹¥Ê¡¼¿ô¤òÆÀ¤E£
+ * @brief ƒŠƒXƒi[‚Ì”‚𓾂é
*
- * @return listener¿E * @else
+ * Œ»Ý“o˜^‚³‚ê‚Ä‚¢‚郊ƒXƒi[”‚𓾂éB
*
+ * @return listener”
+ * @else
+ *
* @brief Getting number of listeners.
*
* This method returns current number of listenrs.
@@ -1015,11 +1026,12 @@
/*!
* @if jp
*
- * @brief ¥E¹¥Ê¡¼¤ØÄÌÃΤ¹¤E *
- * ÅÐÏ¿¤µ¤EƤ¤¤EE¹¥Ê¤Î¥³¡¼¥EХ寥᥽¥Ã¥É¤ò¸Æ¤Ó½Ð¤¹¡£
+ * @brief ƒŠƒXƒi[‚Ö’Ê’m‚·‚é
*
+ * “o˜^‚³‚ê‚Ä‚¢‚郊ƒXƒi‚̃R[ƒ‹ƒoƒbƒNƒƒ\ƒbƒh‚ðŒÄ‚Ño‚·B
+ *
* @param info ConnectorInfo
- * @param cdrdata ¥Ç¡¼¥¿
+ * @param cdrdata ƒf[ƒ^
* @else
*
* @brief Notify listeners.
@@ -1030,21 +1042,21 @@
* @param cdrdata Data
* @endif
*/
- void notify(const ConnectorInfo& info,
+ ReturnCode notify(const ConnectorInfo& info,
const cdrMemoryStream& cdrdata);
/*!
* @if jp
*
- * @brief ¥E¹¥Ê¡¼¤ØÄÌÃΤ¹¤E¥Ç¡¼¥¿·¿»ØÄEÇ)
+ * @brief ƒŠƒXƒi[‚Ö’Ê’m‚·‚é(ƒf[ƒ^Œ^Žw’è”Å)
*
- * ÅÐÏ¿¤µ¤EƤ¤¤EE¹¥Ê¤Î¥³¡¼¥EХ寥᥽¥Ã¥É¤ò¸Æ¤Ó½Ð¤¹¡£
- * COnnectorDataListenerT ·¿¤Î¥³¡¼¥EХ寤Τߥ³¡¼¥Eµ¤EE£
+ * “o˜^‚³‚ê‚Ä‚¢‚郊ƒXƒi‚̃R[ƒ‹ƒoƒbƒNƒƒ\ƒbƒh‚ðŒÄ‚Ño‚·B
+ * ConnectorDataListenerT Œ^‚̃R[ƒ‹ƒoƒbƒN‚̂݃R[ƒ‹‚³‚ê‚éB
*
* @param info ConnectorInfo
- * @param typeddata ¥Ç¡¼¥¿¡Ê¥Ç¡¼¥¿·¿»ØÄꤢ¤ê¡Ë
- * @param info ConnectorInfo
- * @param typeddata Data
+ * @param typeddata ƒf[ƒ^iƒf[ƒ^Œ^Žw’è‚ ‚èj
+ * @else
+ *
* @brief Notify listeners. (Typed data version)
*
* This calls the Callback method of the registered listener.
@@ -1052,12 +1064,13 @@
*
* @param info ConnectorInfo
* @param typeddata Data
- for (int i(0), len(m_listeners.size()); i < len; ++i)
+ * @endif
*/
template <class DataType>
- void notify(const ConnectorInfo& info, const DataType& typeddata)
+ ReturnCode notify(const ConnectorInfo& info, const DataType& typeddata)
{
- Guard guard(m_mutex);
+ Guard guard(m_mutex);
+ ReturnCode ret(NO_CHANGE);
for (int i(0), len(m_listeners.size()); i < len; ++i)
{
ConnectorDataListenerT<DataType>* listener(0);
@@ -1069,9 +1082,9 @@
}
}
return ret;
+ }
private:
- private:
std::vector<Entry> m_listeners;
coil::Mutex m_mutex;
};
@@ -1080,9 +1093,9 @@
/*!
* @if jp
* @class ConnectorListenerHolder
- * @brief ConnectorListener ¥Û¥EÀ¥¯¥é¥¹
+ * @brief ConnectorListener ƒzƒ‹ƒ_ƒNƒ‰ƒX
*
- * Ê£¿ô¤Î ConnectorListener ¤òÊÝ»ý¤·´ÉÍý¤¹¤E¯¥é¥¹¡£
+ * •¡”‚Ì ConnectorListener ‚ð•ÛŽ‚µŠÇ—‚·‚éƒNƒ‰ƒXB
*
* @else
* @class ConnectorListenerHolder
@@ -1089,24 +1102,19 @@
* @brief ConnectorListener holder class
*
* This class manages one ore more instances of ConnectorListener class.
- * Ê£¿ô¤Î ConnectorListener ¤òÊÝ»ý¤·´ÉÍý¤¹¤E¯¥é¥¹¡£
*
- * @else
- * @class ConnectorListenerHolder
- * @brief ConnectorListener holder class
- *
- * This class manages one ore more instances of ConnectorListener class.
- *
* @endif
*/
class ConnectorListenerHolder
+ : public ConnectorListenerStatus
{
typedef std::pair<ConnectorListener*, bool> Entry;
typedef coil::Guard<coil::Mutex> Guard;
public:
+ USE_CONNLISTENER_STATUS;
/*!
* @if jp
- * @brief ¥³¥ó¥¹¥È¥é¥¯¥¿
+ * @brief ƒRƒ“ƒXƒgƒ‰ƒNƒ^
* @else
* @brief Constructor
* @endif
@@ -1113,12 +1121,10 @@
*/
ConnectorListenerHolder();
- * @endif
/*!
* @if jp
- * @brief ¥Ç¥¹¥È¥é¥¯¥¿
+ * @brief ƒfƒXƒgƒ‰ƒNƒ^
* @else
- * @if jp
* @brief Destructor
* @endif
*/
@@ -1127,13 +1133,13 @@
/*!
* @if jp
*
- * @brief ¥E¹¥Ê¡¼¤ÎÄɲÃ
+ * @brief ƒŠƒXƒi[‚̒ljÁ
*
- * ¥E¹¥Ê¡¼¤òÄɲ乤E£
+ * ƒŠƒXƒi[‚ð’ljÁ‚·‚éB
*
- * @param listener Äɲ乤EE¹¥Ê
- * @param autoclean true:¥Ç¥¹¥È¥é¥¯¥¿¤ÇºEE¹¤E
- * false:¥Ç¥¹¥È¥é¥¯¥¿¤ÇºEE·¤Ê¤¤
+ * @param listener ’ljÁ‚·‚郊ƒXƒi
+ * @param autoclean true:ƒfƒXƒgƒ‰ƒNƒ^‚Å휂·‚é,
+ * false:ƒfƒXƒgƒ‰ƒNƒ^‚Å휂µ‚È‚¢
* @else
*
* @brief Add the listener.
@@ -1150,10 +1156,11 @@
/*!
* @if jp
*
- * @brief ¥E¹¥Ê¡¼¤ÎºEE *
- * ¥E¹¥Ê¤òºEE¹¤E£
+ * @brief ƒŠƒXƒi[‚Ìíœ
*
- * @param listener ºEE¹¤EE¹¥Ê
+ * ƒŠƒXƒi‚ð휂·‚éB
+ *
+ * @param listener 휂·‚郊ƒXƒi
* @else
*
* @brief Remove the listener.
@@ -1168,11 +1175,13 @@
/*!
* @if jp
*
- * @brief ¥E¹¥Ê¡¼¤Î¿ô¤òÆÀ¤E *
- * ¸½ºßÅÐÏ¿¤µ¤EƤ¤¤EE¹¥Ê¡¼¿ô¤òÆÀ¤E£
+ * @brief ƒŠƒXƒi[‚Ì”‚𓾂é
*
- * @return listener¿E * @else
+ * Œ»Ý“o˜^‚³‚ê‚Ä‚¢‚郊ƒXƒi[”‚𓾂éB
*
+ * @return listener”
+ * @else
+ *
* @brief Getting number of listeners.
*
* This method returns current number of listenrs.
@@ -1185,9 +1194,10 @@
/*!
* @if jp
*
- * @brief ¥E¹¥Ê¡¼¤ØÄÌÃΤ¹¤E *
- * ÅÐÏ¿¤µ¤EƤ¤¤EE¹¥Ê¤Î¥³¡¼¥EХ寥᥽¥Ã¥É¤ò¸Æ¤Ó½Ð¤¹¡£
+ * @brief ƒŠƒXƒi[‚Ö’Ê’m‚·‚é
*
+ * “o˜^‚³‚ê‚Ä‚¢‚郊ƒXƒi‚̃R[ƒ‹ƒoƒbƒNƒƒ\ƒbƒh‚ðŒÄ‚Ño‚·B
+ *
* @param info ConnectorInfo
* @else
*
@@ -1195,10 +1205,10 @@
*
* This calls the Callback method of the registered listener.
*
- * @param info ConnectorInfo
+ * @param info ConnectonotifyrInfo
* @endif
*/
- void notify(const ConnectorInfo& info);
+ ReturnCode notify(const ConnectorInfo& info);
private:
std::vector<Entry> m_listeners;
@@ -1208,7 +1218,7 @@
/*!
* @if jp
* @class ConnectorListeners
- * @brief ConnectorListeners ¥¯¥é¥¹
+ * @brief ConnectorListeners ƒNƒ‰ƒX
*
*
* @else
@@ -1215,7 +1225,7 @@
* @class ConnectorListeners
* @brief ConnectorListeners class
*
- * @if jp
+ *
* @endif
*/
class ConnectorListeners
@@ -1223,7 +1233,8 @@
public:
/*!
* @if jp
- * @brief ConnectorDataListenerType¥E¹¥ÊÇÛÎE * ConnectorDataListenerType¥E¹¥Ê¤ò³ÊǼ
+ * @brief ConnectorDataListenerTypeƒŠƒXƒi”z—ñ
+ * ConnectorDataListenerTypeƒŠƒXƒi‚ðŠi”[
* @else
* @brief ConnectorDataListenerType listener array
* The ConnectorDataListenerType listener is stored.
@@ -1232,8 +1243,15 @@
ConnectorDataListenerHolder connectorData_[CONNECTOR_DATA_LISTENER_NUM];
/*!
* @if jp
- * @brief ConnectorListenerType¥E¹¥ÊÇÛÎE * ConnectorListenerType¥E¹¥Ê¤ò³ÊǼ
+ * @brief ConnectorListenerTypeƒŠƒXƒi”z—ñ
+ * ConnectorListenerTypeƒŠƒXƒi‚ðŠi”[
* @else
* @brief ConnectorListenerType listener array
* The ConnectorListenerType listener is stored.
* @endif
+ */
+ ConnectorListenerHolder connector_[CONNECTOR_LISTENER_NUM];
+ };
+};
+
+#endif // RTC_CONNECTORLISTENER_H
\ No newline at end of file
Modified: trunk/OpenRTM-aist/src/lib/rtm/InPortConsumer.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/InPortConsumer.h 2017-12-11 03:27:45 UTC (rev 3125)
+++ trunk/OpenRTM-aist/src/lib/rtm/InPortConsumer.h 2017-12-11 06:13:10 UTC (rev 3126)
@@ -144,7 +144,7 @@
*
* @endif
*/
- virtual ReturnCode put(cdrMemoryStream& data) = 0;
+ virtual ReturnCode put(const cdrMemoryStream& data) = 0;
/*!
* @if jp
Modified: trunk/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrConsumer.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrConsumer.cpp 2017-12-11 03:27:45 UTC (rev 3125)
+++ trunk/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrConsumer.cpp 2017-12-11 06:13:10 UTC (rev 3126)
@@ -49,7 +49,7 @@
/*!
* @if jp
- * @brief ÀßÄEé´E½
+ * @brief ÀßÄê½é´ü²½
* @else
* @brief Initializing configuration
* @endif
@@ -67,7 +67,7 @@
* @endif
*/
InPortConsumer::ReturnCode InPortCorbaCdrConsumer::
- put(cdrMemoryStream& data)
+ put(const cdrMemoryStream& data)
{
RTC_PARANOID(("put()"));
@@ -115,7 +115,8 @@
/*!
* @if jp
- * @brief InterfaceProfile¾ðÊó¤ò¸ø³«¤¹¤E * @else
+ * @brief InterfaceProfile¾ðÊó¤ò¸ø³«¤¹¤ë
+ * @else
* @brief Publish InterfaceProfile information
* @endif
*/
@@ -149,7 +150,8 @@
/*!
* @if jp
- * @brief ¥Ç¡¼¥¿Á÷¿®ÄÌÃΤ«¤é¤ÎÅÐÏ¿²ò½E * @else
+ * @brief ¥Ç¡¼¥¿Á÷¿®ÄÌÃΤ«¤é¤ÎÅÐÏ¿²ò½ü
+ * @else
* @brief Unsubscribe the data send notification
* @endif
*/
@@ -168,7 +170,8 @@
/*!
* @if jp
- * @brief IORʸ»úÎ󤫤饪¥Ö¥¸¥§¥¯¥È»²¾È¤ò¼èÆÀ¤¹¤E * @else
+ * @brief IORʸ»úÎ󤫤饪¥Ö¥¸¥§¥¯¥È»²¾È¤ò¼èÆÀ¤¹¤ë
+ * @else
* @brief Getting object reference fromn IOR string
* @endif
*/
@@ -212,7 +215,8 @@
/*!
* @if jp
- * @brief Any¤«¤éľÀÜ¥ª¥Ö¥¸¥§¥¯¥È»²¾È¤ò¼èÆÀ¤¹¤E * @else
+ * @brief Any¤«¤éľÀÜ¥ª¥Ö¥¸¥§¥¯¥È»²¾È¤ò¼èÆÀ¤¹¤ë
+ * @else
* @brief Getting object reference fromn Any directry
* @endif
*/
@@ -256,7 +260,7 @@
/*!
* @if jp
- * @brief Àܳ²ò½EIORÈÇ)
+ * @brief Àܳ²ò½ü(IORÈÇ)
* @else
* @brief ubsubscribing (IOR version)
* @endif
@@ -295,7 +299,7 @@
/*!
* @if jp
- * @brief Àܳ²ò½EObject referenceÈÇ)
+ * @brief Àܳ²ò½ü(Object referenceÈÇ)
* @else
* @brief ubsubscribing (Object reference version)
* @endif
@@ -327,7 +331,7 @@
/*!
* @if jp
- * @brief ¥E¿¡¼¥ó¥³¡¼¥ÉÊÑ´¹
+ * @brief ¥ê¥¿¡¼¥ó¥³¡¼¥ÉÊÑ´¹
* @else
* @brief Return codes conversion
* @endif
@@ -365,7 +369,8 @@
{
/*!
* @if jp
- * @brief ¥â¥¸¥å¡¼¥Eé´E½´Ø¿E * @else
+ * @brief ¥â¥¸¥å¡¼¥ë½é´ü²½´Ø¿ô
+ * @else
* @brief Module initialization
* @endif
*/
Modified: trunk/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrConsumer.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrConsumer.h 2017-12-11 03:27:45 UTC (rev 3125)
+++ trunk/OpenRTM-aist/src/lib/rtm/InPortCorbaCdrConsumer.h 2017-12-11 06:13:10 UTC (rev 3126)
@@ -155,7 +155,7 @@
*
* @endif
*/
- virtual ReturnCode put(cdrMemoryStream& data);
+ virtual ReturnCode put(const cdrMemoryStream& data);
/*!
* @if jp
Modified: trunk/OpenRTM-aist/src/lib/rtm/InPortDirectConsumer.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/InPortDirectConsumer.cpp 2017-12-11 03:27:45 UTC (rev 3125)
+++ trunk/OpenRTM-aist/src/lib/rtm/InPortDirectConsumer.cpp 2017-12-11 06:13:10 UTC (rev 3126)
@@ -49,7 +49,7 @@
/*!
* @if jp
- * @brief ÀßÄEé´E½
+ * @brief ÀßÄê½é´ü²½
* @else
* @brief Initializing configuration
* @endif
@@ -67,7 +67,7 @@
* @endif
*/
InPortConsumer::ReturnCode InPortDirectConsumer::
- put(cdrMemoryStream& data)
+ put(const cdrMemoryStream& data)
{
RTC_PARANOID(("put(): never called."));
return UNKNOWN_ERROR;
@@ -75,7 +75,8 @@
/*!
* @if jp
- * @brief InterfaceProfile¾ðÊó¤ò¸ø³«¤¹¤E * @else
+ * @brief InterfaceProfile¾ðÊó¤ò¸ø³«¤¹¤ë
+ * @else
* @brief Publish InterfaceProfile information
* @endif
*/
@@ -101,7 +102,8 @@
/*!
* @if jp
- * @brief ¥Ç¡¼¥¿Á÷¿®ÄÌÃΤ«¤é¤ÎÅÐÏ¿²ò½E * @else
+ * @brief ¥Ç¡¼¥¿Á÷¿®ÄÌÃΤ«¤é¤ÎÅÐÏ¿²ò½ü
+ * @else
* @brief Unsubscribe the data send notification
* @endif
*/
@@ -116,7 +118,8 @@
{
/*!
* @if jp
- * @brief ¥â¥¸¥å¡¼¥Eé´E½´Ø¿E * @else
+ * @brief ¥â¥¸¥å¡¼¥ë½é´ü²½´Ø¿ô
+ * @else
* @brief Module initialization
* @endif
*/
Modified: trunk/OpenRTM-aist/src/lib/rtm/InPortDirectConsumer.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/InPortDirectConsumer.h 2017-12-11 03:27:45 UTC (rev 3125)
+++ trunk/OpenRTM-aist/src/lib/rtm/InPortDirectConsumer.h 2017-12-11 06:13:10 UTC (rev 3126)
@@ -154,7 +154,7 @@
*
* @endif
*/
- virtual ReturnCode put(cdrMemoryStream& data);
+ virtual ReturnCode put(const cdrMemoryStream& data);
/*!
* @if jp
Modified: trunk/OpenRTM-aist/src/lib/rtm/idl/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/idl/CMakeLists.txt 2017-12-11 03:27:45 UTC (rev 3125)
+++ trunk/OpenRTM-aist/src/lib/rtm/idl/CMakeLists.txt 2017-12-11 06:13:10 UTC (rev 3126)
@@ -58,6 +58,7 @@
RTC
SDOPackage
SharedMemory
+ ExtendedFsmService
)
More information about the openrtm-commit
mailing list