moved mem.cc prototypes to Mem.h

diff --git a/src/CacheDigest.cc b/src/CacheDigest.cc
index 420b3a471614b233d66143dc32ea2a597c2b69b2..5059ccffb03d2b540ed0dd26df00e65a383c84b8 100644 (file)
--- a/src/CacheDigest.cc
+++ b/src/CacheDigest.cc
@@ -35,6 +35,7 @@
 
 #include "squid.h"
 #include "md5.h"
+#include "Mem.h"
 #include "protos.h"
 #include "StatCounters.h"
 #include "Store.h"

diff --git a/src/HttpHdrContRange.cc b/src/HttpHdrContRange.cc
index f7d6b94a0aa7c65485fb56db40d70c793e42e7d2..71846f0834aaad7802935a1d51e31595ef190aa3 100644 (file)
--- a/src/HttpHdrContRange.cc
+++ b/src/HttpHdrContRange.cc
@@ -38,6 +38,7 @@
 #include "enums.h"
 #include "HttpHdrContRange.h"
 #include "HttpHeaderTools.h"
+#include "Mem.h"
 #include "protos.h"
 
 /*

diff --git a/src/Makefile.am b/src/Makefile.am
index 5ed8d4c94de93f82722b9b81e8465f662da4691d..36740cd918fa3e84b8d8fc562f8996ac27bbb6a1 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -398,6 +398,7 @@ squid_SOURCES = \
        list.cc \
        lookup_t.h \
        main.cc \
+       Mem.h \
        mem.cc \
        mem_node.cc \
        mem_node.h \
@@ -683,6 +684,7 @@ ufsdump_SOURCES = \
        cbdata.cc \
        debug.cc \
        int.cc \
+       Mem.h \
        mem.cc \
        MemBuf.cc \
        MemBuf.cci \
@@ -1096,6 +1098,7 @@ tests_testHttpReply_SOURCES=\
        HttpStatusCode.h \
        HttpStatusLine.cc \
        HttpStatusLine.h \
+       Mem.h \
        mem.cc \
        MemBuf.cc \
        MemBuf.h \
@@ -1239,6 +1242,7 @@ tests_testACLMaxUserIP_SOURCES= \
        URL.h \
        URLScheme.cc \
        URLScheme.h \
+       Mem.h \
        mem.cc \
        MemBuf.cc \
        wordlist.h \
@@ -1299,6 +1303,7 @@ tests_testCacheManager_SOURCES = \
        HttpParser.h \
        HttpRequest.cc \
        HttpRequestMethod.cc \
+       Mem.h \
        mem.cc \
        String.cc \
        tests/testCacheManager.cc \
@@ -1533,6 +1538,7 @@ tests_testDiskIO_SOURCES = \
        MemBuf.cc \
        MemObject.cc \
        mem_node.cc \
+       Mem.h \
        mem.cc \
        Packer.cc \
        Parsing.cc \
@@ -1732,6 +1738,7 @@ tests_testEvent_SOURCES = \
        internal.h \
        internal.cc \
        list.cc \
+       Mem.h \
        mem.cc \
        mem_node.cc \
        MemBuf.cc \
@@ -1941,6 +1948,7 @@ tests_testEventLoop_SOURCES = \
        list.cc \
        MemBuf.cc \
        MemObject.cc \
+       Mem.h \
        mem.cc \
        mem_node.cc \
        mime.cc \
@@ -1972,6 +1980,7 @@ tests_testEventLoop_SOURCES = \
        StatCounters.cc \
        StatHist.h \
        StatHist.cc \
+       Mem.h \
        stmem.cc \
        store.cc \
        store_client.cc \
@@ -2144,6 +2153,7 @@ tests_test_http_range_SOURCES = \
        list.cc \
        MemBuf.cc \
        MemObject.cc \
+       Mem.h \
        mem.cc \
        mem_node.cc \
        mime.cc \
@@ -2268,6 +2278,7 @@ tests_testHttpParser_SOURCES = \
        HttpParser.h \
        MemBuf.cc \
        MemBuf.h \
+       Mem.h \
        mem.cc \
        String.cc \
        structs.h \
@@ -2306,6 +2317,7 @@ tests_testHttpRequest_SOURCES = \
        HttpParser.h \
        HttpRequest.cc \
        HttpRequestMethod.cc \
+       Mem.h \
        mem.cc \
        String.cc \
        tests/testHttpRequest.h \
@@ -2531,6 +2543,7 @@ tests_testStore_SOURCES= \
        HttpRequestMethod.cc \
        int.cc \
        list.cc \
+       Mem.h \
        mem.cc \
        mem_node.cc \
        MemBuf.cc \
@@ -2651,6 +2664,7 @@ tests_testStore_DEPENDENCIES = \
 ## libsquid pulls in SquidConfig and children. stub them.
 tests_testString_SOURCES = \
        ClientInfo.h \
+       Mem.h \
        mem.cc \
        MemBuf.cc \
        String.cc \
@@ -2775,6 +2789,7 @@ tests_testUfs_SOURCES = \
        HttpHeaderTools.cc \
        HttpHeader.h \
        HttpHeader.cc \
+       Mem.h \
        mem.cc \
        ClientInfo.h \
        MemBuf.cc \
@@ -2880,6 +2895,7 @@ tests_testRock_SOURCES = \
        HttpStatusLine.cc \
        int.cc \
        list.cc \
+       Mem.h \
        mem.cc \
        MemBuf.cc \
        MemObject.cc \
@@ -3054,6 +3070,7 @@ tests_testCoss_SOURCES = \
        HttpHeaderTools.cc \
        HttpHeader.h \
        HttpHeader.cc \
+       Mem.h \
        mem.cc \
        ClientInfo.h \
        MemBuf.cc \
@@ -3195,6 +3212,7 @@ tests_testNull_SOURCES = \
        HttpHeaderTools.cc \
        HttpHeader.h \
        HttpHeader.cc \
+       Mem.h \
        mem.cc \
        ClientInfo.h \
        MemBuf.cc \
@@ -3343,6 +3361,7 @@ tests_testURL_SOURCES = \
        internal.cc \
        list.cc \
        multicast.cc \
+       Mem.h \
        mem.cc \
        mem_node.cc \
        MemBuf.cc \
@@ -3469,6 +3488,7 @@ tests_testURL_DEPENDENCIES = \
 
 tests_testConfigParser_SOURCES = \
        ClientInfo.h \
+       Mem.h \
        mem.cc \
        MemBuf.cc \
        String.cc \
@@ -3512,6 +3532,7 @@ tests_testStatHist_SOURCES = \
        tests/stub_debug.cc \
        tests/stub_DelayId.cc \
        tests/stub_HelperChildConfig.cc \
+       Mem.h \
        tests/stub_mem.cc \
        tests/stub_MemObject.cc \
        tests/stub_mime.cc \

diff --git a/src/Mem.h b/src/Mem.h
index a098c19d02a28e805ab1eb6f766cfaab925b08db..fc2145f9170c3956e1002b813775dd23562f77e0 100644 (file)
--- a/src/Mem.h
+++ b/src/Mem.h
@@ -34,6 +34,11 @@
 #ifndef SQUID_MEM
 #define SQUID_MEM
 
+/* for mem_type */
+#include "enums.h"
+/* for FREE */
+#include "typedefs.h"
+
 #if HAVE_IOSFWD
 #include <iosfwd>
 #endif
