Change IOLoop._timeouts from a sorted list to a heapq.

Closes #195

diff --git a/tornado/ioloop.py b/tornado/ioloop.py
index d4bec01a16dcf5fdb4d31ac29760277e4b6ad2ed..b7101672fb681c7205d87b0c679bc476255aea68 100644 (file)
--- a/tornado/ioloop.py
+++ b/tornado/ioloop.py
@@ -16,8 +16,8 @@
 
 """A level-triggered I/O loop for non-blocking sockets."""
 
-import bisect
 import errno
+import heapq
 import os
 import logging
 import select
@@ -225,12 +225,17 @@ class IOLoop(object):
 
             if self._timeouts:
                 now = time.time()
-                while self._timeouts and self._timeouts[0].deadline <= now:
-                    timeout = self._timeouts.pop(0)
-                    self._run_callback(timeout.callback)
-                if self._timeouts:
-                    milliseconds = self._timeouts[0].deadline - now
-                    poll_timeout = min(milliseconds, poll_timeout)
+                while self._timeouts:
+                    if self._timeouts[0].callback is None:
+                        # the timeout was cancelled
+                        heapq.heappop(self._timeouts)
+                    elif self._timeouts[0].deadline <= now:
+                        timeout = heapq.heappop(self._timeouts)
+                        self._run_callback(timeout.callback)
+                    else:
+                        milliseconds = self._timeouts[0].deadline - now
+                        poll_timeout = min(milliseconds, poll_timeout)
+                        break
 
             if not self._running:
                 break
@@ -312,7 +317,7 @@ class IOLoop(object):
         Returns a handle that may be passed to remove_timeout to cancel.
         """
         timeout = _Timeout(deadline, stack_context.wrap(callback))
-        bisect.insort(self._timeouts, timeout)
+        heapq.heappush(self._timeouts, timeout)
         return timeout
 
     def remove_timeout(self, timeout):
@@ -320,7 +325,12 @@ class IOLoop(object):
 
         The argument is a handle as returned by add_timeout.
         """
-        self._timeouts.remove(timeout)
+        # Removing from a heap is complicated, so just leave the defunct
+        # timeout object in the queue (see discussion in 
+        # http://docs.python.org/library/heapq.html).
+        # If this turns out to be a problem, we could add a garbage
+        # collection pass whenever there are too many dead timeouts.
+        timeout.callback = None
 
     def add_callback(self, callback):
         """Calls the given callback on the next I/O loop iteration.
@@ -388,8 +398,8 @@ class _Timeout(object):
         self.callback = callback
 
     def __lt__(self, other):
-        return ((self.deadline, id(self.callback)) <
-                (other.deadline, id(other.callback)))
+        return ((self.deadline, id(self)) <
+                (other.deadline, id(other)))
 
 
 class PeriodicCallback(object):