kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-16 10:03:50 +01:00
Code Releases Activity

sys/malloc_tracing: remove deprecated module

Browse Source 
use module `malloc_monitor` with verbous configuration instead
This commit is contained in:
Mikolai Gütschow 2025-04-08 14:47:56 +02:00
parent 623f865ceb
commit a77a6071f3
No known key found for this signature in database
GPG Key ID: 943E2F37AA659AD5
2 changed files with 0 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
makefiles/pseudomodules.inc.mk
View File

@ -274,15 +274,6 @@ PSEUDOMODULES += lwext4_vfs_format
## ##
PSEUDOMODULES += libc_gettimeofday PSEUDOMODULES += libc_gettimeofday
## @defgroup pseudomodule_malloc_tracing malloc_tracing
## @brief Debug dynamic memory management by hooking in a print into each call
## of malloc(), calloc(), realloc() and free
## @{
## @deprecated Use module `malloc_monitor` with verbous configuration instead;
## will be removed after 2024.07 release.
PSEUDOMODULES += malloc_tracing
## @}
## @defgroup pseudomodule_mpu_stack_guard mpu_stack_guard ## @defgroup pseudomodule_mpu_stack_guard mpu_stack_guard
## @brief MPU based stack guard ## @brief MPU based stack guard
## ##

34
sys/malloc_thread_safe/malloc_wrappers.c
View File

@ -35,10 +35,6 @@ static mutex_t _lock;
void __attribute__((used)) *__wrap_malloc(size_t size) void __attribute__((used)) *__wrap_malloc(size_t size)
{ {
uinttxtptr_t pc;
if (IS_USED(MODULE_MALLOC_TRACING)) {
pc = cpu_get_caller_pc();
}
assert(!irq_is_in()); assert(!irq_is_in());
mutex_lock(&_lock); mutex_lock(&_lock);
void *ptr = __real_malloc(size); void *ptr = __real_malloc(size);
@ -46,19 +42,11 @@ void __attribute__((used)) *__wrap_malloc(size_t size)
malloc_monitor_add(ptr, size, cpu_get_caller_pc(), "m"); malloc_monitor_add(ptr, size, cpu_get_caller_pc(), "m");
} }
mutex_unlock(&_lock); mutex_unlock(&_lock);
if (IS_USED(MODULE_MALLOC_TRACING)) {
printf("malloc(%" PRIuSIZE ") @ 0x%" PRIxTXTPTR " returned %p\n",
size, pc, ptr);
}
return ptr; return ptr;
} }
void __attribute__((used)) __wrap_free(void *ptr) void __attribute__((used)) __wrap_free(void *ptr)
{ {
if (IS_USED(MODULE_MALLOC_TRACING)) {
uinttxtptr_t pc = cpu_get_caller_pc();
printf("free(%p) @ 0x%" PRIxTXTPTR ")\n", ptr, pc);
}
assert(!irq_is_in()); assert(!irq_is_in());
mutex_lock(&_lock); mutex_lock(&_lock);
__real_free(ptr); __real_free(ptr);
@ -70,19 +58,11 @@ void __attribute__((used)) __wrap_free(void *ptr)
void * __attribute__((used)) __wrap_calloc(size_t nmemb, size_t size) void * __attribute__((used)) __wrap_calloc(size_t nmemb, size_t size)
{ {
uinttxtptr_t pc;
if (IS_USED(MODULE_MALLOC_TRACING)) {
pc = cpu_get_caller_pc();
}
/* some c libs don't perform proper overflow check (e.g. newlib < 4.0.0). Hence, we /* some c libs don't perform proper overflow check (e.g. newlib < 4.0.0). Hence, we
* just implement calloc on top of malloc ourselves. In addition to ensuring proper * just implement calloc on top of malloc ourselves. In addition to ensuring proper
* overflow checks, this likely saves a bit of ROM */ * overflow checks, this likely saves a bit of ROM */
size_t total_size; size_t total_size;
if (__builtin_mul_overflow(nmemb, size, &total_size)) { if (__builtin_mul_overflow(nmemb, size, &total_size)) {
if (IS_USED(MODULE_MALLOC_TRACING)) {
printf("calloc(%" PRIuSIZE ", %" PRIuSIZE ") @ 0x%" PRIxTXTPTR " overflowed\n",
nmemb, size, pc);
}
return NULL; return NULL;
} }
@ -96,21 +76,11 @@ void * __attribute__((used)) __wrap_calloc(size_t nmemb, size_t size)
memset(res, 0, total_size); memset(res, 0, total_size);
} }
if (IS_USED(MODULE_MALLOC_TRACING)) {
printf("calloc(%" PRIuSIZE ", %" PRIuSIZE ") @ 0x%" PRIxTXTPTR " returned %p\n",
nmemb, size, pc, res);
}
return res; return res;
} }
void * __attribute__((used))__wrap_realloc(void *ptr, size_t size) void * __attribute__((used))__wrap_realloc(void *ptr, size_t size)
{ {
uinttxtptr_t pc;
if (IS_USED(MODULE_MALLOC_TRACING)) {
pc = cpu_get_caller_pc();
}
assert(!irq_is_in()); assert(!irq_is_in());
mutex_lock(&_lock); mutex_lock(&_lock);
void *new = __real_realloc(ptr, size); void *new = __real_realloc(ptr, size);
@ -119,10 +89,6 @@ void * __attribute__((used))__wrap_realloc(void *ptr, size_t size)
} }
mutex_unlock(&_lock); mutex_unlock(&_lock);
if (IS_USED(MODULE_MALLOC_TRACING)) {
printf("realloc(%p, %" PRIuSIZE ") @0x%" PRIxTXTPTR " returned %p\n",
ptr, size, pc, new);
}
return new; return new;
} }