TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 10:54:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

lock -> fsmLock

Browse Source
This commit is contained in:
David Rose 2008-10-29 22:58:23 +00:00
parent 940a46fcfd
commit dc9c31388b
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
direct/src/fsm/FSM.py
View File

@ -143,7 +143,7 @@ class FSM(DirectObject):
defaultTransitions = None defaultTransitions = None
def __init__(self, name): def __init__(self, name):
self.lock = RLock() self.fsmLock = RLock()
self.name = name self.name = name
self._serialNum = FSM.SerialNum self._serialNum = FSM.SerialNum
FSM.SerialNum += 1 FSM.SerialNum += 1
@ -168,13 +168,13 @@ class FSM(DirectObject):
def cleanup(self): def cleanup(self):
# A convenience function to force the FSM to clean itself up # A convenience function to force the FSM to clean itself up
# by transitioning to the "Off" state. # by transitioning to the "Off" state.
self.lock.acquire() self.fsmLock.acquire()
try: try:
assert self.state assert self.state
if self.state != 'Off': if self.state != 'Off':
self.__setState('Off') self.__setState('Off')
finally: finally:
self.lock.release() self.fsmLock.release()
def setBroadcastStateChanges(self, doBroadcast): def setBroadcastStateChanges(self, doBroadcast):
self._broadcastStateChanges = doBroadcast self._broadcastStateChanges = doBroadcast
@ -189,27 +189,27 @@ class FSM(DirectObject):
# Returns the current state if we are in a state now, or the # Returns the current state if we are in a state now, or the
# state we are transitioning into if we are currently within # state we are transitioning into if we are currently within
# the enter or exit function for a state. # the enter or exit function for a state.
self.lock.acquire() self.fsmLock.acquire()
try: try:
if self.state: if self.state:
return self.state return self.state
return self.newState return self.newState
finally: finally:
self.lock.release() self.fsmLock.release()
def isInTransition(self): def isInTransition(self):
self.lock.acquire() self.fsmLock.acquire()
try: try:
return self.state == None return self.state == None
finally: finally:
self.lock.release() self.fsmLock.release()
def forceTransition(self, request, *args): def forceTransition(self, request, *args):
"""Changes unconditionally to the indicated state. This """Changes unconditionally to the indicated state. This
bypasses the filterState() function, and just calls bypasses the filterState() function, and just calls
exitState() followed by enterState().""" exitState() followed by enterState()."""
self.lock.acquire() self.fsmLock.acquire()
try: try:
assert isinstance(request, types.StringTypes) assert isinstance(request, types.StringTypes)
self.notify.debug("%s.forceTransition(%s, %s" % ( self.notify.debug("%s.forceTransition(%s, %s" % (
@ -223,7 +223,7 @@ class FSM(DirectObject):
self.__setState(request, *args) self.__setState(request, *args)
finally: finally:
self.lock.release() self.fsmLock.release()
def demand(self, request, *args): def demand(self, request, *args):
"""Requests a state transition, by code that does not expect """Requests a state transition, by code that does not expect
@ -237,7 +237,7 @@ class FSM(DirectObject):
sequence. sequence.
""" """
self.lock.acquire() self.fsmLock.acquire()
try: try:
assert isinstance(request, types.StringTypes) assert isinstance(request, types.StringTypes)
self.notify.debug("%s.demand(%s, %s" % ( self.notify.debug("%s.demand(%s, %s" % (
@ -251,7 +251,7 @@ class FSM(DirectObject):
if not self.request(request, *args): if not self.request(request, *args):
raise RequestDenied, "%s (from state: %s)" % (request, self.state) raise RequestDenied, "%s (from state: %s)" % (request, self.state)
finally: finally:
self.lock.release() self.fsmLock.release()
def request(self, request, *args): def request(self, request, *args):
"""Requests a state transition (or other behavior). The """Requests a state transition (or other behavior). The
@ -276,7 +276,7 @@ class FSM(DirectObject):
which will queue these requests up and apply when the which will queue these requests up and apply when the
transition is complete).""" transition is complete)."""
self.lock.acquire() self.fsmLock.acquire()
try: try:
assert isinstance(request, types.StringTypes) assert isinstance(request, types.StringTypes)
self.notify.debug("%s.request(%s, %s" % ( self.notify.debug("%s.request(%s, %s" % (
@ -303,7 +303,7 @@ class FSM(DirectObject):
return result return result
finally: finally:
self.lock.release() self.fsmLock.release()
def defaultEnter(self, *args): def defaultEnter(self, *args):
""" This is the default function that is called if there is no """ This is the default function that is called if there is no
@ -379,15 +379,15 @@ class FSM(DirectObject):
def setStateArray(self, stateArray): def setStateArray(self, stateArray):
"""array of unique states to iterate through""" """array of unique states to iterate through"""
self.lock.acquire() self.fsmLock.acquire()
try: try:
self.stateArray = stateArray self.stateArray = stateArray
finally: finally:
self.lock.release() self.fsmLock.release()
def requestNext(self, *args): def requestNext(self, *args):
"""request the 'next' state in the predefined state array""" """request the 'next' state in the predefined state array"""
self.lock.acquire() self.fsmLock.acquire()
try: try:
assert self.state in self.stateArray assert self.state in self.stateArray
@ -396,11 +396,11 @@ class FSM(DirectObject):
self.request(self.stateArray[newIndex], args) self.request(self.stateArray[newIndex], args)
finally: finally:
self.lock.release() self.fsmLock.release()
def requestPrev(self, *args): def requestPrev(self, *args):
"""request the 'previous' state in the predefined state array""" """request the 'previous' state in the predefined state array"""
self.lock.acquire() self.fsmLock.acquire()
try: try:
assert self.state in self.stateArray assert self.state in self.stateArray
@ -409,7 +409,7 @@ class FSM(DirectObject):
self.request(self.stateArray[newIndex], args) self.request(self.stateArray[newIndex], args)
finally: finally:
self.lock.release() self.fsmLock.release()
def __setState(self, newState, *args): def __setState(self, newState, *args):
@ -479,7 +479,7 @@ class FSM(DirectObject):
""" """
Print out something useful about the fsm Print out something useful about the fsm
""" """
self.lock.acquire() self.fsmLock.acquire()
try: try:
className = self.__class__.__name__ className = self.__class__.__name__
if self.state: if self.state:
@ -488,4 +488,4 @@ class FSM(DirectObject):
str = ('%s FSM:%s not in any state' % (className, self.name)) str = ('%s FSM:%s not in any state' % (className, self.name))
return str return str
finally: finally:
self.lock.release() self.fsmLock.release()