[openrtm-commit:03128] r3196 - branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2018-01-24 09:12:27 +0900 (Wed, 24 Jan 2018)
New Revision: 3196

Modified:
   branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/DirectInPortBase.h
   branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/DirectOutPortBase.h
   branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/InPort.h
   branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/OutPort.h
Log:
[compat, ->RELENG_1_2] refs #4428

Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/DirectInPortBase.h
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/DirectInPortBase.h	2018-01-23 23:49:03 UTC (rev 3195)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/DirectInPortBase.h	2018-01-24 00:12:27 UTC (rev 3196)
@@ -20,6 +20,7 @@
 
 
 #include <coil/Mutex.h>
+#include <rtm/DirectPortBase.h>
 
 
 
@@ -60,8 +61,7 @@
 	  *
 	  * @endif
 	  */
-    DirectInPortBase(DataType& value):
-        m_directNewData(false), m_value(value)
+    DirectInPortBase(DataType& value)
     {
     }
     
@@ -107,7 +107,7 @@
      */
     virtual bool isNew()
     {
-      return m_directNewData;
+		return false;
     }
 
     /*!
@@ -135,7 +135,7 @@
      */
     virtual bool isEmpty()
     {
-      return !m_directNewData;
+		return true;
     }
 
 	/*!
@@ -158,25 +158,7 @@
 
   protected:
     
-    /*!
-     * @if jp
-     * @brief バインドされる T 型の変数への参照
-     * @else
-     * @brief The reference to type-T value bound this OutPort
-     * @endif
-     */
-    DataType& m_value;
-    mutable coil::Mutex m_valueMutex;
-    
 
-    /*!
-     * @if jp
-     * @brief ダイレクトデータ転送フラグ
-     * @else
-     * @brief A flag for direct data transfer
-     * @endif
-     */
-    bool m_directNewData;
   };
 }; // End of namesepace RTM
 

Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/DirectOutPortBase.h
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/DirectOutPortBase.h	2018-01-23 23:49:03 UTC (rev 3195)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/DirectOutPortBase.h	2018-01-24 00:12:27 UTC (rev 3196)
@@ -62,8 +62,7 @@
      *
      * @endif
      */
-	DirectOutPortBase(DataType& value):
-	m_directNewData(false), m_directValue(value)
+	DirectOutPortBase(DataType& value)
 	{
 	}
 	/*!
@@ -111,7 +110,7 @@
 	*/
 	virtual bool isNew()
 	{
-		return !m_directNewData;
+		return false;
 	}
 	/*!
 	* @if jp
@@ -128,13 +127,10 @@
 	*/
 	virtual bool isEmpty()
 	{
-		return !m_directNewData;
+		return true;
 	}
     
   protected:
-	coil::Mutex m_valueMutex;
-	bool m_directNewData;
-	DataType m_directValue;
   };
 }; // namespace RTC
 

Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/InPort.h
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/InPort.h	2018-01-23 23:49:03 UTC (rev 3195)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/InPort.h	2018-01-24 00:12:27 UTC (rev 3196)
@@ -158,9 +158,9 @@
       :	InPortBase(name, ::CORBA_Util::toRepositoryId<DataType>()),
 #endif
 	  DirectInPortBase<DataType>(value),
-        m_name(name), 
+        m_name(name), m_value(value),
         m_OnRead(NULL),  m_OnReadConvert(NULL),
-        m_status(1)
+        m_status(1), m_directNewData(false)
     {
       this->addConnectorDataListener(ON_RECEIVED,
                                      new Timestamp<DataType>("on_received"));
@@ -705,7 +705,27 @@
      */
     DataPortStatusList m_status;
 
+    /*!
+     * @if jp
+     * @brief ¥Ð¥¤¥ó¥É¤µ¤ì¤ë T ·¿¤ÎÊÑ¿ô¤Ø¤Î»²¾È
+     * @else
+     * @brief The reference to type-T value bound this OutPort
+     * @endif
+     */
+    DataType& m_value;
+    mutable coil::Mutex m_valueMutex;
+    
 
+    /*!
+     * @if jp
+     * @brief ¥À¥¤¥ì¥¯¥È¥Ç¡¼¥¿Å¾Á÷¥Õ¥é¥°
+     * @else
+     * @brief A flag for direct data transfer
+     * @endif
+     */
+    bool m_directNewData;
+
+
   };
 }; // End of namesepace RTM
 

Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/OutPort.h
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/OutPort.h	2018-01-23 23:49:03 UTC (rev 3195)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/OutPort.h	2018-01-24 00:12:27 UTC (rev 3196)
@@ -140,7 +140,8 @@
       : OutPortBase(name, ::CORBA_Util::toRepositoryId<DataType>()),
 #endif
 	  DirectOutPortBase<DataType>(value),
-	  m_value(value), m_onWrite(0), m_onWriteConvert(0)
+	  m_value(value), m_onWrite(0), m_onWriteConvert(0),
+	  m_directNewData(false), m_directValue(value)
     {
 
       this->addConnectorDataListener(ON_BUFFER_WRITE,
@@ -556,7 +557,11 @@
 
     CORBA::Long m_propValueIndex;
 
+    coil::Mutex m_valueMutex;
+    bool m_directNewData;
+    DataType m_directValue;
 
+
   };
 }; // namespace RTC