summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2014-08-22 13:20:21 (GMT)
committerdgp <dgp@users.sourceforge.net>2014-08-22 13:20:21 (GMT)
commitcaf6744b7571b6e56828b99073e32ad159a1ffa4 (patch)
tree5ce08e6e9a603476f670e79665f63e7efb7e3eac
parentefe771bd6741517d20bc6260f4d3669d7a699b66 (diff)
downloadtcl-caf6744b7571b6e56828b99073e32ad159a1ffa4.zip
tcl-caf6744b7571b6e56828b99073e32ad159a1ffa4.tar.gz
tcl-caf6744b7571b6e56828b99073e32ad159a1ffa4.tar.bz2
Same results; simpler logic.dgp_slow_read
-rw-r--r--generic/tclIO.c28
1 files changed, 7 insertions, 21 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c
index 4f81770..93ac937 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -8853,36 +8853,22 @@ DoRead(
break;
}
- /* If there is no full buffer, attempt to create and/or fill one. */
-
-if (bufPtr == NULL || BytesLeft(bufPtr) < bytesToRead) {
- 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 (GotFlag(statePtr, 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;