From 7e42990fa1bf5246c3da44bf69226ae67d0b048c Mon Sep 17 00:00:00 2001 From: Henrik Nordstrom Date: Tue, 3 Feb 2009 21:53:43 +0100 Subject: [PATCH] Only account for read ftp data in delay pools once, not twice. The same data was accounted for twice in the delay pools resulting in half of the expected rate. --- src/ftp.cc | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/ftp.cc b/src/ftp.cc index cbe509e56a..d532726795 100644 --- a/src/ftp.cc +++ b/src/ftp.cc @@ -1301,34 +1301,18 @@ FtpStateData::dataRead(const CommIoCbParams &io) assert(io.fd == data.fd); -#if DELAY_POOLS - - DelayId delayId = entry->mem_obj->mostBytesAllowed(); - -#endif - if (EBIT_TEST(entry->flags, ENTRY_ABORTED)) { abortTransaction("entry aborted during dataRead"); return; } - if (io.flag == COMM_OK && io.size > 0) { -#if DELAY_POOLS - delayId.bytesIn(io.size); -#endif - - } - - if (io.flag == COMM_OK && io.size > 0) { debugs(9,5,HERE << "appended " << io.size << " bytes to readBuf"); data.readBuf->appended(io.size); #if DELAY_POOLS - DelayId delayId = entry->mem_obj->mostBytesAllowed(); delayId.bytesIn(io.size); #endif - IOStats.Ftp.reads++; for (j = io.size - 1, bin = 0; j; bin++) -- 2.47.3