@@ -59,4 +64,21 @@ protected:
 
 extern const size_t squidSystemPageSize;
 
+extern void memClean(void);
+extern void memInitModule(void);
+extern void memCleanModule(void);
+extern void memConfigure(void);
+extern void *memAllocate(mem_type);
+extern void *memAllocString(size_t net_size, size_t * gross_size);
+extern void *memAllocBuf(size_t net_size, size_t * gross_size);
+extern void *memReallocBuf(void *buf, size_t net_size, size_t * gross_size);
+extern void memFree(void *, int type);
+extern void memFreeString(size_t size, void *);
+extern void memFreeBuf(size_t size, void *);
+extern FREE *memFreeBufFunc(size_t size);
+extern int memInUse(mem_type);
+extern void memDataInit(mem_type, const char *, size_t, int, bool zeroOnPush = true);
+extern void memCheckInit(void);
+extern void memConfigure(void);
+
 #endif /* SQUID_MEM */

diff --git a/src/MemBuf.cc b/src/MemBuf.cc
index ed14d1a4a46e4c187432a1f7c10b170f0985f66e..c468904b10729f21543052f25f9d4192f690f66c 100644 (file)
--- a/src/MemBuf.cc
+++ b/src/MemBuf.cc
@@ -100,6 +100,7 @@
  */
 
 #include "squid.h"
