--------------------- PatchSet 412 Date: 2002/12/16 20:50:44 Author: rbcollins Branch: unify-io Tag: (none) Log: eliminate IOStrategy, it's too broad for now Members: src/IOStrategy.cc:1.1.2.1->1.1.2.2(DEAD) src/IOStrategy.h:1.1.2.5->1.1.2.6(DEAD) src/Makefile.am:1.10.10.4->1.10.10.5 src/ufscommon.h:1.1.20.62->1.1.20.63 src/fs/aufs/store_asyncufs.h:1.2.12.43->1.2.12.44 src/fs/aufs/store_dir_aufs.cc:1.2.12.37->1.2.12.38 src/fs/diskd/store_diskd.h:1.1.20.46->1.1.20.47 src/fs/ufs/store_ufs.h:1.1.20.33->1.1.20.34 --- squid3/src/IOStrategy.cc Wed Feb 14 12:14:41 2007 +++ /dev/null Wed Feb 14 12:14:22 2007 @@ -1,39 +0,0 @@ - -/* - * $Id: IOStrategy.cc,v 1.1.2.1 2002/12/03 11:06:59 rbcollins Exp $ - * - * DEBUG: section ?? Swap Dir base object - * AUTHOR: Robert Collins - * - * SQUID Web Proxy Cache http://www.squid-cache.org/ - * ---------------------------------------------------------- - * - * Squid is the result of efforts by numerous individuals from - * the Internet community; see the CONTRIBUTORS file for full - * details. Many organizations have provided support for Squid's - * development; see the SPONSORS file for full details. Squid is - * Copyrighted (C) 2001 by the Regents of the University of - * California; see the COPYRIGHT file for full details. Squid - * incorporates software developed and/or copyrighted by other - * sources; see the CREDITS file for full details. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. - * - */ - -#include "squid.h" -#include "IOStrategy.h" - - --- squid3/src/IOStrategy.h Wed Feb 14 12:14:41 2007 +++ /dev/null Wed Feb 14 12:14:22 2007 @@ -1,51 +0,0 @@ - -/* - * $Id: IOStrategy.h,v 1.1.2.5 2002/12/05 20:48:15 rbcollins Exp $ - * - * - * SQUID Web Proxy Cache http://www.squid-cache.org/ - * ---------------------------------------------------------- - * - * Squid is the result of efforts by numerous individuals from - * the Internet community; see the CONTRIBUTORS file for full - * details. Many organizations have provided support for Squid's - * development; see the SPONSORS file for full details. Squid is - * Copyrighted (C) 2001 by the Regents of the University of - * California; see the COPYRIGHT file for full details. Squid - * incorporates software developed and/or copyrighted by other - * sources; see the CREDITS file for full details. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. - * - */ - -#ifndef SQUID_IOSTRATEGY_H -#define SQUID_IOSTRATEGY_H - -#include "StoreIOState.h" - -class IOStrategy -{ -public: - virtual bool shedLoad() = 0; - virtual void deleteSelf() const = 0; - virtual void openFailed(){} - virtual int load(){return -1;} - virtual StoreIOState::Pointer createState(SwapDir *, StoreEntry *, STIOCB *, void *)const = 0; - /* virtual void strategyStats(StoreEntry *sentry) const = 0; */ - /* virtual void dumpCacheDirParams(StoreEntry * e, const char *option) const = 0; */ -}; - -#endif /* SQUID_IOSTRATEGY_H */ Index: squid3/src/Makefile.am =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/Makefile.am,v retrieving revision 1.10.10.4 retrieving revision 1.10.10.5 diff -u -r1.10.10.4 -r1.10.10.5 --- squid3/src/Makefile.am 3 Dec 2002 11:06:59 -0000 1.10.10.4 +++ squid3/src/Makefile.am 16 Dec 2002 20:50:44 -0000 1.10.10.5 @@ -1,7 +1,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.am,v 1.10.10.4 2002/12/03 11:06:59 rbcollins Exp $ +# $Id: Makefile.am,v 1.10.10.5 2002/12/16 20:50:44 rbcollins Exp $ # # Uncomment and customize the following to suit your needs: # @@ -179,8 +179,6 @@ icp_v3.cc \ ident.cc \ internal.cc \ - IOStrategy.cc \ - IOStrategy.h \ ipc.cc \ ipcache.cc \ IPInterception.cc \ Index: squid3/src/ufscommon.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/Attic/ufscommon.h,v retrieving revision 1.1.20.62 retrieving revision 1.1.20.63 diff -u -r1.1.20.62 -r1.1.20.63 --- squid3/src/ufscommon.h 15 Dec 2002 19:27:29 -0000 1.1.20.62 +++ squid3/src/ufscommon.h 16 Dec 2002 20:50:44 -0000 1.1.20.63 @@ -1,6 +1,6 @@ /* - * $Id: ufscommon.h,v 1.1.20.62 2002/12/15 19:27:29 rbcollins Exp $ + * $Id: ufscommon.h,v 1.1.20.63 2002/12/16 20:50:44 rbcollins Exp $ * * SQUID Web Proxy Cache http://www.squid-cache.org/ * ---------------------------------------------------------- @@ -150,9 +150,8 @@ virtual bool error() const = 0; }; -#include "IOStrategy.h" /* UFS dir specific IO calls */ -class UFSStrategy : public IOStrategy +class UFSStrategy { public: virtual bool shedLoad() = 0; @@ -166,6 +165,8 @@ STIOCB *, void *); StoreIOState::Pointer create(SwapDir *, StoreEntry *, STFNCB *, STIOCB *, void *); + /* virtual void strategyStats(StoreEntry *sentry) const = 0; */ + /* virtual void dumpCacheDirParams(StoreEntry * e, const char *option) const = 0; */ }; /* Common ufs-store-dir logic */ Index: squid3/src/fs/aufs/store_asyncufs.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/fs/aufs/Attic/store_asyncufs.h,v retrieving revision 1.2.12.43 retrieving revision 1.2.12.44 diff -u -r1.2.12.43 -r1.2.12.44 --- squid3/src/fs/aufs/store_asyncufs.h 15 Dec 2002 12:19:50 -0000 1.2.12.43 +++ squid3/src/fs/aufs/store_asyncufs.h 16 Dec 2002 20:50:45 -0000 1.2.12.44 @@ -164,7 +164,6 @@ virtual void unlinkFile(char const *); }; -#include "IOStrategy.h" class AufsIO : public UFSStrategy { public: Index: squid3/src/fs/aufs/store_dir_aufs.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/fs/aufs/Attic/store_dir_aufs.cc,v retrieving revision 1.2.12.37 retrieving revision 1.2.12.38 diff -u -r1.2.12.37 -r1.2.12.38 --- squid3/src/fs/aufs/store_dir_aufs.cc 15 Dec 2002 12:19:50 -0000 1.2.12.37 +++ squid3/src/fs/aufs/store_dir_aufs.cc 16 Dec 2002 20:50:45 -0000 1.2.12.38 @@ -1,6 +1,6 @@ /* - * $Id: store_dir_aufs.cc,v 1.2.12.37 2002/12/15 12:19:50 rbcollins Exp $ + * $Id: store_dir_aufs.cc,v 1.2.12.38 2002/12/16 20:50:45 rbcollins Exp $ * * DEBUG: section 47 Store Directory Routines * AUTHOR: Duane Wessels @@ -39,7 +39,6 @@ #include "store_asyncufs.h" #include "ufscommon.h" #include "SwapDir.h" -#include "IOStrategy.h" MemPool *aufs_qread_pool = NULL; MemPool *aufs_qwrite_pool = NULL; Index: squid3/src/fs/diskd/store_diskd.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/fs/diskd/Attic/store_diskd.h,v retrieving revision 1.1.20.46 retrieving revision 1.1.20.47 diff -u -r1.1.20.46 -r1.1.20.47 --- squid3/src/fs/diskd/store_diskd.h 15 Dec 2002 19:50:38 -0000 1.1.20.46 +++ squid3/src/fs/diskd/store_diskd.h 16 Dec 2002 20:50:46 -0000 1.1.20.47 @@ -148,7 +148,6 @@ #define SHMBUF_BLKSZ SM_PAGE_SIZE extern diskd_stats_t diskd_stats; -#include "IOStrategy.h" class DiskdIO : public UFSStrategy { public: Index: squid3/src/fs/ufs/store_ufs.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/fs/ufs/Attic/store_ufs.h,v retrieving revision 1.1.20.33 retrieving revision 1.1.20.34 diff -u -r1.1.20.33 -r1.1.20.34 --- squid3/src/fs/ufs/store_ufs.h 16 Dec 2002 10:59:00 -0000 1.1.20.33 +++ squid3/src/fs/ufs/store_ufs.h 16 Dec 2002 20:50:48 -0000 1.1.20.34 @@ -67,7 +67,6 @@ virtual void unlinkFile (char const *); }; -#include "IOStrategy.h" class UfsIO : public UFSStrategy { public: