Author: Armin Rigo <[email protected]>
Branch:
Changeset: r320:5c9bb48bb75d
Date: 2015-03-03 13:30 +0100
http://bitbucket.org/pypy/benchmarks/changeset/5c9bb48bb75d/
Log: Modernize: the "atomic" module no longer exists
diff --git a/multithread/common/abstract_threading.py
b/multithread/common/abstract_threading.py
--- a/multithread/common/abstract_threading.py
+++ b/multithread/common/abstract_threading.py
@@ -3,18 +3,17 @@
import thread, atexit, sys, time
try:
- from atomic import (atomic, getsegmentlimit, print_abort_info,
- hint_commit_soon, is_atomic)
-except:
+ from pypystm import atomic, getsegmentlimit, hint_commit_soon
+except ImportError:
+ raise
atomic = RLock()
def getsegmentlimit():
return 1
- def print_abort_info(tm=0.0):
- pass
def hint_commit_soon():
pass
- def is_atomic():
- return atomic._RLock__count > 0
+
+def print_abort_info(tm=0.0):
+ "backward compatibility: no-op"
class TLQueue_concurrent(object):
@@ -114,7 +113,7 @@
def shutdown(self):
for w in self.workers:
- self.input_queue.put((print_abort_info, (), {}))
+ #self.input_queue.put((print_abort_info, (), {}))
self.input_queue.put((sys.exit, (), {}))
for w in self.workers:
w.join()
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
