---------------------
PatchSet 6273 
Date: 2007/12/13 20:14:42
Author: rousskov
Branch: async-calls
Tag: (none) 
Log:
Removed calls to comm_iocallbackpending(). They were added to "Speed up
processing of queued events significantly, to not cause large delays when
under low load" but I do not see how having pending callbacks can be relevant
because all pending callbacks are (should be) executed before FDs are probed.

The comm_iocallbackpending() function may be changed or gone so I am
minimizing its dependencies.

Members: 
	src/comm_poll.cc:1.17->1.17.4.1 
	src/comm_select.cc:1.19->1.19.14.1 
	src/comm_select_win32.cc:1.5->1.5.20.1 

Index: squid3/src/comm_poll.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/comm_poll.cc,v
retrieving revision 1.17
retrieving revision 1.17.4.1
diff -u -r1.17 -r1.17.4.1
--- squid3/src/comm_poll.cc	1 Sep 2007 13:51:03 -0000	1.17
+++ squid3/src/comm_poll.cc	13 Dec 2007 20:14:42 -0000	1.17.4.1
@@ -1,6 +1,6 @@
 
 /*
- * $Id: comm_poll.cc,v 1.17 2007/09/01 13:51:03 squidadm Exp $
+ * $Id: comm_poll.cc,v 1.17.4.1 2007/12/13 20:14:42 rousskov Exp $
  *
  * DEBUG: section 5     Socket Functions
  *
@@ -383,9 +383,6 @@
 
         PROF_stop(comm_poll_prep_pfds);
 
-        if (comm_iocallbackpending())
-            npending++;
-
         if (npending)
             msec = 0;
 
Index: squid3/src/comm_select.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/comm_select.cc,v
retrieving revision 1.19
retrieving revision 1.19.14.1
diff -u -r1.19 -r1.19.14.1
--- squid3/src/comm_select.cc	10 Jun 2007 12:50:38 -0000	1.19
+++ squid3/src/comm_select.cc	13 Dec 2007 20:14:42 -0000	1.19.14.1
@@ -1,6 +1,6 @@
 
 /*
- * $Id: comm_select.cc,v 1.19 2007/06/10 12:50:38 squidadm Exp $
+ * $Id: comm_select.cc,v 1.19.14.1 2007/12/13 20:14:42 rousskov Exp $
  *
  * DEBUG: section 5     Socket Functions
  *
@@ -429,9 +429,6 @@
         if (msec > MAX_POLL_TIME)
             msec = MAX_POLL_TIME;
 
-        if (comm_iocallbackpending())
-            pending++;
-
         if (pending)
             msec = 0;
 
Index: squid3/src/comm_select_win32.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/comm_select_win32.cc,v
retrieving revision 1.5
retrieving revision 1.5.20.1
diff -u -r1.5 -r1.5.20.1
--- squid3/src/comm_select_win32.cc	30 Apr 2007 17:51:35 -0000	1.5
+++ squid3/src/comm_select_win32.cc	13 Dec 2007 20:14:42 -0000	1.5.20.1
@@ -1,6 +1,6 @@
 
 /*
- * $Id: comm_select_win32.cc,v 1.5 2007/04/30 17:51:35 squidadm Exp $
+ * $Id: comm_select_win32.cc,v 1.5.20.1 2007/12/13 20:14:42 rousskov Exp $
  *
  * DEBUG: section 5     Socket Functions
  *
@@ -467,9 +467,6 @@
         if (msec > MAX_POLL_TIME)
             msec = MAX_POLL_TIME;
 
-        if (comm_iocallbackpending())
-            pending++;
-
         if (pending)
             msec = 0;