summaryrefslogtreecommitdiff
path: root/Lib/multiprocessing/managers.py
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@redhat.com>2018-07-06 13:51:52 +0200
committerGitHub <noreply@github.com>2018-07-06 13:51:52 +0200
commitc2368cbc83ca2bafeaea0e4760be4996046d0444 (patch)
treee68abf5dc1a0a3299fda6763410cb41a300cda74 /Lib/multiprocessing/managers.py
parent6f19fc6d5607040ee36153a64a2ed004582af91f (diff)
downloadcpython-git-c2368cbc83ca2bafeaea0e4760be4996046d0444.tar.gz
bpo-34054: multiprocessing uses time.monotonic() (GH-8118)
The multiprocessing module now uses the monotonic clock time.monotonic() instead of the system clock time.time() to implement timeouts.
Diffstat (limited to 'Lib/multiprocessing/managers.py')
-rw-r--r--Lib/multiprocessing/managers.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/multiprocessing/managers.py b/Lib/multiprocessing/managers.py
index 04df26bac6..3f263802bc 100644
--- a/Lib/multiprocessing/managers.py
+++ b/Lib/multiprocessing/managers.py
@@ -18,8 +18,8 @@ import sys
import threading
import array
import queue
+import time
-from time import time as _time
from traceback import format_exc
from . import connection
@@ -1045,13 +1045,13 @@ class ConditionProxy(AcquirerProxy):
if result:
return result
if timeout is not None:
- endtime = _time() + timeout
+ endtime = time.monotonic() + timeout
else:
endtime = None
waittime = None
while not result:
if endtime is not None:
- waittime = endtime - _time()
+ waittime = endtime - time.monotonic()
if waittime <= 0:
break
self.wait(waittime)