summaryrefslogtreecommitdiffstats
path: root/generic/tclIO.c
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2014-08-22 13:48:50 (GMT)
committerdgp <dgp@users.sourceforge.net>2014-08-22 13:48:50 (GMT)
commit2b50c1447fc0d201d7afada548a16fc6cf6645ae (patch)
tree3463f73047f7b5a5451b8b7e40a7dc606997f8bf /generic/tclIO.c
parent08a0a8c4a05e9a2915604e90ec54b27426677f9b (diff)
parent7b2b44f56169a915474820a5d7ed5dad0016c1c2 (diff)
downloadtcl-2b50c1447fc0d201d7afada548a16fc6cf6645ae.zip
tcl-2b50c1447fc0d201d7afada548a16fc6cf6645ae.tar.gz
tcl-2b50c1447fc0d201d7afada548a16fc6cf6645ae.tar.bz2
merge 8.5; fix notifier mask bug and Tcl_Read performance regression
Diffstat (limited to 'generic/tclIO.c')
-rw-r--r--generic/tclIO.c28
1 files changed, 8 insertions, 20 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c
index 66c0be6..eaa0aeb 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -8115,7 +8115,7 @@ Tcl_NotifyChannel(
if ((chPtr->mask & mask) != 0) {
nh.nextHandlerPtr = chPtr->nextPtr;
- chPtr->proc(chPtr->clientData, mask);
+ chPtr->proc(chPtr->clientData, chPtr->mask & mask);
chPtr = nh.nextHandlerPtr;
} else {
chPtr = chPtr->nextPtr;
@@ -9513,34 +9513,22 @@ DoRead(
break;
}
- /* If there is no full buffer, attempt to create and/or fill one. */
-
- while (!IsBufferFull(bufPtr)) {
- int code;
+ /*
+ * If there is not enough data in the buffers to possibly
+ * complete the read, then go get more.
+ */
+ if (bufPtr == NULL || BytesLeft(bufPtr) < bytesToRead) {
moreData:
- code = GetInput(chanPtr);
- bufPtr = statePtr->inQueueHead;
-
- assert (bufPtr != NULL);
-
- if (statePtr->flags & (CHANNEL_EOF|CHANNEL_BLOCKED)) {
- /* Further reads cannot do any more */
- break;
- }
-
- if (code) {
+ if (GetInput(chanPtr)) {
/* Read error */
UpdateInterest(chanPtr);
TclChannelRelease((Tcl_Channel)chanPtr);
return -1;
}
-
- assert (IsBufferFull(bufPtr));
+ bufPtr = statePtr->inQueueHead;
}
- assert (bufPtr != NULL);
-
bytesRead = BytesLeft(bufPtr);
bytesWritten = bytesToRead;