[pypy-commit] pypy stm-thread-2: Use charp_inspect_abort_info().

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: stm-thread-2
Changeset: r61590:0155e5adde15
Date: 2013-02-22 11:14 +0100
http://bitbucket.org/pypy/pypy/changeset/0155e5adde15/

Log:	Use charp_inspect_abort_info().

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,7 +39,6 @@
         '_atomic_enter':           'interp_atomic.atomic_enter',
         '_exclusive_atomic_enter': 'interp_atomic.exclusive_atomic_enter',
         '_atomic_exit':            'interp_atomic.atomic_exit',
-        '_raw_last_abort_info':    'interp_atomic.raw_last_abort_info',
         'last_abort_info':         'interp_atomic.last_abort_info',
     }
 
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
@@ -41,15 +41,14 @@
     raise wrap_thread_error(space,
         "atomic.__exit__(): more exits than enters")
 
-def raw_last_abort_info(space):
-    return space.wrap(rstm.inspect_abort_info())
-
 def last_abort_info(space):
-    p = rstm.inspect_abort_info()
+    from rpython.rlib.rstm import charp_inspect_abort_info
+    p = charp_inspect_abort_info()
     if not p:
         return space.w_None
     assert p[0] == 'l'
     w_obj, p = bdecode(space, p)
+    assert p[0] == '\0'
     return w_obj
 
 def bdecode(space, p):