[openrtm-commit:00773] r534 - branches/work/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: kurihara
Date: 2012-03-13 19:06:31 +0900 (Tue, 13 Mar 2012)
New Revision: 534

Modified:
   branches/work/OpenRTM-aist-Python/OpenRTM_aist/PeriodicExecutionContext.py
Log:
The bug aboug Logging and Condition have been corrected. refs #2386

Modified: branches/work/OpenRTM-aist-Python/OpenRTM_aist/PeriodicExecutionContext.py
===================================================================
--- branches/work/OpenRTM-aist-Python/OpenRTM_aist/PeriodicExecutionContext.py	2012-03-13 08:48:29 UTC (rev 533)
+++ branches/work/OpenRTM-aist-Python/OpenRTM_aist/PeriodicExecutionContext.py	2012-03-13 10:06:31 UTC (rev 534)
@@ -576,7 +576,7 @@
     else:
       guard = OpenRTM_aist.ScopedLock(self._workerthread._mutex)
       self._workerthread._running = True
-      self._workerthread._cond.signal()
+      self._workerthread._cond.notify()
       del guard
     return RTC.RTC_OK
 
@@ -594,14 +594,14 @@
   def onWaitingActivated(self, comp, count):
     self._rtcout.RTC_TRACE("onWaitingActivated(count = %d)", count)
     self._rtcout.RTC_PARANOID("curr: %s, next: %s",
-                              self.getStateString(comp.getStates().curr),
-                              self.getStateString(comp.getStates().next))
+                              (self.getStateString(comp.getStates().curr),
+                               self.getStateString(comp.getStates().next)))
     # Now comp's next state must be ACTIVE state
     # If worker thread is stopped, restart worker thread.
     guard = OpenRTM_aist.ScopedLock(self._workerthread._mutex)
     if self._workerthread._running == False:
       self._workerthread._running = True
-      self._workerthread._cond.signal()
+      self._workerthread._cond.notify()
     del guard
     return RTC.RTC_OK
 
@@ -611,8 +611,8 @@
   def onActivated(self, comp, count):
     self._rtcout.RTC_TRACE("onActivated(count = %d)", count)
     self._rtcout.RTC_PARANOID("curr: %s, next: %s",
-                              self.getStateString(comp.getStates().curr),
-                              self.getStateString(comp.getStates().next))
+                              (self.getStateString(comp.getStates().curr),
+                               self.getStateString(comp.getStates().next)))
     # count = -1; Asynch mode. Since onWaitingActivated is not
     # called, onActivated() have to send restart singnal to worker
     # thread.
@@ -623,7 +623,7 @@
     guard = OpenRTM_aist.ScopedLock(self._workerthread._mutex)
     if self._workerthread._running == False:
       self._workerthread._running = True
-      self._workerthread._cond.signal()
+      self._workerthread._cond.notify()
     del guard
     return RTC.RTC_OK
 
@@ -633,8 +633,8 @@
   def onWaitingDeactivated(self, comp, count):
     self._rtcout.RTC_TRACE("onWaitingDeactivated(count = %d)", count)
     self._rtcout.RTC_PARANOID("curr: %s, next: %s",
-                              self.getStateString(comp.getStates().curr),
-                              self.getStateString(comp.getStates().next))
+                              (self.getStateString(comp.getStates().curr),
+                               self.getStateString(comp.getStates().next)))
     if self.isAllNextState(RTC.INACTIVE_STATE):
       guard = OpenRTM_aist.ScopedLock(self._workerthread._mutex)
       if self._workerthread._running == True:
@@ -650,8 +650,8 @@
   def onDeactivated(self, comp, count):
     self._rtcout.RTC_TRACE("onDeactivated(count = %d)", count)
     self._rtcout.RTC_PARANOID("curr: %s, next: %s",
-                              self.getStateString(comp.getStates().curr),
-                              self.getStateString(comp.getStates().next))
+                              (self.getStateString(comp.getStates().curr),
+                               self.getStateString(comp.getStates().next)))
     if self.isAllNextState(RTC.INACTIVE_STATE):
       guard = OpenRTM_aist.ScopedLock(self._workerthread._mutex)
       if self._workerthread._running == True:
@@ -667,8 +667,8 @@
   def onWaitingReset(self, comp, count):
     self._rtcout.RTC_TRACE("onWaitingReset(count = %d)", count)
     self._rtcout.RTC_PARANOID("curr: %s, next: %s",
-                              self.getStateString(comp.getStates().curr),
-                              self.getStateString(comp.getStates().next))
+                              (self.getStateString(comp.getStates().curr),
+                               self.getStateString(comp.getStates().next)))
     if self.isAllNextState(RTC.INACTIVE_STATE):
       guard = OpenRTM_aist.ScopedLock(self._workerthread._mutex)
       if self._workerthread._running == True:
@@ -684,8 +684,8 @@
   def onReset(self, comp, count):
     self._rtcout.RTC_TRACE("onReset(count = %d)", count)
     self._rtcout.RTC_PARANOID("curr: %s, next: %s",
-                              self.getStateString(comp.getStates().curr),
-                              self.getStateString(comp.getStates().next))
+                              (self.getStateString(comp.getStates().curr),
+                               self.getStateString(comp.getStates().next)))
     if self.isAllNextState(RTC.INACTIVE_STATE):
       guard = OpenRTM_aist.ScopedLock(self._workerthread._mutex)
       if self._workerthread._running == True: