From ee382473fd21b18b7cce6db870d1560f4a26e763 Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Sun, 8 Feb 2009 22:47:46 +1300 Subject: [PATCH] Author: Henrik Nordstrom 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 1cb6d35319..1fc55893c0 100644 --- a/src/ftp.cc +++ b/src/ftp.cc @@ -1237,34 +1237,18 @@ FtpStateData::dataRead(int fd, char *buf, size_t len, comm_err_t errflag, int xe assert(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 (errflag == COMM_OK && len > 0) { -#if DELAY_POOLS - delayId.bytesIn(len); -#endif - - } - - if (errflag == COMM_OK && len > 0) { debugs(9,5,HERE << "appended " << len << " bytes to readBuf"); data.readBuf->appended(len); #if DELAY_POOLS - DelayId delayId = entry->mem_obj->mostBytesAllowed(); delayId.bytesIn(len); #endif - IOStats.Ftp.reads++; for (j = len - 1, bin = 0; j; bin++) -- 2.47.2