issue 9786 Native TLS support for pthreads

Kristján Valur Jónsson · Kristján Valur Jónsson · commit 2fea9b961d6e · 2010-09-20T02:11:49.000Z
PyThread_create_key now has a failure mode that the applicatino can detect.
diff --git a/Python/pystate.c b/Python/pystate.c
@@ -569,6 +569,8 @@ _PyGILState_Init(PyInterpreterState *i, PyThreadState *t)
 {
     assert(i && t); /* must init with valid states */
     autoTLSkey = PyThread_create_key();
+    if (autoTLSkey == -1)
+        Py_FatalError("Could not allocate TLS entry");
     autoInterpreterState = i;
     assert(PyThread_get_key_value(autoTLSkey) == NULL);
     assert(t->gilstate_counter == 0);
diff --git a/Python/thread_nt.h b/Python/thread_nt.h
@@ -315,7 +315,10 @@ _pythread_nt_set_stacksize(size_t size)
 int
 PyThread_create_key(void)
 {
-    return (int) TlsAlloc();
+    DWORD result= TlsAlloc();
+    if (result == TLS_OUT_OF_INDEXES)
+        return -1;
+    return (int)result;
 }
 
 void
diff --git a/Python/thread_pthread.h b/Python/thread_pthread.h
@@ -558,3 +558,46 @@ _pythread_pthread_set_stacksize(size_t size)
 }
 
 #define THREAD_SET_STACKSIZE(x) _pythread_pthread_set_stacksize(x)
+
+#define Py_HAVE_NATIVE_TLS
+
+int
+PyThread_create_key(void)
+{
+    pthread_key_t key;
+    int fail = pthread_key_create(&key, NULL);
+    return fail ? -1 : key;
+}
+
+void
+PyThread_delete_key(int key)
+{
+    pthread_key_delete(key);
+}
+
+void
+PyThread_delete_key_value(int key)
+{
+    pthread_setspecific(key, NULL);
+}
+
+int
+PyThread_set_key_value(int key, void *value)
+{
+    int fail;
+    void *oldValue = pthread_getspecific(key);
+    if (oldValue != NULL)
+        return 0;
+    fail = pthread_setspecific(key, value);
+    return fail ? -1 : 0;
+}
+
+void *
+PyThread_get_key_value(int key)
+{
+    return pthread_getspecific(key);
+}
+
+void
+PyThread_ReInitTLS(void)
+{}

Original file line number	Diff line number	Diff line change
`@@ -569,6 +569,8 @@ _PyGILState_Init(PyInterpreterState i, PyThreadState t)`
`569`	`569`	`{`
`570`	`570`	`assert(i && t); /* must init with valid states */`
`571`	`571`	`autoTLSkey = PyThread_create_key();`
	`572`	`+ if (autoTLSkey == -1)`
	`573`	`+ Py_FatalError("Could not allocate TLS entry");`
`572`	`574`	`autoInterpreterState = i;`
`573`	`575`	`assert(PyThread_get_key_value(autoTLSkey) == NULL);`
`574`	`576`	`assert(t->gilstate_counter == 0);`
Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,10 @@ _pythread_nt_set_stacksize(size_t size)`
`315`	`315`	`int`
`316`	`316`	`PyThread_create_key(void)`
`317`	`317`	`{`
`318`		`- return (int) TlsAlloc();`
	`318`	`+ DWORD result= TlsAlloc();`
	`319`	`+ if (result == TLS_OUT_OF_INDEXES)`
	`320`	`+ return -1;`
	`321`	`+ return (int)result;`
`319`	`322`	`}`
`320`	`323`
`321`	`324`	`void`