Commit 359bcaa5 authored by Guido van Rossum's avatar Guido van Rossum

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.
parent c9fd6006
......@@ -37,6 +37,7 @@ PERFORMANCE OF THIS SOFTWARE.
extern int PyOS_InterruptOccurred Py_PROTO((void));
extern void PyOS_InitInterrupts Py_PROTO((void));
void PyOS_AfterFork Py_PROTO((void));
#ifdef __cplusplus
}
......
......@@ -1082,6 +1082,7 @@ posix_fork(self, args)
pid = fork();
if (pid == -1)
return posix_error();
PyOS_AfterFork();
return PyInt_FromLong((long)pid);
}
#endif
......
......@@ -613,3 +613,12 @@ PyOS_InterruptOccurred()
}
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 */
void
PyOS_AfterFork()
{
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment