From: hno <> Date: Sun, 7 Nov 2004 05:11:39 +0000 (+0000) Subject: Bug #1043: syscalls.sock.read/write and syscalls.sock.sockets are not accounted corre... X-Git-Tag: SQUID_3_0_PRE4~1001 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=523353b75fd3f82808c2d3f801411cf578ee33fd;p=thirdparty%2Fsquid.git Bug #1043: syscalls.sock.read/write and syscalls.sock.sockets are not accounted correctly. --- diff --git a/src/comm.cc b/src/comm.cc index 0d6666a62d..3a638a90d3 100644 --- a/src/comm.cc +++ b/src/comm.cc @@ -1,6 +1,6 @@ /* - * $Id: comm.cc,v 1.396 2004/10/18 12:20:09 hno Exp $ + * $Id: comm.cc,v 1.397 2004/11/06 22:11:39 hno Exp $ * * DEBUG: section 5 Socket Functions * AUTHOR: Harvest Derived @@ -844,7 +844,7 @@ comm_write_try(int fd, void *data) assert(Fc->write.handler != NULL); /* Attempt a write */ - statCounter.syscalls.sock.reads++; + statCounter.syscalls.sock.writes++; errno = 0; retval = FD_WRITE_METHOD(fd, Fc->write.buf + Fc->write.curofs, Fc->write.size - Fc->write.curofs); debug(5, 3) ("comm_write_try: fd %d: tried to write %d bytes, retval %d, errno %d\n", @@ -1298,8 +1298,6 @@ commResetFD(ConnectStateData * cs) int fd2 = socket(AF_INET, SOCK_STREAM, 0); - statCounter.syscalls.sock.sockets++; - if (fd2 < 0) { debug(5, 0) ("commResetFD: socket: %s\n", xstrerror());