From: Serhiy Storchaka Date: Sat, 29 Dec 2012 19:46:37 +0000 (+0200) Subject: Issue #16640: Run less code under a lock in sched module. X-Git-Tag: v3.4.0a1~1744 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d07db96ab6942acef2e95194043d6d30ac48604e;p=python Issue #16640: Run less code under a lock in sched module. --- diff --git a/Lib/sched.py b/Lib/sched.py index ccf8ce9074..9a82a89688 100644 --- a/Lib/sched.py +++ b/Lib/sched.py @@ -71,10 +71,10 @@ class scheduler: """ if kwargs is _sentinel: kwargs = {} + event = Event(time, priority, action, argument, kwargs) with self._lock: - event = Event(time, priority, action, argument, kwargs) heapq.heappush(self._queue, event) - return event # The ID + return event # The ID def enter(self, delay, priority, action, argument=(), kwargs=_sentinel): """A variant that specifies the time as a relative time. @@ -82,9 +82,8 @@ class scheduler: This is actually the more commonly used interface. """ - with self._lock: - time = self.timefunc() + delay - return self.enterabs(time, priority, action, argument, kwargs) + time = self.timefunc() + delay + return self.enterabs(time, priority, action, argument, kwargs) def cancel(self, event): """Remove an event from the queue. @@ -165,4 +164,4 @@ class scheduler: # the actual order they would be retrieved. with self._lock: events = self._queue[:] - return map(heapq.heappop, [events]*len(events)) + return map(heapq.heappop, [events]*len(events)) diff --git a/Misc/NEWS b/Misc/NEWS index 08c0d90fbb..f606654a15 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -200,6 +200,8 @@ Core and Builtins Library ------- +- Issue #16640: Run less code under a lock in sched module. + - Issue #16165: Fix sched.scheduler.run() method was block a scheduler for other threads.