From: Victor Julien Date: Wed, 27 Nov 2019 17:13:32 +0000 (+0100) Subject: util/mem: remove old debug code for counting allocs X-Git-Tag: suricata-6.0.0-beta1~528 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48bb26abe731a470d3b6371eb7789921c2ef6b96;p=thirdparty%2Fsuricata.git util/mem: remove old debug code for counting allocs --- diff --git a/src/runmode-unittests.c b/src/runmode-unittests.c index 7632dbfec2..1cf6ba4d6c 100644 --- a/src/runmode-unittests.c +++ b/src/runmode-unittests.c @@ -245,9 +245,6 @@ void RunUnittests(int list_unittests, const char *regex_arg) CIDRInit(); -#ifdef DBG_MEM_ALLOC - SCLogInfo("Memory used at startup: %"PRIdMAX, (intmax_t)global_mem); -#endif SCProtoNameInit(); TagInitCtx(); @@ -301,9 +298,6 @@ void RunUnittests(int list_unittests, const char *regex_arg) #ifdef HAVE_LUAJIT LuajitFreeStatesPool(); #endif -#ifdef DBG_MEM_ALLOC - SCLogInfo("Total memory used (without SCFree()): %"PRIdMAX, (intmax_t)global_mem); -#endif exit(EXIT_SUCCESS); #else diff --git a/src/suricata.c b/src/suricata.c index 0cc79eea5b..84e3b83406 100644 --- a/src/suricata.c +++ b/src/suricata.c @@ -313,20 +313,6 @@ static void SignalHandlerSigHup(/*@unused@*/ int sig) } #endif -#ifdef DBG_MEM_ALLOC -#ifndef _GLOBAL_MEM_ -#define _GLOBAL_MEM_ -/* This counter doesn't complain realloc's(), it's gives - * an aproximation for the startup */ -size_t global_mem = 0; -#ifdef DBG_MEM_ALLOC_SKIP_STARTUP -uint8_t print_mem_flag = 0; -#else -uint8_t print_mem_flag = 1; -#endif -#endif -#endif - void GlobalsInitPreConfig(void) { TimeInit(); @@ -340,13 +326,6 @@ static void GlobalsDestroy(SCInstance *suri) HTPFreeConfig(); HTPAtExitPrintStats(); -#ifdef DBG_MEM_ALLOC - SCLogInfo("Total memory used (without SCFree()): %"PRIdMAX, (intmax_t)global_mem); -#ifdef DBG_MEM_ALLOC_SKIP_STARTUP - print_mem_flag = 0; -#endif -#endif - AppLayerHtpPrintStats(); /* TODO this can do into it's own func */ @@ -2791,13 +2770,6 @@ int SuricataMain(int argc, char **argv) PostRunStartedDetectSetup(&suricata); -#ifdef DBG_MEM_ALLOC - SCLogInfo("Memory used at startup: %"PRIdMAX, (intmax_t)global_mem); -#ifdef DBG_MEM_ALLOC_SKIP_STARTUP - print_mem_flag = 1; -#endif -#endif - SCPledge(); SuricataMainLoop(&suricata); diff --git a/src/util-mem.h b/src/util-mem.h index 52ed35d518..8da52c34ec 100644 --- a/src/util-mem.h +++ b/src/util-mem.h @@ -51,174 +51,6 @@ SC_ATOMIC_EXTERN(unsigned int, engine_stage); -/* Use this only if you want to debug memory allocation and free() - * It will log a lot of lines more, so think that is a performance killer */ - -/* Uncomment this if you want to print memory allocations and free's() */ -//#define DBG_MEM_ALLOC - -#ifdef DBG_MEM_ALLOC - -/* Uncomment this if you want to print mallocs at the startup (recommended) */ -#define DBG_MEM_ALLOC_SKIP_STARTUP - -#define SCMalloc(a) ({ \ - void *ptrmem = NULL; \ - extern size_t global_mem; \ - extern uint8_t print_mem_flag; \ - \ - ptrmem = malloc((a)); \ - if (ptrmem == NULL && (a) > 0) { \ - SCLogError(SC_ERR_MEM_ALLOC, "SCMalloc failed: %s, while trying " \ - "to allocate %"PRIuMAX" bytes", strerror(errno), (uintmax_t)(a)); \ - if (SC_ATOMIC_GET(engine_stage) == SURICATA_INIT) {\ - SCLogError(SC_ERR_FATAL, "Out of memory. The engine cannot be initialized. Exiting..."); \ - exit(EXIT_FAILURE); \ - } \ - } \ - \ - global_mem += (a); \ - if (print_mem_flag == 1) { \ - SCLogInfo("SCMalloc return at %p of size %"PRIuMAX, \ - ptrmem, (uintmax_t)(a)); \ - } \ - (void*)ptrmem; \ -}) - -#define SCRealloc(x, a) ({ \ - void *ptrmem = NULL; \ - extern size_t global_mem; \ - extern uint8_t print_mem_flag; \ - \ - ptrmem = realloc((x), (a)); \ - if (ptrmem == NULL && (a) > 0) { \ - SCLogError(SC_ERR_MEM_ALLOC, "SCRealloc failed: %s, while trying " \ - "to allocate %"PRIuMAX" bytes", strerror(errno), (uintmax_t)(a)); \ - if (SC_ATOMIC_GET(engine_stage) == SURICATA_INIT) {\ - SCLogError(SC_ERR_FATAL, "Out of memory. The engine cannot be initialized. Exiting..."); \ - exit(EXIT_FAILURE); \ - } \ - } \ - \ - global_mem += (a); \ - if (print_mem_flag == 1) { \ - SCLogInfo("SCRealloc return at %p (old:%p) of size %"PRIuMAX, \ - ptrmem, (x), (uintmax_t)(a)); \ - } \ - (void*)ptrmem; \ -}) - -#define SCCalloc(nm, a) ({ \ - void *ptrmem = NULL; \ - extern size_t global_mem; \ - extern uint8_t print_mem_flag; \ - \ - ptrmem = calloc((nm), (a)); \ - if (ptrmem == NULL && (a) > 0) { \ - SCLogError(SC_ERR_MEM_ALLOC, "SCCalloc failed: %s, while trying " \ - "to allocate %"PRIuMAX" bytes", strerror(errno), (uintmax_t)a); \ - if (SC_ATOMIC_GET(engine_stage) == SURICATA_INIT) {\ - SCLogError(SC_ERR_FATAL, "Out of memory. The engine cannot be initialized. Exiting..."); \ - exit(EXIT_FAILURE); \ - } \ - } \ - \ - global_mem += (a)*(nm); \ - if (print_mem_flag == 1) { \ - SCLogInfo("SCCalloc return at %p of size %"PRIuMAX" (nm) %"PRIuMAX, \ - ptrmem, (uintmax_t)(a), (uintmax_t)(nm)); \ - } \ - (void*)ptrmem; \ -}) - -#define SCStrdup(a) ({ \ - char *ptrmem = NULL; \ - extern size_t global_mem; \ - extern uint8_t print_mem_flag; \ - size_t _len = strlen((a)); \ - \ - ptrmem = strdup((a)); \ - if (ptrmem == NULL) { \ - SCLogError(SC_ERR_MEM_ALLOC, "SCStrdup failed: %s, while trying " \ - "to allocate %"PRIuMAX" bytes", strerror(errno), (uintmax_t)_len); \ - if (SC_ATOMIC_GET(engine_stage) == SURICATA_INIT) {\ - SCLogError(SC_ERR_FATAL, "Out of memory. The engine cannot be initialized. Exiting..."); \ - exit(EXIT_FAILURE); \ - } \ - } \ - \ - global_mem += _len; \ - if (print_mem_flag == 1) { \ - SCLogInfo("SCStrdup return at %p of size %"PRIuMAX, \ - ptrmem, (uintmax_t)_len); \ - } \ - (void*)ptrmem; \ -}) - -#ifndef HAVE_STRNDUP -#define SCStrndup(a, b) ({ \ - char *ptrmem = NULL; \ - extern size_t global_mem; \ - extern uint8_t print_mem_flag; \ - size_t _len = (b); \ - \ - size_t _scstrndup_len = _len + 1; \ - ptrmem = (char *)malloc(_scstrndup_len); \ - if (ptrmem == NULL) { \ - SCLogError(SC_ERR_MEM_ALLOC, "SCStrndup failed: %s, while trying " \ - "to allocate %"PRIuMAX" bytes", strerror(errno), (uintmax_t)_scstrndup_len); \ - if (SC_ATOMIC_GET(engine_stage) == SURICATA_INIT) {\ - SCLogError(SC_ERR_FATAL, "Out of memory. The engine cannot be initialized. Exiting..."); \ - exit(EXIT_FAILURE); \ - } \ - } else { \ - strlcpy(ptrmem, (a), _scstrndup_len); \ - *(ptrmem + _len) = '\0'; \ - } \ - \ - global_mem += _scstrndup_len; \ - if (print_mem_flag == 1) { \ - SCLogInfo("SCStrndup return at %p of size %"PRIuMAX, \ - ptrmem, (uintmax_t)_scstrndup_len); \ - } \ - (void*)ptrmem; \ -}) -#else /* HAVE_STRNDUP */ -#define SCStrndup(a, b) ({ \ - char *ptrmem = NULL; \ - extern size_t global_mem; \ - extern uint8_t print_mem_flag; \ - size_t _len = (b); \ - \ - ptrmem = strndup((a), _len); \ - if (ptrmem == NULL) { \ - SCLogError(SC_ERR_MEM_ALLOC, "SCStrndup failed: %s, while trying " \ - "to allocate %"PRIuMAX" bytes", strerror(errno), (uintmax_t)_len); \ - if (SC_ATOMIC_GET(engine_stage) == SURICATA_INIT) {\ - SCLogError(SC_ERR_FATAL, "Out of memory. The engine cannot be initialized. Exiting..."); \ - exit(EXIT_FAILURE); \ - } \ - } \ - \ - global_mem += _len; \ - if (print_mem_flag == 1) { \ - SCLogInfo("SCStrndup return at %p of size %"PRIuMAX, \ - ptrmem, (uintmax_t)_len); \ - } \ - (void*)ptrmem; \ -}) -#endif - -#define SCFree(a) ({ \ - extern uint8_t print_mem_flag; \ - if (print_mem_flag == 1) { \ - SCLogInfo("SCFree at %p", (a)); \ - } \ - free((a)); \ -}) - -#else /* !DBG_MEM_ALLOC */ - #define SCMalloc(a) ({ \ void *ptrmem = NULL; \ \ @@ -391,8 +223,6 @@ SC_ATOMIC_EXTERN(unsigned int, engine_stage); #endif /* __WIN32 */ -#endif /* DBG_MEM_ALLOC */ - #endif /* CPPCHECK */ #endif /* __UTIL_MEM_H__ */