From: wessels <> Date: Wed, 3 Dec 1997 08:31:40 +0000 (+0000) Subject: rename memoryAccounted() to statMemoryAccounted() and make it global X-Git-Tag: SQUID_3_0_PRE1~4410 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=663eaa6355d34e2557740e9d3c74ce8aa9fab0ab;p=thirdparty%2Fsquid.git rename memoryAccounted() to statMemoryAccounted() and make it global --- diff --git a/src/protos.h b/src/protos.h index c3e9a09ac1..05aff4f2fe 100644 --- a/src/protos.h +++ b/src/protos.h @@ -251,6 +251,10 @@ extern PF snmpHandleUdp; extern void snmpInit(void); extern void snmpConnectionOpen(void); extern void snmpConnectionClose(void); +extern int create_view (char **); +extern int create_user (char **); +extern int create_community (char **); +extern void tokenize (char *, char **, int); #endif /* SQUID_SNMP */ extern void AppendUdp(icpUdpData *); @@ -381,6 +385,7 @@ extern void stackFreeMemory(Stack *); extern void stat_init(cacheinfo **, const char *); extern void pconnHistCount(int, int); extern void statAvgInit(void); +extern int statMemoryAccounted(void); /* To reduce memory fragmentation, we now store the memory version of an * object in fixed size blocks of size PAGE_SIZE and instead of calling diff --git a/src/stat.cc b/src/stat.cc index 6106a2adc8..072faa57e2 100644 --- a/src/stat.cc +++ b/src/stat.cc @@ -1,6 +1,6 @@ /* - * $Id: stat.cc,v 1.178 1997/12/02 00:17:43 wessels Exp $ + * $Id: stat.cc,v 1.179 1997/12/03 01:31:40 wessels Exp $ * * DEBUG: section 18 Cache Manager Statistics * AUTHOR: Harvest Derived @@ -115,7 +115,6 @@ static void proto_count(cacheinfo *, protocol_t, log_type); static void proto_newobject(cacheinfo *, protocol_t, int, int); static void proto_purgeobject(cacheinfo *, protocol_t, int); static void proto_touchobject(cacheinfo *, protocol_t, int); -int memoryAccounted(void); static void statAvgTick(void *notused); #ifdef XMALLOC_STATISTICS @@ -497,7 +496,7 @@ statFiledescriptors(StoreEntry * sentry) } int -memoryAccounted(void) +statMemoryAccounted(void) { return (int) meta_data.store_entries * sizeof(StoreEntry) + @@ -733,7 +732,7 @@ info_get(StoreEntry * sentry) storeAppendPrintf(sentry, "{\t%-25.25s = %6d KB}\n", "Total Accounted", - memoryAccounted() >> 10); + statMemoryAccounted() >> 10); #if XMALLOC_STATISTICS storeAppendPrintf(sentry, "{Memory allocation statistics}\n");