+#include "Mem.h"
 #include "MemBuf.h"
 #include "profiler/Profiler.h"
 #include "protos.h"

diff --git a/src/String.cc b/src/String.cc
index e737506dbe67623c322d1941602a323c818dc661..721e7f54102f8966a3a16c848f272bbd61d4c061 100644 (file)
--- a/src/String.cc
+++ b/src/String.cc
@@ -35,6 +35,7 @@
 
 #include "squid.h"
 #include "base/TextException.h"
+#include "Mem.h"
 #include "mgr/Registration.h"
 #include "profiler/Profiler.h"
 #include "protos.h"

diff --git a/src/acl/Gadgets.cc b/src/acl/Gadgets.cc
index 58c14654e6bd9e0298b5bea23df054f923ccf1c9..cd9aa8035c84ca8e449c361c9f3f42a2ef152bc9 100644 (file)
--- a/src/acl/Gadgets.cc
+++ b/src/acl/Gadgets.cc
@@ -47,6 +47,7 @@
 #include "errorpage.h"
 #include "globals.h"
 #include "HttpRequest.h"
+#include "Mem.h"
 #include "protos.h"
 
 

diff --git a/src/acl/RegexData.cc b/src/acl/RegexData.cc
index 4fcb56f48b1bb1958c7db9d4a030d876a40b13bd..b8bd5a3319344f98c28b852fd6c573e56f7ac8bc 100644 (file)
--- a/src/acl/RegexData.cc
+++ b/src/acl/RegexData.cc
@@ -42,6 +42,7 @@
 #include "acl/Acl.h"
 #include "ConfigParser.h"
 #include "Debug.h"
+#include "Mem.h"
 #include "protos.h"
 #include "wordlist.h"
 

diff --git a/src/adaptation/icap/Xaction.cc b/src/adaptation/icap/Xaction.cc
index 9f0edbe6a3b58a9cc7d5e05a1cc954a433ca3ac1..b4780fe1b01ae2d54e3ffe3d73fd1d6b7c049189 100644 (file)
--- a/src/adaptation/icap/Xaction.cc
+++ b/src/adaptation/icap/Xaction.cc
@@ -21,6 +21,7 @@
 #include "HttpRequest.h"
 #include "icap_log.h"
 #include "ipcache.h"
+#include "Mem.h"
 #include "pconn.h"
 #include "protos.h"
 #include "SquidTime.h"

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 1b72f39b1c12bd48c2ff306bc296677406d514c1..96f7c887f410200d8a182ef23a9539033e22136b 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -52,6 +52,7 @@
 #include "ip/tools.h"
 #include "ipc/Kids.h"
 #include "log/Config.h"
+#include "Mem.h"
 #include "MemBuf.h"
 #include "mgr/Registration.h"
 #include "Parsing.h"

diff --git a/src/client_db.cc b/src/client_db.cc
index 55bef76cd0ecab7924667b2c0ec8060727e7d836..38d76cb1224e89b819eada0b421140df1556ce01 100644 (file)
--- a/src/client_db.cc
+++ b/src/client_db.cc
@@ -39,6 +39,7 @@
 #include "ClientInfo.h"
 #include "fqdncache.h"
 #include "ip/Address.h"
