--------------------- PatchSet 6000 Date: 2007/10/23 22:42:04 Author: chtsanti Branch: async-calls Tag: (none) Log: Makes AsyncJob virtual base class for ICAPInitiator and basic implementation of AsyncJob interface for ICAPServiceRep class Members: src/ICAP/ICAPInitiator.h:1.3->1.3.22.1 src/ICAP/ICAPServiceRep.cc:1.16->1.16.4.1 src/ICAP/ICAPServiceRep.h:1.11->1.11.4.1 Index: squid3/src/ICAP/ICAPInitiator.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/ICAP/ICAPInitiator.h,v retrieving revision 1.3 retrieving revision 1.3.22.1 diff -u -r1.3 -r1.3.22.1 --- squid3/src/ICAP/ICAPInitiator.h 8 May 2007 16:51:27 -0000 1.3 +++ squid3/src/ICAP/ICAPInitiator.h 23 Oct 2007 22:42:04 -0000 1.3.22.1 @@ -1,6 +1,6 @@ /* - * $Id: ICAPInitiator.h,v 1.3 2007/05/08 16:51:27 squidadm Exp $ + * $Id: ICAPInitiator.h,v 1.3.22.1 2007/10/23 22:42:04 chtsanti Exp $ * * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -43,12 +43,15 @@ * or aborting an ICAP transaction. */ +#include "AsyncJob.h" + class HttpMsg; class ICAPInitiate; -class ICAPInitiator +class ICAPInitiator: virtual public AsyncJob { public: + ICAPInitiator():AsyncJob("ICAPInitiator"){} virtual ~ICAPInitiator() {} // called when ICAP response headers are successfully interpreted Index: squid3/src/ICAP/ICAPServiceRep.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/ICAP/ICAPServiceRep.cc,v retrieving revision 1.16 retrieving revision 1.16.4.1 diff -u -r1.16 -r1.16.4.1 --- squid3/src/ICAP/ICAPServiceRep.cc 24 Jul 2007 16:51:07 -0000 1.16 +++ squid3/src/ICAP/ICAPServiceRep.cc 23 Oct 2007 22:42:06 -0000 1.16.4.1 @@ -14,7 +14,7 @@ CBDATA_CLASS_INIT(ICAPServiceRep); -ICAPServiceRep::ICAPServiceRep(): method(ICAP::methodNone), +ICAPServiceRep::ICAPServiceRep(): AsyncJob("ICAPServiceRep"), method(ICAP::methodNone), point(ICAP::pointNone), port(-1), bypass(false), theOptions(NULL), theOptionsFetcher(0), theLastUpdate(0), theSessionFailures(0), isSuspended(0), notifying(false), Index: squid3/src/ICAP/ICAPServiceRep.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/ICAP/ICAPServiceRep.h,v retrieving revision 1.11 retrieving revision 1.11.4.1 diff -u -r1.11 -r1.11.4.1 --- squid3/src/ICAP/ICAPServiceRep.h 24 Jul 2007 16:51:08 -0000 1.11 +++ squid3/src/ICAP/ICAPServiceRep.h 23 Oct 2007 22:42:07 -0000 1.11.4.1 @@ -1,6 +1,6 @@ /* - * $Id: ICAPServiceRep.h,v 1.11 2007/07/24 16:51:08 squidadm Exp $ + * $Id: ICAPServiceRep.h,v 1.11.4.1 2007/10/23 22:42:07 chtsanti Exp $ * * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -99,6 +99,11 @@ bool allows204() const; void noteFailure(); // called by transactions to report service failure + + //AsyncJob virtual methods + virtual void start(){/*Just Do nothing*/} + virtual bool doneAll() const { assert(false); return false;} + virtual void swanSong(){/*Just Do nothing*/} public: String key;