jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Lance Stout
2012-08-10 14:15:55 -07:00
parent 14aa831169 f7a710e55b
commit 962dfad216
6 changed files with 44 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sleekxmpp/thirdparty/statemachine.py vendored
View File

@@ -29,7 +29,7 @@ class StateMachine(object):
if state in self.__states:
raise IndexError("The state '%s' is already in the StateMachine." % state)
self.__states.append(state)
finally:
finally:
self.lock.release()
@@ -83,11 +83,14 @@ class StateMachine(object):
if not to_state in self.__states:
raise ValueError("StateMachine does not contain to_state %s." % to_state)
if self.__current_state == to_state:
return True
start = time.time()
while not self.lock.acquire(False):
time.sleep(.001)
if (start + wait - time.time()) <= 0.0:
log.debug("Could not acquire lock")
log.debug("==== Could not acquire lock in %s sec: %s -> %s ", wait, self.__current_state, to_state)
return False
while not self.__current_state in from_states:
@@ -108,7 +111,7 @@ class StateMachine(object):
# some 'false' value returned from func,
# indicating that transition should not occur:
if not return_val:
if not return_val:
return return_val
log.debug(' ==== TRANSITION %s -> %s', self.__current_state, to_state)
@@ -193,9 +196,9 @@ class StateMachine(object):
while not self.__current_state in states:
# detect timeout:
remainder = start + wait - time.time()
if remainder > 0:
if remainder > 0:
self.lock.wait(remainder)
else:
else:
self.lock.release()
return False
self.lock.release()
@@ -241,7 +244,7 @@ class _StateCtx:
while not self.state_machine[self.from_state] or not self.state_machine.lock.acquire(False):
# detect timeout:
remainder = start + self.wait - time.time()
if remainder > 0:
if remainder > 0:
self.state_machine.lock.wait(remainder)
else:
log.debug('StateMachine timeout while waiting for state: %s', self.from_state)