--------------------- PatchSet 5519 Date: 2007/08/28 12:30:47 Author: amosjeffries Branch: squid3-ipv6 Tag: (none) Log: Fix: unprotected component-specific code. - statCounter.syscalls.{polls|selects} depends on HAVE_POLL Members: src/comm_select.cc:1.12.6.5->1.12.6.6 Index: squid3/src/comm_select.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/comm_select.cc,v retrieving revision 1.12.6.5 retrieving revision 1.12.6.6 diff -u -r1.12.6.5 -r1.12.6.6 --- squid3/src/comm_select.cc 11 Jun 2007 07:24:23 -0000 1.12.6.5 +++ squid3/src/comm_select.cc 28 Aug 2007 12:30:47 -0000 1.12.6.6 @@ -1,6 +1,6 @@ /* - * $Id: comm_select.cc,v 1.12.6.5 2007/06/11 07:24:23 amosjeffries Exp $ + * $Id: comm_select.cc,v 1.12.6.6 2007/08/28 12:30:47 amosjeffries Exp $ * * DEBUG: section 5 Socket Functions * @@ -227,7 +227,11 @@ getCurrentTime(); +#if HAVE_POLL + statCounter.syscalls.polls++; +#else statCounter.syscalls.selects++; +#endif if (select(maxfd, &read_mask, &write_mask, NULL, &zero_tv) < 1) return incoming_sockets_accepted; @@ -438,7 +442,11 @@ for (;;) { poll_time.tv_sec = msec / 1000; poll_time.tv_usec = (msec % 1000) * 1000; +#if HAVE_POLL + statCounter.syscalls.polls++; +#else statCounter.syscalls.selects++; +#endif num = select(maxfd, &readfds, &writefds, NULL, &poll_time); statCounter.select_loops++; @@ -709,7 +717,11 @@ else continue; +#if HAVE_POLL + statCounter.syscalls.polls++; +#else statCounter.syscalls.selects++; +#endif errno = 0;