Author: Armin Rigo <[email protected]>
Branch: py3k-faulthandler
Changeset: r87436:bfe89f6b4c68
Date: 2016-09-28 23:28 +0100
http://bitbucket.org/pypy/pypy/changeset/bfe89f6b4c68/
Log: fixes
diff --git a/pypy/module/faulthandler/faulthandler.c
b/pypy/module/faulthandler/faulthandler.c
--- a/pypy/module/faulthandler/faulthandler.c
+++ b/pypy/module/faulthandler/faulthandler.c
@@ -12,6 +12,8 @@
#ifdef RPYTHON_LL2CTYPES
# include "../../../rpython/rlib/rvmprof/src/rvmprof.h"
#else
+# include "common_header.h"
+# include "structdef.h"
# include "rvmprof.h"
#endif
#include "src/threadlocal.h"
diff --git a/rpython/translator/c/src/threadlocal.c
b/rpython/translator/c/src/threadlocal.c
--- a/rpython/translator/c/src/threadlocal.c
+++ b/rpython/translator/c/src/threadlocal.c
@@ -28,6 +28,9 @@
assert(check_valid());
return 0;
}
+void _RPython_ThreadLocals_Acquire(void) {
+ _RPython_ThreadLocals_AcquireTimeout(-1);
+}
void _RPython_ThreadLocals_Release(void) {
assert(check_valid());
pypy_lock_release(&pypy_threadlocal_lock);
diff --git a/rpython/translator/c/src/threadlocal.h
b/rpython/translator/c/src/threadlocal.h
--- a/rpython/translator/c/src/threadlocal.h
+++ b/rpython/translator/c/src/threadlocal.h
@@ -19,10 +19,9 @@
current thread, and if not, calls the following helper. */
RPY_EXTERN char *_RPython_ThreadLocals_Build(void);
+RPY_EXTERN void _RPython_ThreadLocals_Acquire(void);
+RPY_EXTERN void _RPython_ThreadLocals_Release(void);
RPY_EXTERN int _RPython_ThreadLocals_AcquireTimeout(int max_wait_iterations);
-RPY_EXTERN void _RPython_ThreadLocals_Release(void);
-#define _RPython_ThreadLocals_Acquire() \
- (void)_RPython_ThreadLocals_AcquireTimeout(-1)
/* Must acquire/release the thread-local lock around a series of calls
to the following function */
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
