summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorferrieux <ferrieux@users.sourceforge.net>2010-12-10 17:16:08 (GMT)
committerferrieux <ferrieux@users.sourceforge.net>2010-12-10 17:16:08 (GMT)
commite10a7bd72ca6e7e93c3428ebfb032bb8d1f248ac (patch)
treedad1690e17a7f2c51a69e08b8ecfddbf22c07e03 /generic
parent92a6e8dcd31160d612f98c6615366047e6ab48ae (diff)
downloadtcl-e10a7bd72ca6e7e93c3428ebfb032bb8d1f248ac.zip
tcl-e10a7bd72ca6e7e93c3428ebfb032bb8d1f248ac.tar.gz
tcl-e10a7bd72ca6e7e93c3428ebfb032bb8d1f248ac.tar.bz2
[backport] Make sure [fcopy -size ... -command ...] always calls the callback asynchronously, even for size zero.
Diffstat (limited to 'generic')
-rw-r--r--generic/tclIO.c39
1 files changed, 38 insertions, 1 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c
index ebbb3d1..1bd4cdd 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.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: tclIO.c,v 1.137.2.17 2010/03/20 17:53:07 dkf Exp $
+ * RCS: @(#) $Id: tclIO.c,v 1.137.2.18 2010/12/10 17:16:08 ferrieux Exp $
*/
#include "tclInt.h"
@@ -8467,6 +8467,33 @@ Tcl_FileEventObjCmd(
/*
*----------------------------------------------------------------------
*
+ * ZeroTransferTimerProc --
+ *
+ * Timer handler scheduled by TclCopyChannel so that -command is
+ * called asynchronously even when -size is 0.
+ *
+ * Results:
+ * None.
+ *
+ * Side effects:
+ * Calls CopyData for -command invocation.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static void
+ZeroTransferTimerProc(
+ ClientData clientData)
+{
+ /* calling CopyData with mask==0 still implies immediate invocation of the
+ * -command callback, and completion of the fcopy.
+ */
+ CopyData(clientData, 0);
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
* TclCopyChannel --
*
* This routine copies data from one channel to another, either
@@ -8573,6 +8600,16 @@ TclCopyChannel(
outStatePtr->csPtrW = csPtr;
/*
+ * Special handling of -size 0 async transfers, so that the -command is
+ * still called asynchronously.
+ */
+
+ if ((nonBlocking == CHANNEL_NONBLOCKING) && (toRead == 0)) {
+ Tcl_CreateTimerHandler(0, ZeroTransferTimerProc, csPtr);
+ return 0;
+ }
+
+ /*
* Start copying data between the channels.
*/