From c8aa816f783a31a2a7a3315813d563c83a73a5d1 Mon Sep 17 00:00:00 2001 From: das Date: Fri, 18 Aug 2006 11:23:22 +0000 Subject: * unix/tclUnixChan.c (TclUnixWaitForFile): with timeout < 0, if select() returns early (e.g. due to a signal), call it again instead of returning a timeout result. Fixes intermittent event-13.8 failures. --- ChangeLog | 4 ++++ unix/tclUnixChan.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ec82bc9..3debe51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -33,6 +33,10 @@ * generic/tclLink.c (LinkTraceProc): fix 64-bit signed-with-unsigned comparison warning from gcc4 -Wextra. + * unix/tclUnixChan.c (TclUnixWaitForFile): with timeout < 0, if select() + returns early (e.g. due to a signal), call it again instead of returning + a timeout result. Fixes intermittent event-13.8 failures. + 2006-08-17 Don Porter * generic/tclCompile.c: Revised the new set of expression diff --git a/unix/tclUnixChan.c b/unix/tclUnixChan.c index aacb889..552d819 100644 --- a/unix/tclUnixChan.c +++ b/unix/tclUnixChan.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclUnixChan.c,v 1.69 2006/03/27 18:08:51 andreas_kupries Exp $ + * RCS: @(#) $Id: tclUnixChan.c,v 1.70 2006/08/18 11:23:22 das Exp $ */ #include "tclInt.h" /* Internal definitions for Tcl. */ @@ -3254,6 +3254,9 @@ TclUnixWaitForFile( if (timeout == 0) { break; } + if (timeout < 0) { + continue; + } /* * The select returned early, so we need to recompute the timeout. -- cgit v0.12