---------------------
PatchSet 1849 
Date: 2001/04/09 07:17:05
Author: akroonmaa
Branch: chunked_mempools
Tag: (none) 
Log:
move MemPool structs from src/ to include/MemPool.h

Members: 
	src/squid.h:1.11.6.1->1.11.6.2 
	src/structs.h:1.28.4.1->1.28.4.2 
	src/typedefs.h:1.17.8.1->1.17.8.2 

Index: squid/src/squid.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/squid.h,v
retrieving revision 1.11.6.1
retrieving revision 1.11.6.2
diff -u -r1.11.6.1 -r1.11.6.2
--- squid/src/squid.h	3 Apr 2001 22:35:48 -0000	1.11.6.1
+++ squid/src/squid.h	9 Apr 2001 07:17:05 -0000	1.11.6.2
@@ -1,6 +1,6 @@
 
 /*
- * $Id: squid.h,v 1.11.6.1 2001/04/03 22:35:48 akroonmaa Exp $
+ * $Id: squid.h,v 1.11.6.2 2001/04/09 07:17:05 akroonmaa Exp $
  *
  * AUTHOR: Duane Wessels
  *
@@ -387,11 +387,12 @@
 #include "hash.h"
 #include "rfc1035.h"
 
-#include "util.h"
 
 #include "defines.h"
 #include "enums.h"
 #include "typedefs.h"
+#include "util.h"
+#include "MemPool.h"
 #include "structs.h"
 #include "protos.h"
 #include "globals.h"
Index: squid/src/structs.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/structs.h,v
retrieving revision 1.28.4.1
retrieving revision 1.28.4.2
diff -u -r1.28.4.1 -r1.28.4.2
--- squid/src/structs.h	5 Apr 2001 07:35:47 -0000	1.28.4.1
+++ squid/src/structs.h	9 Apr 2001 07:17:05 -0000	1.28.4.2
@@ -1,6 +1,6 @@
 
 /*
- * $Id: structs.h,v 1.28.4.1 2001/04/05 07:35:47 akroonmaa Exp $
+ * $Id: structs.h,v 1.28.4.2 2001/04/09 07:17:05 akroonmaa Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -1819,30 +1819,6 @@
     unsigned char key[MD5_DIGEST_CHARS];
 };
 
-/* object to track per-action memory usage (e.g. #idle objects) */
-struct _MemMeter {
-    ssize_t level;		/* current level (count or volume) */
-    ssize_t hwater_level;	/* high water mark */
-    time_t hwater_stamp;	/* timestamp of last high water mark change */
-};
-
-/* object to track per-pool memory usage (alloc = inuse+idle) */
-struct _MemPoolMeter {
-    MemMeter alloc;
-    MemMeter inuse;
-    MemMeter idle;
-    gb_t saved;
-    gb_t total;
-};
-
-/* a pool is a [growing] space for objects of the same size */
-struct _MemPool {
-    const char *label;
-    size_t obj_size;
-    Stack pstack;		/* stack for free pointers */
-    MemPoolMeter meter;
-};
-
 struct _ClientInfo {
     hash_link hash;		/* must be first */
     struct in_addr addr;
Index: squid/src/typedefs.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/typedefs.h,v
retrieving revision 1.17.8.1
retrieving revision 1.17.8.2
diff -u -r1.17.8.1 -r1.17.8.2
--- squid/src/typedefs.h	3 Apr 2001 22:35:48 -0000	1.17.8.1
+++ squid/src/typedefs.h	9 Apr 2001 07:17:05 -0000	1.17.8.2
@@ -1,6 +1,6 @@
 
 /*
- * $Id: typedefs.h,v 1.17.8.1 2001/04/03 22:35:48 akroonmaa Exp $
+ * $Id: typedefs.h,v 1.17.8.2 2001/04/09 07:17:05 akroonmaa Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -152,9 +152,6 @@
 typedef struct _cacheSwap cacheSwap;
 typedef struct _StatHist StatHist;
 typedef struct _String String;
-typedef struct _MemMeter MemMeter;
-typedef struct _MemPoolMeter MemPoolMeter;
-typedef struct _MemPool MemPool;
 typedef struct _ClientInfo ClientInfo;
 typedef struct _cd_guess_stats cd_guess_stats;
 typedef struct _CacheDigest CacheDigest;