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

Some optimizations in scheduler

Browse Source
This commit is contained in:
Anton Ryzhov 2013-06-20 12:41:46 +04:00
parent baf9aaf26c
commit 7430a8ca40
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sleekxmpp/xmlstream/scheduler.py
View File

@ -139,24 +139,26 @@ class Scheduler(object):
self.run = True self.run = True
try: try:
while self.run and not self.stop.is_set(): while self.run and not self.stop.is_set():
wait = 0.1
updated = False updated = False
if self.schedule: if self.schedule:
wait = self.schedule[0].next - time.time() wait = self.schedule[0].next - time.time()
else:
wait = 0.1
try: try:
if wait <= 0.0: if wait <= 0.0:
newtask = self.addq.get(False) newtask = self.addq.get(False)
else: else:
if wait >= 3.0: if wait > 3.0:
wait = 3.0 wait = 3.0
newtask = None newtask = None
elapsed = 0 elapsed = 0
while not self.stop.is_set() and \ while self.run and \
not self.stop.is_set() and \
newtask is None and \ newtask is None and \
elapsed < wait: elapsed < wait:
newtask = self.addq.get(True, 0.1) newtask = self.addq.get(True, 0.1)
elapsed += 0.1 elapsed += 0.1
except QueueEmpty: except QueueEmpty: # Time to run some tasks, and no new tasks to add.
self.schedule_lock.acquire() self.schedule_lock.acquire()
# select only those tasks which are to be executed now # select only those tasks which are to be executed now
relevant = itertools.takewhile( relevant = itertools.takewhile(
@ -174,11 +176,11 @@ class Scheduler(object):
# only need to resort tasks if a repeated task has # only need to resort tasks if a repeated task has
# been kept in the list. # been kept in the list.
updated = True updated = True
else: else: # Add new task
updated = True
self.schedule_lock.acquire() self.schedule_lock.acquire()
if newtask is not None: if newtask is not None:
self.schedule.append(newtask) self.schedule.append(newtask)
updated = True
finally: finally:
if updated: if updated:
self.schedule.sort(key=lambda task: task.next) self.schedule.sort(key=lambda task: task.next)