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

'wait' could delay longer than desired if waiting threads were notified but did not achieve their lock condition afterwards.

Browse Source
This commit is contained in:
Tom Nichols 2010-07-02 12:57:27 -04:00
parent 62da57a6c2
commit 661cdd2018
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sleekxmpp/xmlstream/statemachine.py
View File

@ -86,8 +86,9 @@ class StateMachine(object):
start = time.time() start = time.time()
while not self.__current_state in from_states or not self.lock.acquire(False): while not self.__current_state in from_states or not self.lock.acquire(False):
# detect timeout: # detect timeout:
if time.time() >= start + wait: return False remainder = start + wait - time.time()
self.notifier.wait(wait) if remainder > 0: self.notifier.wait(remainder)
else: return False
try: # lock is acquired; all other threads will return false or wait until notify/timeout try: # lock is acquired; all other threads will return false or wait until notify/timeout
self.notifier.clear() self.notifier.clear()
@ -180,8 +181,9 @@ class StateMachine(object):
start = time.time() start = time.time()
while not self.__current_state in states: while not self.__current_state in states:
# detect timeout: # detect timeout:
if time.time() >= start + wait: return False remainder = start + wait - time.time()
self.notifier.wait(wait) if remainder > 0: self.notifier.wait(remainder)
else: return False
return True return True
@ -227,10 +229,11 @@ class _StateCtx:
start = time.time() start = time.time()
while not self.state_machine[ self.from_state ] or not self.state_machine.lock.acquire(False): while not self.state_machine[ self.from_state ] or not self.state_machine.lock.acquire(False):
# detect timeout: # detect timeout:
if time.time() >= start + self.wait: remainder = start + self.wait - time.time()
if remainder > 0: self.state_machine.notifier.wait(remainder)
else:
log.debug('StateMachine timeout while waiting for state: %s', self.from_state ) log.debug('StateMachine timeout while waiting for state: %s', self.from_state )
return False return False
self.state_machine.notifier.wait(self.wait)
self._locked = True # lock has been acquired at this point self._locked = True # lock has been acquired at this point
self.state_machine.notifier.clear() self.state_machine.notifier.clear()