From: Francesco Chemolli Date: Mon, 20 Aug 2012 16:35:27 +0000 (+0200) Subject: moved mem.cc prototypes to Mem.h X-Git-Tag: sourceformat-review-1~82 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8a89c28f2e9b51e8f835d814f255954e7aa2ccc7;p=thirdparty%2Fsquid.git moved mem.cc prototypes to Mem.h --- diff --git a/src/CacheDigest.cc b/src/CacheDigest.cc index 420b3a4716..5059ccffb0 100644 --- 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 f7d6b94a0a..71846f0834 100644 --- 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 5ed8d4c94d..36740cd918 100644 --- 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 a098c19d02..fc2145f917 100644 --- 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 #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 ed14d1a4a4..c468904b10 100644 --- 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 e737506dbe..721e7f5410 100644 --- 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 58c14654e6..cd9aa8035c 100644 --- 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 4fcb56f48b..b8bd5a3319 100644 --- 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 9f0edbe6a3..b4780fe1b0 100644 --- 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 1b72f39b1c..96f7c887f4 100644 --- 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 55bef76cd0..38d76cb122 100644 --- 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 5dd22e08b0..5c358896f4 100644 --- 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 83644791f1..4dc0550190 100644 --- 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 5d671890ef..4242ffd6da 100644 --- 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 d00c8e165e..c9d28ea319 100644 --- 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 4b29ef5321..c0318c854e 100644 --- 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 a1bf77f31e..f5665828b7 100644 --- 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 4efd2727be..a1de50e800 100644 --- 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 bda65cc03c..2ca02cd467 100644 --- 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 0754333106..48eb016e9d 100644 --- 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 a9da15067c..0f75f7221c 100644 --- 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 diff --git a/src/ipcache.cc b/src/ipcache.cc index 8a231245f8..39bf9488c3 100644 --- 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 8ec4e96a72..9ba1889bcc 100644 --- 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 038f38c7ca..8353a26b12 100644 --- a/src/mem.cc +++ b/src/mem.cc @@ -52,6 +52,14 @@ #include #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 b7254d7d15..27fd3821fb 100644 --- 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 dd17008920..a289075707 100644 --- 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 acc54a5684..9f5691d05b 100644 --- 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 8e08520f32..ac62eb89d8 100644 --- 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 ab90933720..645b14a310 100644 --- 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);