+#include "Mem.h"
 #include "mgr/Registration.h"
 #include "protos.h"
 #include "SquidMath.h"

diff --git a/src/client_side.cc b/src/client_side.cc
index 5dd22e08b0deff964c6b4efeaa542a13cfa5e64e..5c358896f4592d0e0d49f52eef9b801336bf430e 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -112,6 +112,7 @@
 #include "internal.h"
 #include "ipc/FdNotes.h"
 #include "ipc/StartListening.h"
+#include "Mem.h"
 #include "MemBuf.h"
 #include "MemObject.h"
 #include "profiler/Profiler.h"

diff --git a/src/disk.cc b/src/disk.cc
index 83644791f13039828fac6f87b952e69d46cd7cd5..4dc055019004130519de74eb93432384810d5701 100644 (file)
--- a/src/disk.cc
+++ b/src/disk.cc
@@ -35,6 +35,7 @@
 #include "squid.h"
 #include "comm/Loops.h"
 #include "fde.h"
+#include "Mem.h"
 #include "MemBuf.h"
 #include "profiler/Profiler.h"
 #include "protos.h"

diff --git a/src/dns_internal.cc b/src/dns_internal.cc
index 5d671890efcaf951531ab1e74d39b6499a56442c..4242ffd6dad4b8fb15429dec1f719ea3f73cd90b 100644 (file)
--- a/src/dns_internal.cc
+++ b/src/dns_internal.cc
@@ -42,6 +42,7 @@
 #include "event.h"
 #include "fde.h"
 #include "ip/tools.h"
+#include "Mem.h"
 #include "MemBuf.h"
 #include "mgr/Registration.h"
 #include "protos.h"

diff --git a/src/esi/Esi.cc b/src/esi/Esi.cc
index d00c8e165e9f6da3ca8ada67992cab75f2e39064..c9d28ea3191462a4ec956864342542ceca6c2699 100644 (file)
--- a/src/esi/Esi.cc
+++ b/src/esi/Esi.cc
@@ -57,6 +57,7 @@
 #include "HttpReply.h"
 #include "HttpRequest.h"
 #include "ip/Address.h"
+#include "Mem.h"
 #include "MemBuf.h"
 #include "profiler/Profiler.h"
 #include "protos.h"

diff --git a/src/esi/VarState.cc b/src/esi/VarState.cc
index 4b29ef5321219626d89b519c99a2c092913b2f78..c0318c854ea20fa41eb7f3749b9eb3854f4e5297 100644 (file)
--- a/src/esi/VarState.cc
+++ b/src/esi/VarState.cc
@@ -37,6 +37,7 @@
 #include "squid.h"
 #include "esi/VarState.h"
 #include "HttpReply.h"
+#include "Mem.h"
 #include "protos.h"
 
 CBDATA_TYPE (ESIVarState);

diff --git a/src/fqdncache.cc b/src/fqdncache.cc
index a1bf77f31eb068693340df5a9aa748bc0da9a78a..f5665828b781879aa5472b68d7d6eac12a8e7c92 100644 (file)
--- a/src/fqdncache.cc
+++ b/src/fqdncache.cc
@@ -36,6 +36,7 @@
 #include "cbdata.h"
 #include "DnsLookupDetails.h"
 #include "event.h"
+#include "Mem.h"
 #include "mgr/Registration.h"
 #include "protos.h"
 #include "SquidDns.h"

diff --git a/src/ftp.cc b/src/ftp.cc
index 4efd2727beb18cc64b474d686e66da33490bd6b7..a1de50e8004e0cdfa48cebf556d4fa54e3466fd5 100644 (file)
--- a/src/ftp.cc
+++ b/src/ftp.cc
@@ -49,6 +49,7 @@
 #include "HttpReply.h"
 #include "HttpRequest.h"
 #include "ip/tools.h"
+#include "Mem.h"
 #include "MemBuf.h"
 #include "protos.h"
 #include "rfc1738.h"

