--------------------- PatchSet 233 Date: 2002/12/02 14:42:14 Author: rbcollins Branch: unify-io Tag: (none) Log: initial commit - separate out SwapDir type and factor out some trivial aufs code Members: configure.in:1.13->1.13.4.1 src/IOStrategy.h:1.1->1.1.2.1 src/Makefile.am:1.10->1.10.10.1 src/SwapDir.h:1.1->1.1.2.1 src/cache_cf.cc:1.4->1.4.12.1 src/store.cc:1.2->1.2.16.1 src/store_dir.cc:1.4->1.4.10.1 src/store_io.cc:1.3->1.3.10.1 src/store_rebuild.cc:1.1->1.1.20.1 src/store_swapout.cc:1.2->1.2.16.1 src/structs.h:1.9->1.9.10.1 src/typedefs.h:1.6->1.6.10.1 src/ufscommon.cc:1.4->1.4.10.1 src/fs/aufs/store_dir_aufs.cc:1.2->1.2.12.1 src/fs/aufs/store_io_aufs.cc:1.3->1.3.12.1 src/fs/coss/store_dir_coss.cc:1.4->1.4.10.1 src/fs/coss/store_io_coss.cc:1.3->1.3.10.1 src/fs/diskd/store_dir_diskd.cc:1.2->1.2.16.1 src/fs/diskd/store_io_diskd.cc:1.1->1.1.20.1 src/fs/null/store_null.cc:1.1->1.1.20.1 src/fs/ufs/store_dir_ufs.cc:1.1->1.1.20.1 src/fs/ufs/store_io_ufs.cc:1.3->1.3.10.1 Index: squid3/configure.in =================================================================== RCS file: /cvsroot/squid-sf//squid3/configure.in,v retrieving revision 1.13 retrieving revision 1.13.4.1 diff -u -r1.13 -r1.13.4.1 --- squid3/configure.in 29 Nov 2002 22:37:35 -0000 1.13 +++ squid3/configure.in 2 Dec 2002 14:42:14 -0000 1.13.4.1 @@ -3,7 +3,7 @@ dnl dnl Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9) dnl -dnl $Id: configure.in,v 1.13 2002/11/29 22:37:35 squidadm Exp $ +dnl $Id: configure.in,v 1.13.4.1 2002/12/02 14:42:14 rbcollins Exp $ dnl dnl dnl @@ -11,9 +11,9 @@ AC_PREREQ(2.52) AC_CONFIG_SRCDIR([src/main.cc]) AC_CONFIG_AUX_DIR(cfgaux) -AM_INIT_AUTOMAKE(squid, 3.0-DEVEL) +AM_INIT_AUTOMAKE(squid, 3.0-DEVEL-unifyio) AM_CONFIG_HEADER(include/autoconf.h) -AC_REVISION($Revision: 1.13 $)dnl +AC_REVISION($Revision: 1.13.4.1 $)dnl AC_PREFIX_DEFAULT(/usr/local/squid) AM_MAINTAINER_MODE --- /dev/null Wed Feb 14 12:13:05 2007 +++ squid3/src/IOStrategy.h Wed Feb 14 12:14:15 2007 @@ -0,0 +1,43 @@ + +/* + * $Id: IOStrategy.h,v 1.1.2.1 2002/12/02 14:42: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 + +class IOStrategy +{ +public: + virtual bool shedLoad() = 0; +}; + +#endif /* SQUID_IOSTRATEGY_H */ Index: squid3/src/Makefile.am =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/Makefile.am,v retrieving revision 1.10 retrieving revision 1.10.10.1 diff -u -r1.10 -r1.10.10.1 --- squid3/src/Makefile.am 23 Nov 2002 03:12:57 -0000 1.10 +++ squid3/src/Makefile.am 2 Dec 2002 14:42:15 -0000 1.10.10.1 @@ -1,7 +1,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.am,v 1.10 2002/11/23 03:12:57 squidadm Exp $ +# $Id: Makefile.am,v 1.10.10.1 2002/12/02 14:42:15 rbcollins Exp $ # # Uncomment and customize the following to suit your needs: # @@ -243,7 +243,7 @@ auth_modules.cc \ store_modules.cc \ cf_parser.h \ - globals.c \ + globals.cc \ string_arrays.c squid_LDADD = \ @@ -272,12 +272,12 @@ recv_announce_SOURCES = recv-announce.cc nodist_pinger_SOURCES = \ - globals.c + globals.cc BUILT_SOURCES = \ cf_gen_defines.h \ cf_parser.h \ - globals.c \ + globals.cc \ string_arrays.c \ repl_modules.cc \ auth_modules.cc \ @@ -327,7 +327,7 @@ snmp_core.o snmp_agent.o: ../snmplib/libsnmp.a $(top_srcdir)/include/cache_snmp.h -globals.c: globals.h mk-globals-c.pl +globals.cc: globals.h mk-globals-c.pl $(PERL) $(srcdir)/mk-globals-c.pl < $(srcdir)/globals.h > $@ string_arrays.c: enums.h mk-string-arrays.pl @@ -410,7 +410,7 @@ # fi DISTCLEANFILES = cf_gen_defines.h cf.data cf_parser.h squid.conf.default \ - globals.c string_arrays.c repl_modules.cc auth_modules.cc store_modules.cc + globals.cc string_arrays.c repl_modules.cc auth_modules.cc store_modules.cc ##install-pinger: ## @f=$(PINGER_EXE); \ --- /dev/null Wed Feb 14 12:13:05 2007 +++ squid3/src/SwapDir.h Wed Feb 14 12:14:15 2007 @@ -0,0 +1,93 @@ + +/* + * $Id: SwapDir.h,v 1.1.2.1 2002/12/02 14:42: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_SWAPDIR_H +#define SQUID_SWAPDIR_H + +struct SwapDir { +public: + const char *type; + int cur_size; + int low_size; + int max_size; + char *path; + int index; /* This entry's index into the swapDirs array */ + ssize_t max_objsize; + RemovalPolicy *repl; + int removals; + int scanned; + struct { + unsigned int selected:1; + unsigned int read_only:1; + } flags; + STINIT *init; /* Initialise the fs */ + STNEWFS *newfs; /* Create a new fs */ + STDUMP *dump; /* Dump fs config snippet */ + STFREE *freefs; /* Free the fs data */ + STDBLCHECK *dblcheck; /* Double check the obj integrity */ + STSTATFS *statfs; /* Dump fs statistics */ + STMAINTAINFS *maintainfs; /* Replacement maintainence */ + STCHECKOBJ *checkobj; /* Check if the fs will store an object */ + /* These two are notifications */ + STREFOBJ *refobj; /* Reference this object */ + STUNREFOBJ *unrefobj; /* Unreference this object */ + STCALLBACK *callback; /* Handle pending callbacks */ + STSYNC *sync; /* Sync the directory */ + struct { + STOBJCREATE *create; + STOBJOPEN *open; + STOBJCLOSE *close; + STOBJREAD *read; + STOBJWRITE *write; + STOBJUNLINK *unlink; + } obj; + struct { + STLOGOPEN *open; + STLOGCLOSE *close; + STLOGWRITE *write; + struct { + STLOGCLEANSTART *start; + STLOGCLEANNEXTENTRY *nextentry; + STLOGCLEANWRITE *write; + STLOGCLEANDONE *done; + void *state; + } clean; + int writes_since_clean; + } log; + struct { + int blksize; + } fs; + void *fsdata; +}; + +#endif /* SQUID_SWAPDIR_H */ Index: squid3/src/cache_cf.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/cache_cf.cc,v retrieving revision 1.4 retrieving revision 1.4.12.1 diff -u -r1.4 -r1.4.12.1 --- squid3/src/cache_cf.cc 16 Nov 2002 03:13:16 -0000 1.4 +++ squid3/src/cache_cf.cc 2 Dec 2002 14:42:15 -0000 1.4.12.1 @@ -1,6 +1,6 @@ /* - * $Id: cache_cf.cc,v 1.4 2002/11/16 03:13:16 squidadm Exp $ + * $Id: cache_cf.cc,v 1.4.12.1 2002/12/02 14:42:15 rbcollins Exp $ * * DEBUG: section 3 Configuration File Parsing * AUTHOR: Harvest Derived @@ -36,6 +36,7 @@ #include "squid.h" #include "authenticate.h" #include "Store.h" +#include "SwapDir.h" #if SQUID_SNMP #include "snmp.h" Index: squid3/src/store.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/store.cc,v retrieving revision 1.2 retrieving revision 1.2.16.1 diff -u -r1.2 -r1.2.16.1 --- squid3/src/store.cc 15 Oct 2002 09:27:20 -0000 1.2 +++ squid3/src/store.cc 2 Dec 2002 14:42:15 -0000 1.2.16.1 @@ -1,6 +1,6 @@ /* - * $Id: store.cc,v 1.2 2002/10/15 09:27:20 squidadm Exp $ + * $Id: store.cc,v 1.2.16.1 2002/12/02 14:42:15 rbcollins Exp $ * * DEBUG: section 20 Storage Manager * AUTHOR: Harvest Derived @@ -36,6 +36,7 @@ #include "squid.h" #include "Store.h" #include "StoreClient.h" +#include "SwapDir.h" #define REBUILD_TIMESTAMP_DELTA_MAX 2 Index: squid3/src/store_dir.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/store_dir.cc,v retrieving revision 1.4 retrieving revision 1.4.10.1 diff -u -r1.4 -r1.4.10.1 --- squid3/src/store_dir.cc 18 Nov 2002 03:12:57 -0000 1.4 +++ squid3/src/store_dir.cc 2 Dec 2002 14:42:15 -0000 1.4.10.1 @@ -1,6 +1,6 @@ /* - * $Id: store_dir.cc,v 1.4 2002/11/18 03:12:57 squidadm Exp $ + * $Id: store_dir.cc,v 1.4.10.1 2002/12/02 14:42:15 rbcollins Exp $ * * DEBUG: section 47 Store Directory Routines * AUTHOR: Duane Wessels @@ -35,6 +35,7 @@ #include "squid.h" #include "Store.h" +#include "SwapDir.h" #if HAVE_STATVFS #if HAVE_SYS_STATVFS_H Index: squid3/src/store_io.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/store_io.cc,v retrieving revision 1.3 retrieving revision 1.3.10.1 diff -u -r1.3 -r1.3.10.1 --- squid3/src/store_io.cc 18 Nov 2002 03:12:57 -0000 1.3 +++ squid3/src/store_io.cc 2 Dec 2002 14:42:15 -0000 1.3.10.1 @@ -1,6 +1,6 @@ #include "squid.h" #include "Store.h" - +#include "SwapDir.h" static struct { struct { Index: squid3/src/store_rebuild.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/store_rebuild.cc,v retrieving revision 1.1 retrieving revision 1.1.20.1 diff -u -r1.1 -r1.1.20.1 --- squid3/src/store_rebuild.cc 14 Oct 2002 00:18:20 -0000 1.1 +++ squid3/src/store_rebuild.cc 2 Dec 2002 14:42:15 -0000 1.1.20.1 @@ -1,6 +1,6 @@ /* - * $Id: store_rebuild.cc,v 1.1 2002/10/14 00:18:20 squidadm Exp $ + * $Id: store_rebuild.cc,v 1.1.20.1 2002/12/02 14:42:15 rbcollins Exp $ * * DEBUG: section 20 Store Rebuild Routines * AUTHOR: Duane Wessels @@ -35,6 +35,7 @@ #include "squid.h" #include "Store.h" +#include "SwapDir.h" static struct _store_rebuild_data counts; static struct timeval rebuild_start; Index: squid3/src/store_swapout.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/store_swapout.cc,v retrieving revision 1.2 retrieving revision 1.2.16.1 diff -u -r1.2 -r1.2.16.1 --- squid3/src/store_swapout.cc 15 Oct 2002 09:27:20 -0000 1.2 +++ squid3/src/store_swapout.cc 2 Dec 2002 14:42:15 -0000 1.2.16.1 @@ -1,6 +1,6 @@ /* - * $Id: store_swapout.cc,v 1.2 2002/10/15 09:27:20 squidadm Exp $ + * $Id: store_swapout.cc,v 1.2.16.1 2002/12/02 14:42:15 rbcollins Exp $ * * DEBUG: section 20 Storage Manager Swapout Functions * AUTHOR: Duane Wessels @@ -36,6 +36,7 @@ #include "squid.h" #include "StoreClient.h" #include "Store.h" +#include "SwapDir.h" static off_t storeSwapOutObjectBytesOnDisk(const MemObject *); static void storeSwapOutStart(StoreEntry * e); Index: squid3/src/structs.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/structs.h,v retrieving revision 1.9 retrieving revision 1.9.10.1 diff -u -r1.9 -r1.9.10.1 --- squid3/src/structs.h 18 Nov 2002 03:12:57 -0000 1.9 +++ squid3/src/structs.h 2 Dec 2002 14:42:15 -0000 1.9.10.1 @@ -1,6 +1,6 @@ /* - * $Id: structs.h,v 1.9 2002/11/18 03:12:57 squidadm Exp $ + * $Id: structs.h,v 1.9.10.1 2002/12/02 14:42:15 rbcollins Exp $ * * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -1358,61 +1358,6 @@ const char *vary_headers; }; -struct _SwapDir { - const char *type; - int cur_size; - int low_size; - int max_size; - char *path; - int index; /* This entry's index into the swapDirs array */ - ssize_t max_objsize; - RemovalPolicy *repl; - int removals; - int scanned; - struct { - unsigned int selected:1; - unsigned int read_only:1; - } flags; - STINIT *init; /* Initialise the fs */ - STNEWFS *newfs; /* Create a new fs */ - STDUMP *dump; /* Dump fs config snippet */ - STFREE *freefs; /* Free the fs data */ - STDBLCHECK *dblcheck; /* Double check the obj integrity */ - STSTATFS *statfs; /* Dump fs statistics */ - STMAINTAINFS *maintainfs; /* Replacement maintainence */ - STCHECKOBJ *checkobj; /* Check if the fs will store an object */ - /* These two are notifications */ - STREFOBJ *refobj; /* Reference this object */ - STUNREFOBJ *unrefobj; /* Unreference this object */ - STCALLBACK *callback; /* Handle pending callbacks */ - STSYNC *sync; /* Sync the directory */ - struct { - STOBJCREATE *create; - STOBJOPEN *open; - STOBJCLOSE *close; - STOBJREAD *read; - STOBJWRITE *write; - STOBJUNLINK *unlink; - } obj; - struct { - STLOGOPEN *open; - STLOGCLOSE *close; - STLOGWRITE *write; - struct { - STLOGCLEANSTART *start; - STLOGCLEANNEXTENTRY *nextentry; - STLOGCLEANWRITE *write; - STLOGCLEANDONE *done; - void *state; - } clean; - int writes_since_clean; - } log; - struct { - int blksize; - } fs; - void *fsdata; -}; - /* To hard to pull this into another file just yet. * SO, we stop globals.c seeing it */ Index: squid3/src/typedefs.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/typedefs.h,v retrieving revision 1.6 retrieving revision 1.6.10.1 diff -u -r1.6 -r1.6.10.1 --- squid3/src/typedefs.h 18 Nov 2002 03:12:57 -0000 1.6 +++ squid3/src/typedefs.h 2 Dec 2002 14:42:16 -0000 1.6.10.1 @@ -1,6 +1,6 @@ /* - * $Id: typedefs.h,v 1.6 2002/11/18 03:12:57 squidadm Exp $ + * $Id: typedefs.h,v 1.6.10.1 2002/12/02 14:42:16 rbcollins Exp $ * * * SQUID Web Proxy Cache http://www.squid-cache.org/ @@ -134,7 +134,7 @@ typedef struct _store_client store_client; typedef struct _MemObject MemObject; typedef struct _StoreEntry StoreEntry; -typedef struct _SwapDir SwapDir; +class SwapDir; typedef struct _helper_flags helper_flags; typedef struct _helper_stateful_flags helper_stateful_flags; typedef struct _http_state_flags http_state_flags; Index: squid3/src/ufscommon.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/Attic/ufscommon.cc,v retrieving revision 1.4 retrieving revision 1.4.10.1 diff -u -r1.4 -r1.4.10.1 --- squid3/src/ufscommon.cc 18 Nov 2002 03:12:57 -0000 1.4 +++ squid3/src/ufscommon.cc 2 Dec 2002 14:42:16 -0000 1.4.10.1 @@ -1,5 +1,5 @@ /* - * $Id: ufscommon.cc,v 1.4 2002/11/18 03:12:57 squidadm Exp $ + * $Id: ufscommon.cc,v 1.4.10.1 2002/12/02 14:42:16 rbcollins Exp $ * * DEBUG: section 47 Store Directory Routines * AUTHOR: Duane Wessels @@ -34,6 +34,7 @@ #include "ufscommon.h" #include "Store.h" +#include "SwapDir.h" typedef struct _RebuildState RebuildState; struct _RebuildState { 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 retrieving revision 1.2.12.1 diff -u -r1.2 -r1.2.12.1 --- squid3/src/fs/aufs/store_dir_aufs.cc 11 Nov 2002 17:31:56 -0000 1.2 +++ squid3/src/fs/aufs/store_dir_aufs.cc 2 Dec 2002 14:42:16 -0000 1.2.12.1 @@ -1,6 +1,6 @@ /* - * $Id: store_dir_aufs.cc,v 1.2 2002/11/11 17:31:56 squidadm Exp $ + * $Id: store_dir_aufs.cc,v 1.2.12.1 2002/12/02 14:42:16 rbcollins Exp $ * * DEBUG: section 47 Store Directory Routines * AUTHOR: Duane Wessels @@ -38,6 +38,8 @@ #include "store_asyncufs.h" #include "ufscommon.h" +#include "SwapDir.h" +#include "IOStrategy.h" MemPool *squidaio_state_pool = NULL; MemPool *aufs_qread_pool = NULL; @@ -52,6 +54,12 @@ /* The MAIN externally visible function */ STSETUP storeFsSetup_aufs; +class AufsIO : public IOStrategy +{ +public: + virtual bool shedLoad(); +}; + /* * storeAufsDirCheckObj * Index: squid3/src/fs/aufs/store_io_aufs.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/fs/aufs/Attic/store_io_aufs.cc,v retrieving revision 1.3 retrieving revision 1.3.12.1 diff -u -r1.3 -r1.3.12.1 --- squid3/src/fs/aufs/store_io_aufs.cc 16 Nov 2002 03:13:16 -0000 1.3 +++ squid3/src/fs/aufs/store_io_aufs.cc 2 Dec 2002 14:42:16 -0000 1.3.12.1 @@ -7,6 +7,7 @@ #include "store_asyncufs.h" #include "Store.h" #include "ufscommon.h" +#include "SwapDir.h" #if ASYNC_READ static AIOCB storeAufsReadDone; @@ -28,6 +29,25 @@ /* === PUBLIC =========================================================== */ +squidaiostate_t * +newAIOState() +{ + squidaiostate_t *result = (squidaiostate_t *)memPoolAlloc(squidaio_state_pool); + result->fd = -1; + result->flags.opening = 1; + return result; +} + +storeIOState * +newSIO(void *fsState) +{ + CBDATA_INIT_TYPE_FREECB(storeIOState, storeAufsIOFreeEntry); + storeIOState *sio = cbdataAlloc(storeIOState); + sio->fsstate = fsState; + return sio; +} + + /* open for reading */ storeIOState * storeAufsOpen(SwapDir * SD, StoreEntry * e, STFNCB * file_callback, @@ -35,7 +55,7 @@ { sfileno f = e->swap_filen; char *path = commonUfsDirFullPath(SD, f, NULL); - storeIOState *sio; + #if !ASYNC_OPEN int fd; #endif @@ -55,11 +75,7 @@ return NULL; } #endif - CBDATA_INIT_TYPE_FREECB(storeIOState, storeAufsIOFreeEntry); - sio = cbdataAlloc(storeIOState); - sio->fsstate = memPoolAlloc(squidaio_state_pool); - ((squidaiostate_t *) (sio->fsstate))->fd = -1; - ((squidaiostate_t *) (sio->fsstate))->flags.opening = 1; + storeIOState *sio = newSIO(newAIOState()); sio->swap_filen = f; sio->swap_dirn = SD->index; sio->mode = O_RDONLY | O_BINARY; @@ -80,7 +96,6 @@ storeAufsCreate(SwapDir * SD, StoreEntry * e, STFNCB * file_callback, STIOCB * callback, void *callback_data) { char *path; - storeIOState *sio; sfileno filn; sdirno dirn; #if !ASYNC_CREATE @@ -108,11 +123,7 @@ return NULL; } #endif - CBDATA_INIT_TYPE_FREECB(storeIOState, storeAufsIOFreeEntry); - sio = cbdataAlloc(storeIOState); - sio->fsstate = memPoolAlloc(squidaio_state_pool); - ((squidaiostate_t *) (sio->fsstate))->fd = -1; - ((squidaiostate_t *) (sio->fsstate))->flags.opening = 1; + storeIOState *sio = newSIO(newAIOState()); sio->swap_filen = filn; sio->swap_dirn = dirn; sio->mode = O_WRONLY | O_BINARY; Index: squid3/src/fs/coss/store_dir_coss.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/fs/coss/store_dir_coss.cc,v retrieving revision 1.4 retrieving revision 1.4.10.1 diff -u -r1.4 -r1.4.10.1 --- squid3/src/fs/coss/store_dir_coss.cc 18 Nov 2002 03:12:57 -0000 1.4 +++ squid3/src/fs/coss/store_dir_coss.cc 2 Dec 2002 14:42:16 -0000 1.4.10.1 @@ -1,6 +1,6 @@ /* - * $Id: store_dir_coss.cc,v 1.4 2002/11/18 03:12:57 squidadm Exp $ + * $Id: store_dir_coss.cc,v 1.4.10.1 2002/12/02 14:42:16 rbcollins Exp $ * * DEBUG: section 47 Store COSS Directory Routines * AUTHOR: Eric Stern @@ -39,6 +39,7 @@ #include "async_io.h" #include "store_coss.h" +#include "SwapDir.h" #define STORE_META_BUFSZ 4096 Index: squid3/src/fs/coss/store_io_coss.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/fs/coss/store_io_coss.cc,v retrieving revision 1.3 retrieving revision 1.3.10.1 diff -u -r1.3 -r1.3.10.1 --- squid3/src/fs/coss/store_io_coss.cc 18 Nov 2002 03:12:57 -0000 1.3 +++ squid3/src/fs/coss/store_io_coss.cc 2 Dec 2002 14:42:17 -0000 1.3.10.1 @@ -1,6 +1,6 @@ /* - * $Id: store_io_coss.cc,v 1.3 2002/11/18 03:12:57 squidadm Exp $ + * $Id: store_io_coss.cc,v 1.3.10.1 2002/12/02 14:42:17 rbcollins Exp $ * * DEBUG: section 79 Storage Manager COSS Interface * AUTHOR: Eric Stern @@ -38,6 +38,7 @@ #include #include "async_io.h" #include "store_coss.h" +#include "SwapDir.h" static DWCB storeCossWriteMemBufDone; static DRCB storeCossReadDone; Index: squid3/src/fs/diskd/store_dir_diskd.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/fs/diskd/Attic/store_dir_diskd.cc,v retrieving revision 1.2 retrieving revision 1.2.16.1 diff -u -r1.2 -r1.2.16.1 --- squid3/src/fs/diskd/store_dir_diskd.cc 28 Oct 2002 22:45:38 -0000 1.2 +++ squid3/src/fs/diskd/store_dir_diskd.cc 2 Dec 2002 14:42:17 -0000 1.2.16.1 @@ -1,6 +1,6 @@ /* - * $Id: store_dir_diskd.cc,v 1.2 2002/10/28 22:45:38 squidadm Exp $ + * $Id: store_dir_diskd.cc,v 1.2.16.1 2002/12/02 14:42:17 rbcollins Exp $ * * DEBUG: section 47 Store Directory Routines * AUTHOR: Duane Wessels @@ -44,6 +44,8 @@ #include "ufscommon.h" +#include "SwapDir.h" + diskd_stats_t diskd_stats; MemPool *diskd_state_pool = NULL; Index: squid3/src/fs/diskd/store_io_diskd.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/fs/diskd/Attic/store_io_diskd.cc,v retrieving revision 1.1 retrieving revision 1.1.20.1 diff -u -r1.1 -r1.1.20.1 --- squid3/src/fs/diskd/store_io_diskd.cc 14 Oct 2002 00:18:25 -0000 1.1 +++ squid3/src/fs/diskd/store_io_diskd.cc 2 Dec 2002 14:42:17 -0000 1.1.20.1 @@ -1,6 +1,6 @@ /* - * $Id: store_io_diskd.cc,v 1.1 2002/10/14 00:18:25 squidadm Exp $ + * $Id: store_io_diskd.cc,v 1.1.20.1 2002/12/02 14:42:17 rbcollins Exp $ * * DEBUG: section 79 Squid-side DISKD I/O functions. * AUTHOR: Duane Wessels @@ -42,6 +42,7 @@ #include #include "store_diskd.h" +#include "SwapDir.h" static int storeDiskdSend(int, SwapDir *, int, storeIOState *, int, int, off_t); static void storeDiskdIOCallback(storeIOState * sio, int errflag); Index: squid3/src/fs/null/store_null.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/fs/null/store_null.cc,v retrieving revision 1.1 retrieving revision 1.1.20.1 diff -u -r1.1 -r1.1.20.1 --- squid3/src/fs/null/store_null.cc 14 Oct 2002 00:18:25 -0000 1.1 +++ squid3/src/fs/null/store_null.cc 2 Dec 2002 14:42:17 -0000 1.1.20.1 @@ -1,6 +1,6 @@ /* - * $Id: store_null.cc,v 1.1 2002/10/14 00:18:25 squidadm Exp $ + * $Id: store_null.cc,v 1.1.20.1 2002/12/02 14:42:17 rbcollins Exp $ * * DEBUG: section 47 Store Directory Routines * AUTHOR: Duane Wessels @@ -39,6 +39,7 @@ #include #endif #endif +#include "SwapDir.h" static int null_initialised = 0; static void storeNullDirInit(SwapDir * sd); Index: squid3/src/fs/ufs/store_dir_ufs.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/fs/ufs/store_dir_ufs.cc,v retrieving revision 1.1 retrieving revision 1.1.20.1 diff -u -r1.1 -r1.1.20.1 --- squid3/src/fs/ufs/store_dir_ufs.cc 14 Oct 2002 00:18:25 -0000 1.1 +++ squid3/src/fs/ufs/store_dir_ufs.cc 2 Dec 2002 14:42:18 -0000 1.1.20.1 @@ -1,6 +1,6 @@ /* - * $Id: store_dir_ufs.cc,v 1.1 2002/10/14 00:18:25 squidadm Exp $ + * $Id: store_dir_ufs.cc,v 1.1.20.1 2002/12/02 14:42:18 rbcollins Exp $ * * DEBUG: section 47 Store Directory Routines * AUTHOR: Duane Wessels @@ -39,6 +39,7 @@ #include "store_ufs.h" #include "ufscommon.h" +#include "SwapDir.h" MemPool *ufs_state_pool = NULL; static int ufs_initialised = 0; Index: squid3/src/fs/ufs/store_io_ufs.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/fs/ufs/store_io_ufs.cc,v retrieving revision 1.3 retrieving revision 1.3.10.1 diff -u -r1.3 -r1.3.10.1 --- squid3/src/fs/ufs/store_io_ufs.cc 18 Nov 2002 03:12:57 -0000 1.3 +++ squid3/src/fs/ufs/store_io_ufs.cc 2 Dec 2002 14:42:18 -0000 1.3.10.1 @@ -1,6 +1,6 @@ /* - * $Id: store_io_ufs.cc,v 1.3 2002/11/18 03:12:57 squidadm Exp $ + * $Id: store_io_ufs.cc,v 1.3.10.1 2002/12/02 14:42:18 rbcollins Exp $ * * DEBUG: section 79 Storage Manager UFS Interface * AUTHOR: Duane Wessels @@ -38,6 +38,7 @@ #include "Store.h" #include "ufscommon.h" +#include "SwapDir.h" static DRCB storeUfsReadDone; static DWCB storeUfsWriteDone;