forks/apenwarr-redo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use signal.setitimer instead of signal.alarm.

Browse source 
This gives us more precise timeouts, so that when _try_read hits a race
condition, we don't suffer as badly.
This commit is contained in:
Avery Pennarun 2018-11-17 10:21:11 -05:00
commit 80aafaf290
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
jwack.py
View file

@ -59,7 +59,7 @@ def _try_read(fd, n):
assert(state.is_flushed()) assert(state.is_flushed())
oldh = signal.signal(signal.SIGALRM, _timeout) oldh = signal.signal(signal.SIGALRM, _timeout)
try: try:
signal.alarm(1) # emergency fallback signal.setitimer(signal.ITIMER_REAL, 0.01, 0.01) # emergency fallback
try: try:
b = os.read(_fds[0], 1) b = os.read(_fds[0], 1)
except OSError, e: except OSError, e:
@ -69,7 +69,7 @@ def _try_read(fd, n):
else: else:
raise raise
finally: finally:
signal.alarm(0) signal.setitimer(signal.ITIMER_REAL, 0, 0)
signal.signal(signal.SIGALRM, oldh) signal.signal(signal.SIGALRM, oldh)
return b and b or None # None means EOF return b and b or None # None means EOF