diff --git a/src/gopher.cc b/src/gopher.cc
index bda65cc03cf0a5ea3d972f7a46ccb7756095bc91..2ca02cd46757522e4dd931efc46fd065287924e6 100644 (file)
--- a/src/gopher.cc
+++ b/src/gopher.cc
@@ -41,6 +41,7 @@
 #include "html_quote.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
+#include "Mem.h"
 #include "MemBuf.h"
 #include "protos.h"
 #include "rfc1738.h"

diff --git a/src/helper.cc b/src/helper.cc
index 0754333106261e4c6ab44ee28186d3441e9443c6..48eb016e9db95ebcaab1b402fc2b7ff870c54045 100644 (file)
--- a/src/helper.cc
+++ b/src/helper.cc
@@ -39,6 +39,7 @@
 #include "comm/Write.h"
 #include "format/Quoting.h"
 #include "helper.h"
+#include "Mem.h"
 #include "MemBuf.h"
 #include "protos.h"
 #include "SquidMath.h"

diff --git a/src/icmp/net_db.cc b/src/icmp/net_db.cc
index a9da15067c8c5fe2419695659a75aaa33212c52e..0f75f7221c13faa41d471f3f874b3db8a81ab4b4 100644 (file)
--- a/src/icmp/net_db.cc
+++ b/src/icmp/net_db.cc
@@ -58,6 +58,8 @@
 #include "ip/Address.h"
 #include "neighbors.h"
 #include "URL.h"
+#include "Mem.h"
+
 
 #if HAVE_SYS_STAT_H
 #include <sys/stat.h>

diff --git a/src/ipcache.cc b/src/ipcache.cc
index 8a231245f89714e1ef90316cdf18c516ab097037..39bf9488c31f56ce5355cb235b1d4dfa4eaa24d0 100644 (file)
--- a/src/ipcache.cc
+++ b/src/ipcache.cc
@@ -38,6 +38,7 @@
 #include "ip/Address.h"
 #include "ip/tools.h"
 #include "ipcache.h"
+#include "Mem.h"
 #include "mgr/Registration.h"
 #include "protos.h"
 #include "rfc3596.h"

diff --git a/src/list.cc b/src/list.cc
index 8ec4e96a72329fcf0b29d9369d62826139a2b7fd..9ba1889bcc30f219343ca63031879e34507b0e24 100644 (file)
--- a/src/list.cc
+++ b/src/list.cc
@@ -34,6 +34,7 @@
  */
 
 #include "squid.h"
+#include "Mem.h"
 #include "protos.h"
 #include "typedefs.h"
 

diff --git a/src/mem.cc b/src/mem.cc
index 038f38c7ca2f8a86e10aadb97548d7691cbda81e..8353a26b126a5be654c4f37f27610bc8cd5f1a58 100644 (file)
--- a/src/mem.cc
+++ b/src/mem.cc
@@ -52,6 +52,14 @@
 #include <ostream>
 #endif
 
+/* forward declarations */
+static void memFree2K(void *);
+static void memFree4K(void *);
+static void memFree8K(void *);
+static void memFree16K(void *);
+static void memFree32K(void *);
+static void memFree64K(void *);
+
 /* module globals */
 const size_t squidSystemPageSize=getpagesize();
 

diff --git a/src/mime.cc b/src/mime.cc
index b7254d7d15b85a2d02e3a4fb33886d869e95acf6..27fd3821fb1929cc4584020889d132a033749815 100644 (file)
--- a/src/mime.cc
+++ b/src/mime.cc
@@ -40,6 +40,7 @@
 #include "HttpReply.h"
 #include "HttpRequest.h"
 #include "internal.h"
+#include "Mem.h"
 #include "MemBuf.h"
 #include "MemObject.h"
 #include "protos.h"

diff --git a/src/peer_select.cc b/src/peer_select.cc
index dd17008920f1dd503684c3346589e5df9b672e21..a2890757075e54836e704f1bf66d61c36d7846b5 100644 (file)
--- a/src/peer_select.cc
+++ b/src/peer_select.cc
@@ -46,6 +46,7 @@
 #include "icmp/net_db.h"
 #include "ICP.h"
 #include "ipcache.h"
