This fix (across 4 files in 3 directories) solves a subtle problem with
signal handlers in a fork()ed child process when Python is compiled with thread support. The bug was reported by Scott <scott@chronis.icgroup.com>. What happens is that after a fork(), the variables used by the signal module to determine whether this is the main thread or not are bogus, and it decides that no thread is the main thread, so no signals will be delivered. The solution is the addition of PyOS_AfterFork(), which fixes the signal module's variables. A dummy version of the function is present in the intrcheck.c source file which is linked when the signal module is not used.
This commit is contained in:
parent
c9fd600640
commit
359bcaa539
|
@ -37,6 +37,7 @@ PERFORMANCE OF THIS SOFTWARE.
|
||||||
|
|
||||||
extern int PyOS_InterruptOccurred Py_PROTO((void));
|
extern int PyOS_InterruptOccurred Py_PROTO((void));
|
||||||
extern void PyOS_InitInterrupts Py_PROTO((void));
|
extern void PyOS_InitInterrupts Py_PROTO((void));
|
||||||
|
void PyOS_AfterFork Py_PROTO((void));
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
|
|
|
@ -1082,6 +1082,7 @@ posix_fork(self, args)
|
||||||
pid = fork();
|
pid = fork();
|
||||||
if (pid == -1)
|
if (pid == -1)
|
||||||
return posix_error();
|
return posix_error();
|
||||||
|
PyOS_AfterFork();
|
||||||
return PyInt_FromLong((long)pid);
|
return PyInt_FromLong((long)pid);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -613,3 +613,12 @@ PyOS_InterruptOccurred()
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
PyOS_AfterFork()
|
||||||
|
{
|
||||||
|
#ifdef WITH_THREAD
|
||||||
|
main_thread = get_thread_ident();
|
||||||
|
main_pid = getpid();
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
|
@ -219,3 +219,8 @@ PyOS_InterruptOccurred()
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* !OK */
|
#endif /* !OK */
|
||||||
|
|
||||||
|
void
|
||||||
|
PyOS_AfterFork()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue