Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Reduce the size of the window between opening a socket and setting it uninheritable.

Browse Source
This commit is contained in:
Charles Haley 2014-04-20 11:56:32 +02:00
parent 7af2683b7d
commit e432dc6104
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/devices/smart_device_app/driver.py
View File

@ -130,17 +130,17 @@ class ConnectionListener(Thread):
getattr(self.driver, 'listen_socket', None) is not None: getattr(self.driver, 'listen_socket', None) is not None:
ans = select.select((self.driver.listen_socket,), (), (), 0) ans = select.select((self.driver.listen_socket,), (), (), 0)
if len(ans[0]) > 0: if len(ans[0]) > 0:
# timeout in 10 ms to detect rare case where the socket went # timeout in 10 ms to detect rare case where the socket goes
# way between the select and the accept # away between the select and the accept
try: try:
self.driver._debug('attempt to open device socket') self.driver._debug('attempt to open device socket')
device_socket = None device_socket = None
self.driver.listen_socket.settimeout(0.010) self.driver.listen_socket.settimeout(0.010)
device_socket, ign = eintr_retry_call( device_socket, ign = eintr_retry_call(
self.driver.listen_socket.accept) self.driver.listen_socket.accept)
set_socket_inherit(device_socket, False)
self.driver.listen_socket.settimeout(None) self.driver.listen_socket.settimeout(None)
device_socket.settimeout(None) device_socket.settimeout(None)
set_socket_inherit(device_socket, False)
try: try:
self.driver.connection_queue.put_nowait(device_socket) self.driver.connection_queue.put_nowait(device_socket)