summaryrefslogtreecommitdiff
path: root/sleekxmpp/xmlstream
diff options
context:
space:
mode:
authorAnton Ryzhov <anton@ryzhov.me>2013-06-20 13:07:57 +0400
committerAnton Ryzhov <anton@ryzhov.me>2013-06-20 18:30:07 +0400
commit805f1c0e392b29dd335ea6b62b6c08a17a7f6e2c (patch)
tree23b007c40bffd2591e2115ebfd9332226154db0b /sleekxmpp/xmlstream
parent7430a8ca401a4ece1b9e717e3f45c9c93dda6960 (diff)
downloadslixmpp-805f1c0e392b29dd335ea6b62b6c08a17a7f6e2c.tar.gz
slixmpp-805f1c0e392b29dd335ea6b62b6c08a17a7f6e2c.tar.bz2
slixmpp-805f1c0e392b29dd335ea6b62b6c08a17a7f6e2c.tar.xz
slixmpp-805f1c0e392b29dd335ea6b62b6c08a17a7f6e2c.zip
Use timeout constants instead of magic numbers in scheduler and event loop
Set default wait timeout as max() of previous values
Diffstat (limited to 'sleekxmpp/xmlstream')
-rw-r--r--sleekxmpp/xmlstream/scheduler.py15
-rw-r--r--sleekxmpp/xmlstream/xmlstream.py9
2 files changed, 16 insertions, 8 deletions
diff --git a/sleekxmpp/xmlstream/scheduler.py b/sleekxmpp/xmlstream/scheduler.py
index d57b2271..2efa7d1e 100644
--- a/sleekxmpp/xmlstream/scheduler.py
+++ b/sleekxmpp/xmlstream/scheduler.py
@@ -20,6 +20,11 @@ import itertools
from sleekxmpp.util import Queue, QueueEmpty
+#: The time in seconds to wait for events from the event queue, and also the
+#: time between checks for the process stop signal.
+WAIT_TIMEOUT = 1.0
+
+
log = logging.getLogger(__name__)
@@ -120,6 +125,10 @@ class Scheduler(object):
#: Lock for accessing the task queue.
self.schedule_lock = threading.RLock()
+ #: The time in seconds to wait for events from the event queue,
+ #: and also the time between checks for the process stop signal.
+ self.wait_timeout = WAIT_TIMEOUT
+
def process(self, threaded=True, daemon=False):
"""Begin accepting and processing scheduled tasks.
@@ -143,7 +152,7 @@ class Scheduler(object):
if self.schedule:
wait = self.schedule[0].next - time.time()
else:
- wait = 0.1
+ wait = self.wait_timeout
try:
if wait <= 0.0:
newtask = self.addq.get(False)
@@ -156,8 +165,8 @@ class Scheduler(object):
not self.stop.is_set() and \
newtask is None and \
elapsed < wait:
- newtask = self.addq.get(True, 0.1)
- elapsed += 0.1
+ newtask = self.addq.get(True, self.wait_timeout)
+ elapsed += self.wait_timeout
except QueueEmpty: # Time to run some tasks, and no new tasks to add.
self.schedule_lock.acquire()
# select only those tasks which are to be executed now
diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py
index 478bd9c0..bf2e01fa 100644
--- a/sleekxmpp/xmlstream/xmlstream.py
+++ b/sleekxmpp/xmlstream/xmlstream.py
@@ -49,7 +49,7 @@ RESPONSE_TIMEOUT = 30
#: The time in seconds to wait for events from the event queue, and also the
#: time between checks for the process stop signal.
-WAIT_TIMEOUT = 0.1
+WAIT_TIMEOUT = 1.0
#: The number of threads to use to handle XML stream events. This is not the
#: same as the number of custom event handling threads.
@@ -1629,8 +1629,7 @@ class XMLStream(object):
try:
while not self.stop.is_set():
try:
- wait = self.wait_timeout
- event = self.event_queue.get(True, timeout=wait)
+ event = self.event_queue.get(True, timeout=self.wait_timeout)
except QueueEmpty:
event = None
if event is None:
@@ -1693,13 +1692,13 @@ class XMLStream(object):
while not self.stop.is_set():
while not self.stop.is_set() and \
not self.session_started_event.is_set():
- self.session_started_event.wait(timeout=0.1)
+ self.session_started_event.wait(timeout=0.1) # Wait for session start
if self.__failed_send_stanza is not None:
data = self.__failed_send_stanza
self.__failed_send_stanza = None
else:
try:
- data = self.send_queue.get(True, 1)
+ data = self.send_queue.get(True, timeout=self.wait_timeout) # Wait for data to send
except QueueEmpty:
continue
log.debug("SEND: %s", data)