From e68df0fbe51fc6980d48265e85664341f74fc9eb Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Fri, 13 Jun 2008 00:26:50 +0000 Subject: Merged revisions 64212 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r64212 | benjamin.peterson | 2008-06-12 19:09:47 -0500 (Thu, 12 Jun 2008) | 3 lines #1683 prevent forking from interfering in threading storage This should prevent some test_multiprocessing failures ........ --- Python/thread.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'Python/thread.c') diff --git a/Python/thread.c b/Python/thread.c index f2da8c6b8a..41fa1e6313 100644 --- a/Python/thread.c +++ b/Python/thread.c @@ -377,4 +377,35 @@ PyThread_delete_key_value(int key) PyThread_release_lock(keymutex); } +/* Forget everything not associated with the current thread id. + * This function is called from PyOS_AfterFork(). It is necessary + * because other thread ids which were in use at the time of the fork + * may be reused for new threads created in the forked process. + */ +void +PyThread_ReInitTLS(void) +{ + long id = PyThread_get_thread_ident(); + struct key *p, **q; + + if (!keymutex) + return; + + /* As with interpreter_lock in PyEval_ReInitThreads() + we just create a new lock without freeing the old one */ + keymutex = PyThread_allocate_lock(); + + /* Delete all keys which do not match the current thread id */ + q = &keyhead; + while ((p = *q) != NULL) { + if (p->id != id) { + *q = p->next; + free((void *)p); + /* NB This does *not* free p->value! */ + } + else + q = &p->next; + } +} + #endif /* Py_HAVE_NATIVE_TLS */ -- cgit v1.2.1