From aa458a62f034c2cb57639bdc713ed3c51b0292c7 Mon Sep 17 00:00:00 2001 From: Daniel-Constantin Mierla Date: Wed, 9 Sep 2020 17:50:24 +0200 Subject: [PATCH] core: mem - define mem_counter struct in meminfo - it is the same for f/q/tlsf mallocs --- src/core/mem/f_malloc.h | 12 ------------ src/core/mem/meminfo.h | 12 ++++++++++++ src/core/mem/q_malloc.h | 12 ------------ src/core/mem/tlsf_malloc.h | 12 ------------ 4 files changed, 12 insertions(+), 36 deletions(-) diff --git a/src/core/mem/f_malloc.h b/src/core/mem/f_malloc.h index d338f5c5d34..2bed0b8e537 100644 --- a/src/core/mem/f_malloc.h +++ b/src/core/mem/f_malloc.h @@ -241,17 +241,5 @@ void fm_sums(void* qmp); void fm_mod_get_stats(void* qm, void **fm_root); void fm_mod_free_stats(void *root); -typedef struct _mem_counter{ - const char *file; - const char *func; - const char *mname; - unsigned long line; - - unsigned long size; - int count; - - struct _mem_counter *next; -} mem_counter; - #endif #endif diff --git a/src/core/mem/meminfo.h b/src/core/mem/meminfo.h index 9c7760db34c..8b69daa7053 100644 --- a/src/core/mem/meminfo.h +++ b/src/core/mem/meminfo.h @@ -42,5 +42,17 @@ struct mem_info{ unsigned long total_frags; /** number of total memory fragments */ }; +typedef struct _mem_counter{ + const char *file; + const char *func; + const char *mname; + unsigned long line; + + unsigned long size; + int count; + + struct _mem_counter *next; +} mem_counter; + #endif diff --git a/src/core/mem/q_malloc.h b/src/core/mem/q_malloc.h index 71e248f5270..85d3c86e603 100644 --- a/src/core/mem/q_malloc.h +++ b/src/core/mem/q_malloc.h @@ -174,17 +174,5 @@ void qm_sums(void* qm); void qm_mod_get_stats(void *qm, void **qm_root); void qm_mod_free_stats(void *root); -typedef struct _mem_counter{ - const char *file; - const char *func; - const char *mname; - unsigned long line; - - unsigned long size; - int count; - - struct _mem_counter *next; -} mem_counter; - #endif #endif diff --git a/src/core/mem/tlsf_malloc.h b/src/core/mem/tlsf_malloc.h index 3fce9cd1e9a..4112634b958 100644 --- a/src/core/mem/tlsf_malloc.h +++ b/src/core/mem/tlsf_malloc.h @@ -89,18 +89,6 @@ unsigned long tlsf_available(tlsf_t pool); void tlsf_mod_get_stats(tlsf_t pool, void **root); void tlsf_mod_free_stats(void *root); -typedef struct _mem_counter{ - const char *file; - const char *func; - const char *mname; - unsigned long line; - - unsigned long size; - int count; - - struct _mem_counter *next; -} mem_counter; - #if defined(__cplusplus) }; #endif