[Python-checkins] cpython: Fix _PyFaulthandler_Fini() so it can be called before _PyFaulthandler_Init()

Tue Jan 10 23:06:01 CET 2012

http://hg.python.org/cpython/rev/75def95e93d4
changeset: 74326:75def95e93d4
user: Victor Stinner <victor.stinner at haypocalc.com>
date: Tue Jan 10 22:44:11 2012 +0100
summary:
 Fix _PyFaulthandler_Fini() so it can be called before _PyFaulthandler_Init()
files:
 Modules/faulthandler.c | 4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c
--- a/Modules/faulthandler.c
+++ b/Modules/faulthandler.c
@@ -1282,8 +1282,8 @@
 
 #ifdef FAULTHANDLER_LATER
 /* later */
- cancel_dump_tracebacks_later();
 if (thread.cancel_event) {
+ cancel_dump_tracebacks_later();
 PyThread_release_lock(thread.cancel_event);
 PyThread_free_lock(thread.cancel_event);
 thread.cancel_event = NULL;
@@ -1296,8 +1296,8 @@
 
 #ifdef FAULTHANDLER_WATCHDOG
 /* file watchdog */
- cancel_file_watchdog();
 if (watchdog.cancel_event) {
+ cancel_file_watchdog();
 PyThread_release_lock(watchdog.cancel_event);
 PyThread_free_lock(watchdog.cancel_event);
 watchdog.cancel_event = NULL;
-- 
Repository URL: http://hg.python.org/cpython
