openstack/deb-python-eventlet
Code Issues Proposed changes

Removed timer_finished method, as it was unused.

Browse Source
This commit is contained in:
Ryan Williams
2010-05-06 11:06:14 -07:00
parent 3231d3145d
commit 45ea653c85
2 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
eventlet/hubs/hub.py
View File

@@ -219,9 +219,6 @@ class BaseHub(object):
self.next_timers.append((scheduled_time, timer)) self.next_timers.append((scheduled_time, timer))
return scheduled_time return scheduled_time
def timer_finished(self, timer):
pass
def timer_canceled(self, timer): def timer_canceled(self, timer):
self.timers_canceled += 1 self.timers_canceled += 1
len_timers = len(self.timers) len_timers = len(self.timers)
@@ -229,7 +226,6 @@ class BaseHub(object):
self.timers_canceled = 0 self.timers_canceled = 0
self.timers = [t for t in self.timers if not t[1].called] self.timers = [t for t in self.timers if not t[1].called]
heapq.heapify(self.timers) heapq.heapify(self.timers)
self.timer_finished(timer)
def prepare_timers(self): def prepare_timers(self):
heappush = heapq.heappush heappush = heapq.heappush
@@ -281,7 +277,6 @@ class BaseHub(object):
heappop(t) heappop(t)
try:
try: try:
if timer.called: if timer.called:
self.timers_canceled -= 1 self.timers_canceled -= 1
@@ -292,8 +287,6 @@ class BaseHub(object):
except: except:
self.squelch_timer_exception(timer, sys.exc_info()) self.squelch_timer_exception(timer, sys.exc_info())
clear_sys_exc_info() clear_sys_exc_info()
finally:
self.timer_finished(timer)
# for debugging: # for debugging:

4
eventlet/hubs/timer.py
View File

@@ -55,7 +55,6 @@ class Timer(object):
try: try:
cb(*args, **kw) cb(*args, **kw)
finally: finally:
get_hub().timer_finished(self)
try: try:
del self.tpl del self.tpl
except AttributeError: except AttributeError:
@@ -96,10 +95,7 @@ class LocalTimer(Timer):
if self.greenlet is not None and self.greenlet.dead: if self.greenlet is not None and self.greenlet.dead:
return return
cb, args, kw = self.tpl cb, args, kw = self.tpl
try:
cb(*args, **kw) cb(*args, **kw)
finally:
get_hub().timer_finished(self)
def cancel(self): def cancel(self):
self.greenlet = None self.greenlet = None