Author: Armin Rigo <[email protected]>
Branch: stmgc-c7
Changeset: r71225:0c5682724b3f
Date: 2014-05-03 12:23 +0200
http://bitbucket.org/pypy/pypy/changeset/0c5682724b3f/
Log: Add logic to display the conflicts more nicely. Getting the
occasional crash for now.
diff --git a/lib_pypy/atomic.py b/lib_pypy/atomic.py
new file mode 100644
--- /dev/null
+++ b/lib_pypy/atomic.py
@@ -0,0 +1,87 @@
+"""
+API for accessing the multithreading extensions of PyPy
+"""
+import thread
+
+try:
+ from __pypy__ import thread as _thread
+ from __pypy__.thread import atomic
+except ImportError:
+ # Not a STM-enabled PyPy. We can still provide a version of 'atomic'
+ # that is good enough for our purposes. With this limited version,
+ # an atomic block in thread X will not prevent running thread Y, if
+ # thread Y is not within an atomic block at all.
+ atomic = thread.allocate_lock()
+
+ def print_abort_info(mintime=0.0):
+ pass
+
+else:
+ import re, sys, linecache
+
+ _timing_reasons = [
+ "'outside transaction'",
+ "'run current'",
+ "'run committed'",
+ "'run aborted write write'",
+ "'run aborted write read'",
+ "'run aborted inevitable'",
+ "'run aborted other'",
+ "'wait free segment'",
+ "'wait write read'",
+ "'wait inevitable'",
+ "'wait other'",
+ "'sync commit soon'",
+ "'bookkeeping'",
+ "'minor gc'",
+ "'major gc'",
+ "'sync pause'",
+ ]
+ _r_line = re.compile(r'File "(.*?)", line (\d+), in ')
+ _fullfilenames = {}
+
+ def print_abort_info(mintime=0.0):
+ a, b, c, d = _thread.longest_abort_info()
+ if b <= mintime:
+ return
+ print >> sys.stderr, "Conflict",
+ try:
+ reason = _timing_reasons[a]
+ except IndexError:
+ reason = "'%s'" % (a,)
+ print >> sys.stderr, reason,
+ def show(line):
+ print >> sys.stderr, " ", line
+ match = _r_line.match(line)
+ if match:
+ filename = match.group(1)
+ lineno = int(match.group(2))
+ if filename.startswith('...'):
+ if filename not in _fullfilenames:
+ partial = filename[3:]
+ found = set()
+ for module in sys.modules.values():
+ try:
+ modfile = object.__getattribute__(module,
'__file__')
+ except Exception:
+ modfile = None
+ if type(modfile) is str and
modfile.endswith(partial):
+ found.add(modfile)
+ if len(found) == 1:
+ _fullfilenames[filename], = found
+ else:
+ _fullfilenames[filename] = None
+ filename = _fullfilenames[filename]
+ line = linecache.getline(filename, lineno)
+ if line:
+ print >> sys.stderr, " ", line.strip()
+ if d:
+ print >> sys.stderr, "between two threads:"
+ show(c)
+ show(d)
+ else:
+ print >> sys.stderr, "in this thread:"
+ show(c)
+ print >> sys.stderr, 'Lost %.6f seconds.' % (b,)
+ print >> sys.stderr
+ _thread.reset_longest_abort_info()
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
