Author: Armin Rigo <[email protected]>
Branch:
Changeset: r463:3fb35a967ec1
Date: 2012-06-18 16:51 +0200
http://bitbucket.org/cffi/cffi/changeset/3fb35a967ec1/
Log: Support for GCCs that don't support __thread.
diff --git a/c/_ffi_backend.c b/c/_ffi_backend.c
--- a/c/_ffi_backend.c
+++ b/c/_ffi_backend.c
@@ -16,6 +16,12 @@
#include "malloc_closure.h"
+/* Define USE__THREAD if gcc on your platform supports "__thread"
+ global variables. */
+#if !defined(MS_WIN32) && !defined(X86_DARWIN) && !defined(POWERPC_DARWIN)
+# define USE__THREAD
+#endif
+
/************************************************************/
/* base type flag: exactly one of the following: */
@@ -128,10 +134,14 @@
/* whenever running Python code, the errno is saved in this thread-local
variable */
#ifndef MS_WIN32
+# ifdef USE__THREAD
static __thread int cffi_saved_errno = 0;
static void save_errno(void) { cffi_saved_errno = errno; }
-static void *restore_errno(void) { errno = cffi_saved_errno; return NULL; }
+static void restore_errno(void) { errno = cffi_saved_errno; }
static void init_errno(void) { }
+# else
+# include "misc_thread.h"
+# endif
#endif
/************************************************************/
diff --git a/c/misc_thread.h b/c/misc_thread.h
new file mode 100644
--- /dev/null
+++ b/c/misc_thread.h
@@ -0,0 +1,23 @@
+#include <pthread.h>
+
+/* This is only included if GCC doesn't support "__thread" global variables.
+ * See USE__THREAD in _ffi_backend.c.
+ */
+
+static pthread_key_t cffi_tls_key;
+
+static void init_errno(void)
+{
+ (void) pthread_key_create(&cffi_tls_key, NULL);
+}
+
+static void save_errno(void)
+{
+ intptr_t value = errno;
+ (void) pthread_setspecific(cffi_tls_key, (void *)value);
+}
+
+static void restore_errno(void) {
+ intptr_t value = (intptr_t)pthread_getspecific(cffi_tls_key);
+ errno = value;
+}
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
