summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandreask <andreask>2013-10-28 20:21:13 (GMT)
committerandreask <andreask>2013-10-28 20:21:13 (GMT)
commit31743e869875ae77eabfb6f822fc014b0822ccf9 (patch)
tree0f1d87c5d3ee8205c14f8da57003ab902ddf98f2
parenta768abbd8e38f9b00f174006ccd0050e3f0881c3 (diff)
downloadtcl-31743e869875ae77eabfb6f822fc014b0822ccf9.zip
tcl-31743e869875ae77eabfb6f822fc014b0822ccf9.tar.gz
tcl-31743e869875ae77eabfb6f822fc014b0822ccf9.tar.bz2
Tweak to the fix. Tcl_InitNotifier() hangs. Removed. Fixes exec. Unclear about Rivet with original case.
-rw-r--r--unix/tclUnixNotfy.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/unix/tclUnixNotfy.c b/unix/tclUnixNotfy.c
index 025dfd4..505d205 100644
--- a/unix/tclUnixNotfy.c
+++ b/unix/tclUnixNotfy.c
@@ -1344,21 +1344,16 @@ AtForkChildProc(void)
/*
* Reset the notifier reference count to zero (i.e. not initialized).
* This should force the notifier initialization code to be re-run the
- * very next time Tcl_InitNotifier is called, which will be just below
- * this statement.
+ * very next time Tcl_InitNotifier is called.
+ *
+ * For a plain [exec ...] this will not happen, and everything is fine.
+ * For a full fork of the interpreter (like apache Rivet) it is not clear
+ * to me (AK) where TIN would be called.
*/
notifierCount = 0;
/*
- * Force the notifier subsystem to be initialized now. This should
- * create the notifier thread in this process. Subsequently, that new
- * thread will re-open the trigger pipe.
- */
-
- Tcl_InitNotifier();
-
- /*
* Finally, release the notifier mutex (which has been held since the
* AtForkPrepareProc() was called via pthread_atfork()).
*/