[openrtm-commit:01771] r671 - trunk/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2016-02-27 10:52:14 +0900 (Sat, 27 Feb 2016)
New Revision: 671

Modified:
   trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortSHMConsumer.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/SharedMemory.py
Log:
[incompat,bugfix,func,->RELENG_1_2] bug fix. refs #3410

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortSHMConsumer.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortSHMConsumer.py	2016-02-27 01:36:22 UTC (rev 670)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/InPortSHMConsumer.py	2016-02-27 01:52:14 UTC (rev 671)
@@ -94,7 +94,7 @@
   def __del__(self, CorbaConsumer=OpenRTM_aist.CorbaConsumer):
     self._rtcout.RTC_PARANOID("~InPortSHMConsumer()")
     CorbaConsumer.__del__(self)
-    self._shmem.close(True)
+    self._shmem.close_memory(True)
     
     return
 

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/SharedMemory.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/SharedMemory.py	2016-02-27 01:36:22 UTC (rev 670)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/SharedMemory.py	2016-02-27 01:52:14 UTC (rev 671)
@@ -253,30 +253,8 @@
   #
   # @endif
   #
-  # void close_memory(int memory_size, string shm_address);
-  def close_memory(self, unlink):
-    self.close(unlink)
-
-  ##
-  # @if jp
-  # @brief マッピングした共有メモリをアンマップする
-  # 
-  #
-  #
-  # @param self
-  # @param unlink Linuxで/dev/shm以下に作成したファイルを削除する場合にTrueにする
-  #
-  # @else
-  # @brief
-  #
-  # @param self
-  # @param unlink
-  #
-  #
-  # @endif
-  #
-  # void close(int memory_size, string shm_address);
-  def close(self, unlink=False):
+  # void close_memory(boolean unlink);
+  def close_memory(self, unlink=False):
     self._rtcout.RTC_TRACE("open()")
     if self._shmem:
       self._shmem.close()
@@ -290,7 +268,10 @@
       if self._smInterface:
         self._smInterface.close_memory(False)
 
+  
+    
 
+
   
   ##
   # @if jp