mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-29 14:15:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Issue #2302: Fix a race condition in SocketServer.BaseServer.shutdown,

Browse source 
where the method could block indefinitely if called just before the
event loop started running.  This also fixes the occasional freezes
witnessed in test_httpservers.
This commit is contained in:
Antoine Pitrou 2010-04-25 21:40:32 +00:00
parent 1ca8c19b65
commit a624040d72
3 changed files with 44 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Lib/SocketServer.py
View file

@ -198,7 +198,7 @@ class BaseServer:
self.server_address = server_address
self.RequestHandlerClass = RequestHandlerClass
self.__is_shut_down = threading.Event()
self.__serving = False
self.__shutdown_request = False
def server_activate(self):
"""Called by constructor to activate the server.
@ -215,17 +215,19 @@ class BaseServer:
self.timeout. If you need to do periodic tasks, do them in
another thread.
"""
self.__serving = True
self.__is_shut_down.clear()
while self.__serving:
# XXX: Consider using another file descriptor or
# connecting to the socket to wake this up instead of
# polling. Polling reduces our responsiveness to a
# shutdown request and wastes cpu at all other times.
r, w, e = select.select([self], [], [], poll_interval)
if r:
self._handle_request_noblock()
self.__is_shut_down.set()
try:
while not self.__shutdown_request:
# XXX: Consider using another file descriptor or
# connecting to the socket to wake this up instead of
# polling. Polling reduces our responsiveness to a
# shutdown request and wastes cpu at all other times.
r, w, e = select.select([self], [], [], poll_interval)
if self in r:
self._handle_request_noblock()
finally:
self.__shutdown_request = False
self.__is_shut_down.set()
def shutdown(self):
"""Stops the serve_forever loop.
@ -234,7 +236,7 @@ class BaseServer:
serve_forever() is running in another thread, or it will
deadlock.
"""
self.__serving = False
self.__shutdown_request = True
self.__is_shut_down.wait()
# The distinction between handling, getting, processing and