Moved storeDirClean() into UFS-specific module.

random other ufs/api mods

diff --git a/src/Makefile.in b/src/Makefile.in
index 2e648d05673319988527a4a14f8e8bda1f8d7f7e..8d8418d978ba2bc57d0f7610ec6a30373f0507aa 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.173 1999/05/04 21:06:21 wessels Exp $
+#  $Id: Makefile.in,v 1.174 1999/05/25 22:05:47 wessels Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -154,7 +154,6 @@ OBJS                = \
                store.o \
                store_io.o \
                store_io_ufs.o \
-               store_clean.o \
                store_client.o \
                store_digest.o \
                store_dir.o \

diff --git a/src/main.cc b/src/main.cc
index e6b9964614df157436d5f6be4cc1a33e86b107a5..b458413954eefbb69708a8927092c52374541d15 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: main.cc,v 1.299 1999/05/19 19:57:47 wessels Exp $
+ * $Id: main.cc,v 1.300 1999/05/25 22:05:50 wessels Exp $
  *
  * DEBUG: section 1     Startup and Main Loop
  * AUTHOR: Harvest Derived
@@ -513,7 +513,6 @@ mainInitialize(void)
     debug(1, 1) ("Ready to serve requests.\n");
     if (!configured_once) {
        eventAdd("storeMaintain", storeMaintainSwapSpace, NULL, 1.0, 1);
-       eventAdd("storeDirClean", storeDirClean, NULL, 15.0, 1);
        if (Config.onoff.announce)
            eventAdd("start_announce", start_announce, NULL, 3600.0, 1);
        eventAdd("ipcache_purgelru", ipcache_purgelru, NULL, 10.0, 1);

diff --git a/src/protos.h b/src/protos.h
index 36804f945f7851dea6301e68664598de1151abe7..9b4ad3d281ec7c1727852f33b0010bf5fbb21ca3 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: protos.h,v 1.331 1999/05/25 06:53:44 wessels Exp $
+ * $Id: protos.h,v 1.332 1999/05/25 22:05:52 wessels Exp $
  *
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -897,11 +897,8 @@ extern HASHHASH storeKeyHashHash;
 extern HASHCMP storeKeyHashCmp;
 
 /*
- * store_clean.c
+ * store_digest.c
  */
-extern EVH storeDirClean;
-
-/* store_digest.c */
 extern void storeDigestInit(void);
 extern void storeDigestNoteStoreReady(void);
 extern void storeDigestScheduleRebuild(void);

diff --git a/src/store_dir.cc b/src/store_dir.cc
index 0fc486bd27cb658cf91b0781b62532229c364e2e..00145059f459c409cc026a37caf73f453038a529 100644 (file)
--- a/src/store_dir.cc
+++ b/src/store_dir.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store_dir.cc,v 1.94 1999/05/25 20:38:06 wessels Exp $
+ * $Id: store_dir.cc,v 1.95 1999/05/25 22:05:56 wessels Exp $
  *
  * DEBUG: section 47    Store Directory Routines
  * AUTHOR: Duane Wessels
@@ -248,6 +248,7 @@ void
 storeDirSwapLog(const StoreEntry * e, int op)
 {
     int dirn = e->swap_file_number >> SWAP_DIR_SHIFT;
+    SwapDir *sd;
     assert(dirn < Config.cacheSwap.n_configured);
     assert(!EBIT_TEST(e->flags, KEY_PRIVATE));
     assert(e->swap_file_number >= 0);
@@ -261,7 +262,8 @@ storeDirSwapLog(const StoreEntry * e, int op)
        swap_log_op_str[op],
        storeKeyText(e->key),
        e->swap_file_number);
-    Config.cacheSwap.swapDirs[dirn].obj.log(e, op);
+    sd = &Config.cacheSwap.swapDirs[dirn];
+    sd->obj.log(sd, e, op);
 }
 
 void

diff --git a/src/typedefs.h b/src/typedefs.h
index 06280ae6066896bee7e6660be010bfaef70ce940..f4369a1e67e75e58251fa187d77ae1a8404946af 100644 (file)
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: typedefs.h,v 1.92 1999/05/25 06:53:54 wessels Exp $
+ * $Id: typedefs.h,v 1.93 1999/05/25 22:05:59 wessels Exp $
  *
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -218,7 +218,7 @@ typedef void STOBJCLOSE(storeIOState *);
 typedef void STOBJREAD(storeIOState *, char *, size_t, off_t, STRCB *, void *);
 typedef void STOBJWRITE(storeIOState *, char *, size_t, off_t, FREE *);
 typedef void STOBJUNLINK(sfileno);
-typedef void STOBJLOG(const StoreEntry *, int);
+typedef void STOBJLOG(const SwapDir *, const StoreEntry *, int);
 typedef void STLOGOPEN(SwapDir *);
 typedef void STLOGCLOSE(SwapDir *);
 typedef int STLOGCLEANOPEN(SwapDir *);