summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2014-08-22 13:23:04 (GMT)
committerdgp <dgp@users.sourceforge.net>2014-08-22 13:23:04 (GMT)
commit7b2b44f56169a915474820a5d7ed5dad0016c1c2 (patch)
tree5ce08e6e9a603476f670e79665f63e7efb7e3eac /generic
parent1701073d70f7be8200bd59362047199dedbd60b6 (diff)
parentcaf6744b7571b6e56828b99073e32ad159a1ffa4 (diff)
downloadtcl-7b2b44f56169a915474820a5d7ed5dad0016c1c2.zip
tcl-7b2b44f56169a915474820a5d7ed5dad0016c1c2.tar.gz
tcl-7b2b44f56169a915474820a5d7ed5dad0016c1c2.tar.bz2
Correct performance regression in a series of short binary reads from a
socket. Many thanks to Eric Boudaillier for the report and testing support.
Diffstat (limited to 'generic')
-rw-r--r--generic/tclIO.c26
1 files changed, 7 insertions, 19 deletions
diff --git a/generic/tclIO.c b/generic/tclIO.c
index 4452ae9..93ac937 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -8853,34 +8853,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 (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;