[pypy-commit] pypy stmgc-c7: Give access to this info from app-level (untested so far)

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: stmgc-c7
Changeset: r71048:9a04fbeb89a3
Date: 2014-04-28 19:08 +0200
http://bitbucket.org/pypy/pypy/changeset/9a04fbeb89a3/

Log:	Give access to this info from app-level (untested so far)

diff --git a/pypy/module/__pypy__/__init__.py b/pypy/module/__pypy__/__init__.py
--- a/pypy/module/__pypy__/__init__.py
+++ b/pypy/module/__pypy__/__init__.py
@@ -39,8 +39,8 @@
         '_atomic_enter':           'interp_atomic.atomic_enter',
         '_exclusive_atomic_enter': 'interp_atomic.exclusive_atomic_enter',
         '_atomic_exit':            'interp_atomic.atomic_exit',
-        'last_abort_info':         'interp_atomic.last_abort_info',
-        'discard_last_abort_info': 'interp_atomic.discard_last_abort_info',
+        'longest_abort_info':      'interp_atomic.longest_abort_info',
+        'reset_longest_abort_info':'interp_atomic.reset_longest_abort_info',
         'getsegmentlimit':         'interp_atomic.getsegmentlimit',
     }
     def activate(self, space):
diff --git a/pypy/module/__pypy__/interp_atomic.py b/pypy/module/__pypy__/interp_atomic.py
--- a/pypy/module/__pypy__/interp_atomic.py
+++ b/pypy/module/__pypy__/interp_atomic.py
@@ -59,8 +59,16 @@
     else:
         return space.wrap(1)
 
-def last_abort_info(space):
-    return space.w_None
+def longest_abort_info(space):
+    if space.config.translation.stm:
+        from rpython.rlib.rstm import longest_abort_info
+        a, b, c, d = longest_abort_info()
+        return space.newtuple([space.wrap(a), space.wrap(b),
+                               space.wrap(c), space.wrap(d)])
+    else:
+        return space.w_None
 
-def discard_last_abort_info(space):
-    pass
+def reset_longest_abort_info(space):
+    if space.config.translation.stm:
+        from rpython.rlib.rstm import reset_longest_abort_info
+        reset_longest_abort_info()