summaryrefslogtreecommitdiff
path: root/sleekxmpp
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-08-10 12:41:02 -0700
committerLance Stout <lancestout@gmail.com>2012-08-10 12:41:02 -0700
commitd11a67702e9f28fecbe4460f82b6c0ab0bdd740c (patch)
tree8adffa4ada46bd270468cb9fb857d34a9e21f1ce /sleekxmpp
parent4e12e228cb2fbc6fe2941070fe1ea44e01e4a9fb (diff)
downloadslixmpp-d11a67702e9f28fecbe4460f82b6c0ab0bdd740c.tar.gz
slixmpp-d11a67702e9f28fecbe4460f82b6c0ab0bdd740c.tar.bz2
slixmpp-d11a67702e9f28fecbe4460f82b6c0ab0bdd740c.tar.xz
slixmpp-d11a67702e9f28fecbe4460f82b6c0ab0bdd740c.zip
Exit transition immediately if already in the desired state.
Diffstat (limited to 'sleekxmpp')
-rw-r--r--sleekxmpp/thirdparty/statemachine.py13
1 files changed, 8 insertions, 5 deletions
diff --git a/sleekxmpp/thirdparty/statemachine.py b/sleekxmpp/thirdparty/statemachine.py
index 33d9b828..1f01a92a 100644
--- a/sleekxmpp/thirdparty/statemachine.py
+++ b/sleekxmpp/thirdparty/statemachine.py
@@ -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()
@@ -90,6 +90,9 @@ class StateMachine(object):
log.debug("Could not acquire lock")
return False
+ if self.__current_state == to_state:
+ return True
+
while not self.__current_state in from_states:
# detect timeout:
remainder = start + wait - time.time()
@@ -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)