---------------------
PatchSet 6138 
Date: 2007/11/16 19:08:15
Author: chtsanti
Branch: async-calls
Tag: (none) 
Log:
Using the new async calls interface to schedule the ICAPXaction::noteCommConnected method. The ICAPXaction::reusedConnection not used any more

Members: 
	src/ICAP/ICAPXaction.cc:1.22.4.3->1.22.4.4 
	src/ICAP/ICAPXaction.h:1.11.14.1->1.11.14.2 

Index: squid3/src/ICAP/ICAPXaction.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ICAP/ICAPXaction.cc,v
retrieving revision 1.22.4.3
retrieving revision 1.22.4.4
diff -u -r1.22.4.3 -r1.22.4.4
--- squid3/src/ICAP/ICAPXaction.cc	15 Nov 2007 21:18:10 -0000	1.22.4.3
+++ squid3/src/ICAP/ICAPXaction.cc	16 Nov 2007 19:08:15 -0000	1.22.4.4
@@ -111,12 +111,7 @@
     if (connection >= 0) {
         debugs(93,3, HERE << "reused pconn FD " << connection);
         connector = &ICAPXaction_noteCommConnected; // make doneAll() false
-        eventAdd("ICAPXaction::reusedConnection",
-             reusedConnection,
-             this,
-             0.0,
-             0,
-             true);
+	CallJobHere1(93,3, this, ICAPXaction::noteCommConnected, COMM_OK);
         return;
     }
 
@@ -145,6 +140,7 @@
  * This event handler is necessary to work around the no-rentry policy
  * of ICAPXaction::callStart()
  */
+#if 0
 void
 ICAPXaction::reusedConnection(void *data)
 {
@@ -152,6 +148,7 @@
     ICAPXaction *x = (ICAPXaction*)data;
     x->noteCommConnected(COMM_OK);
 }
+#endif
 
 void ICAPXaction::closeConnection()
 {
@@ -190,8 +187,6 @@
 // connection with the ICAP service established
 void ICAPXaction::noteCommConnected(comm_err_t commStatus)
 {
-    ICAPXaction_Enter(noteCommConnected);
-
     Must(connector);
     connector = NULL;
 
@@ -201,8 +196,6 @@
     fd_table[connection].noteUse(icapPconnPool);
 
     handleCommConnected();
-
-    ICAPXaction_Exit();
 }
 
 void ICAPXaction::dieOnConnectionFailure() {
Index: squid3/src/ICAP/ICAPXaction.h
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/ICAP/ICAPXaction.h,v
retrieving revision 1.11.14.1
retrieving revision 1.11.14.2
diff -u -r1.11.14.1 -r1.11.14.2
--- squid3/src/ICAP/ICAPXaction.h	13 Nov 2007 22:32:12 -0000	1.11.14.1
+++ squid3/src/ICAP/ICAPXaction.h	16 Nov 2007 19:08:15 -0000	1.11.14.2
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ICAPXaction.h,v 1.11.14.1 2007/11/13 22:32:12 chtsanti Exp $
+ * $Id: ICAPXaction.h,v 1.11.14.2 2007/11/16 19:08:15 chtsanti Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -141,7 +141,9 @@
     PF *closer;
 
 private:
+#if 0
     static void reusedConnection(void *data);
+#endif
 
     //CBDATA_CLASS2(ICAPXaction);
 };