+#include "Mem.h"
 #include "neighbors.h"
 #include "peer_sourcehash.h"
 #include "peer_userhash.h"

diff --git a/src/protos.h b/src/protos.h
index acc54a5684c6d9024898861e1aae3af5d81a8da5..9f5691d05b87d1fc722266ee47cbda928f3e1298 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -241,33 +241,6 @@ extern void reconfigure(int);
 extern void start_announce(void *unused);
 extern void waisStart(FwdState *);
 
-/* mem */
-SQUIDCEXTERN void memClean(void);
-SQUIDCEXTERN void memInitModule(void);
-SQUIDCEXTERN void memCleanModule(void);
-SQUIDCEXTERN void memConfigure(void);
-SQUIDCEXTERN void *memAllocate(mem_type);
-SQUIDCEXTERN void *memAllocString(size_t net_size, size_t * gross_size);
-SQUIDCEXTERN void *memAllocBuf(size_t net_size, size_t * gross_size);
-SQUIDCEXTERN void *memReallocBuf(void *buf, size_t net_size, size_t * gross_size);
-SQUIDCEXTERN void memFree(void *, int type);
-void memFree2K(void *);
-void memFree4K(void *);
-void memFree8K(void *);
-void memFree16K(void *);
-void memFree32K(void *);
-void memFree64K(void *);
-SQUIDCEXTERN void memFreeString(size_t size, void *);
-SQUIDCEXTERN void memFreeBuf(size_t size, void *);
-SQUIDCEXTERN FREE *memFreeBufFunc(size_t size);
-SQUIDCEXTERN int memInUse(mem_type);
-SQUIDCEXTERN void memDataInit(mem_type, const char *, size_t, int, bool zeroOnPush = true);
-SQUIDCEXTERN void memCheckInit(void);
-
-
-/* Mem */
-SQUIDCEXTERN void memConfigure(void);
-
 /* ----------------------------------------------------------------- */
 
 /* repl_modules.c */

diff --git a/src/store_key_md5.cc b/src/store_key_md5.cc
index 8e08520f3212b42174911d7efb7ca71d168d496f..ac62eb89d87f489df38f2a49c450a593de0863f7 100644 (file)
--- a/src/store_key_md5.cc
+++ b/src/store_key_md5.cc
@@ -36,6 +36,7 @@
 #include "squid.h"
 #include "HttpRequest.h"
 #include "md5.h"
+#include "Mem.h"
 #include "protos.h"
 #include "URL.h"
 

diff --git a/src/tests/stub_mem.cc b/src/tests/stub_mem.cc
index ab909337209a15aa3b96c72e0eb2e5a650c230c7..645b14a310fa5bd4a9fce2ca19d87acfdd1d4eb6 100644 (file)
--- a/src/tests/stub_mem.cc
+++ b/src/tests/stub_mem.cc
@@ -6,29 +6,28 @@
 
 #define STUB_API "stub_mem.cc"
 #include "STUB.h"
-/* mem* definitions are still in protos.h */
-#include "protos.h"
+#include "Mem.h"
 
-extern "C" void
+void
 memFreeString(size_t size, void *buf)
 {
     xfree(buf);
 }
 
-extern "C" void *
+void *
 memAllocString(size_t net_size, size_t * gross_size)
 {
     *gross_size=net_size;
     return xmalloc(net_size);
 }
 
-extern "C" void
+void
 memFreeBuf(size_t size, void *buf)
 {
     xfree(buf);
 }
 
-extern "C" void *
+void *
 memAllocBuf(size_t net_size, size_t * gross_size)
 {
     *gross_size=net_size;
@@ -38,7 +37,7 @@ memAllocBuf(size_t net_size, size_t * gross_size)
 /* net_size is the new size, *gross size is the old gross size, to be changed to
  * the new gross size as a side-effect.
  */
-extern "C" void *
+void *
 memReallocBuf(void *oldbuf, size_t net_size, size_t * gross_size)
 {
     void *rv=xrealloc(oldbuf,net_size);