diff options
author | hobbs <hobbs@noemail.net> | 2000-04-24 23:32:12 (GMT) |
---|---|---|
committer | hobbs <hobbs@noemail.net> | 2000-04-24 23:32:12 (GMT) |
commit | 294430a56a1cd365d302c21371e397b9046867db (patch) | |
tree | 50b19f689249d3877bc99eca02c7d44395247a21 /unix | |
parent | 83cc0b1e2526936bd13d320b4ab13dfc4846999f (diff) | |
download | tcl-294430a56a1cd365d302c21371e397b9046867db.zip tcl-294430a56a1cd365d302c21371e397b9046867db.tar.gz tcl-294430a56a1cd365d302c21371e397b9046867db.tar.bz2 |
* unix/tclUnixNotfy.c (Tcl_FinalizeNotifier, NotifierThreadProc):
added write of 'q' into triggerPipe for notifier in threaded case,
so that Tcl doesn't hang when children are still running [Bug: 4139]
* unix/tclUnixThrd.c (Tcl_MutexLock): minor comment fixes.
FossilOrigin-Name: b63233fd7f25b01da308adb425c8a26a6f11c837
Diffstat (limited to 'unix')
-rw-r--r-- | unix/tclUnixNotfy.c | 40 | ||||
-rw-r--r-- | unix/tclUnixThrd.c | 4 |
2 files changed, 31 insertions, 13 deletions
diff --git a/unix/tclUnixNotfy.c b/unix/tclUnixNotfy.c index 7d63228..f376746 100644 --- a/unix/tclUnixNotfy.c +++ b/unix/tclUnixNotfy.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclUnixNotfy.c,v 1.9 2000/04/09 16:04:20 kupries Exp $ + * RCS: @(#) $Id: tclUnixNotfy.c,v 1.10 2000/04/24 23:32:13 hobbs Exp $ */ #include "tclInt.h" @@ -264,7 +264,20 @@ Tcl_FinalizeNotifier(clientData) if (triggerPipe < 0) { panic("Tcl_FinalizeNotifier: notifier pipe not initialized"); } + + /* + * Send "q" message to the notifier thread so that it will + * terminate. The notifier will return from its call to select() + * and notice that a "q" message has arrived, it will then close + * its side of the pipe and terminate its thread. Note the we can + * not just close the pipe and check for EOF in the notifier + * thread because if a background child process was created with + * exec, select() would not register the EOF on the pipe until the + * child processes had terminated. [Bug: 4139] + */ + write(triggerPipe, "q", 1); close(triggerPipe); + Tcl_ConditionWait(¬ifierCV, ¬ifierMutex, NULL); } @@ -963,10 +976,10 @@ NotifierThreadProc(clientData) Tcl_ConditionNotify(&tsdPtr->waitCV); if (tsdPtr->onList) { /* - * Remove the ThreadSpecificData structure of this thread - * from the waiting list. This prevents us from continuously - * spining on select until the other threads runs and - * services the file event. + * Remove the ThreadSpecificData structure of this + * thread from the waiting list. This prevents us from + * continuously spining on select until the other + * threads runs and services the file event. */ if (tsdPtr->prevPtr) { @@ -991,13 +1004,18 @@ NotifierThreadProc(clientData) * to avoid a race condition we only read one at a time. */ - if ((masks[index] & bit) && (read(receivePipe, buf, 1) == 0)) { - /* - * Someone closed the write end of the pipe so we need to - * shut down the notifier thread. - */ + if (masks[index] & bit) { + i = read(receivePipe, buf, 1); - break; + if ((i == 0) || ((i == 1) && (buf[0] == 'q'))) { + /* + * Someone closed the write end of the pipe or sent us a + * Quit message [Bug: 4139] and then closed the write end + * of the pipe so we need to shut down the notifier thread. + */ + + break; + } } } diff --git a/unix/tclUnixThrd.c b/unix/tclUnixThrd.c index f4a5dca..16e2315 100644 --- a/unix/tclUnixThrd.c +++ b/unix/tclUnixThrd.c @@ -356,7 +356,7 @@ Tcl_MutexLock(mutexPtr) MASTER_LOCK; if (*mutexPtr == NULL) { /* - * Double inside master lock check to avoid a race. + * Double inside master lock check to avoid a race condition. */ pmutexPtr = (pthread_mutex_t *)ckalloc(sizeof(pthread_mutex_t)); @@ -374,7 +374,7 @@ Tcl_MutexLock(mutexPtr) /* *---------------------------------------------------------------------- * - * TclpMutexUnlock -- + * Tcl_MutexUnlock -- * * This procedure is invoked to unlock a mutex. The mutex must * have been locked by Tcl_MutexLock. |