Author: Armin Rigo <ar...@tunes.org>
Branch: stmgc-c7
Changeset: r76452:e092e933aae7
Date: 2015-03-18 10:09 +0100
http://bitbucket.org/pypy/pypy/changeset/e092e933aae7/
Log: Backout 7b2e2b3f44f0: it should now work in general (needs to be
tested)
diff --git a/rpython/rlib/rthread.py b/rpython/rlib/rthread.py
--- a/rpython/rlib/rthread.py
+++ b/rpython/rlib/rthread.py
@@ -61,9 +61,6 @@
c_thread_releaselock = llexternal('RPyThreadReleaseLock', [TLOCKP],
lltype.Signed,
_nowrapper=True) # *don't* release the GIL
-c_thread_releaselock_GIL = llexternal('RPyThreadReleaseLock', [TLOCKP],
- lltype.Signed,
- releasegil=True)
# another set of functions, this time in versions that don't cause the
# GIL to be released. Used to be there to handle the GIL lock itself,
@@ -161,11 +158,7 @@
return res
def release(self):
- if rgc.stm_is_enabled():
- func = c_thread_releaselock_GIL # XXX temporary workaround!
- else:
- func = c_thread_releaselock
- if func(self._lock) != 0:
+ if c_thread_releaselock(self._lock) != 0:
raise error("the lock was not previously acquired")
def __del__(self):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
