diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2014-11-21 01:04:21 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2014-11-21 01:04:21 (GMT) |
| commit | b9a4501179eec7762fcf3536833707f58d2474d2 (patch) | |
| tree | 3bad8bed599dae83840223a687aaa98c70ef1895 /Python/thread_pthread.h | |
| parent | 527d4ace8537a4db6dca65955a41470be4f07269 (diff) | |
| download | cpython-b9a4501179eec7762fcf3536833707f58d2474d2.zip cpython-b9a4501179eec7762fcf3536833707f58d2474d2.tar.gz cpython-b9a4501179eec7762fcf3536833707f58d2474d2.tar.bz2 | |
Issue #21963: backout issue #1856 patch (avoid crashes and lockups when
daemon threads run while the interpreter is shutting down; instead,
these threads are now killed when they try to take the GIL), as it seems
to break some existing code.
Diffstat (limited to 'Python/thread_pthread.h')
| -rw-r--r-- | Python/thread_pthread.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Python/thread_pthread.h b/Python/thread_pthread.h index 0c1fdfe..c9ed796 100644 --- a/Python/thread_pthread.h +++ b/Python/thread_pthread.h @@ -242,9 +242,9 @@ void PyThread_exit_thread(void) { dprintf(("PyThread_exit_thread called\n")); - if (!initialized) + if (!initialized) { exit(0); - pthread_exit(0); + } } #ifdef USE_SEMAPHORES |