summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorferrieux <ferrieux@users.sourceforge.net>2012-03-22 07:33:06 (GMT)
committerferrieux <ferrieux@users.sourceforge.net>2012-03-22 07:33:06 (GMT)
commit4469b8019b142def58d2f77fae3229675667eefe (patch)
tree1915806bce38b781a02158d41fd5ac0362006a83
parentcc0dacf5bd3ad288d41dd1d53e2e31c651c4ad53 (diff)
downloadtcl-4469b8019b142def58d2f77fae3229675667eefe.zip
tcl-4469b8019b142def58d2f77fae3229675667eefe.tar.gz
tcl-4469b8019b142def58d2f77fae3229675667eefe.tar.bz2
Implement tip 398 : Quickly Exit with Non-Blocking Blocked Channels. This is simply a revert of the (C part of the) 1025712d5b commit of 2011-08-17.
-rw-r--r--generic/tclIO.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c
index 082cf70..cf875a8 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -414,8 +414,8 @@ TclFinalizeIOSubsystem(void)
statePtr != NULL;
statePtr = statePtr->nextCSPtr) {
chanPtr = statePtr->topChanPtr;
- if (!GotFlag(statePtr, CHANNEL_INCLOSE | CHANNEL_CLOSED | CHANNEL_DEAD)
- || GotFlag(statePtr, BG_FLUSH_SCHEDULED)) {
+ if (!GotFlag(statePtr, CHANNEL_INCLOSE | CHANNEL_CLOSED |
+ CHANNEL_DEAD)) {
active = 1;
break;
}
@@ -458,7 +458,6 @@ TclFinalizeIOSubsystem(void)
* The refcount is greater than zero, so flush the channel.
*/
- ResetFlag(statePtr, BG_FLUSH_SCHEDULED);
Tcl_Flush((Tcl_Channel) chanPtr);
/*