mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-03-28 19:20:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

btstack_memory: fix memory tracking, assert all buffers are freed in deinit

Browse Source
This commit is contained in:
Matthias Ringwald 2021-02-03 10:09:00 +01:00
parent a36c113578
commit 19ef97d232
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/btstack_memory.c
View File

@ -62,12 +62,19 @@ typedef struct btstack_memory_buffer {
} btstack_memory_buffer_t; } btstack_memory_buffer_t;
static btstack_memory_buffer_t * btstack_memory_malloc_buffers; static btstack_memory_buffer_t * btstack_memory_malloc_buffers;
static uint32_t btstack_memory_malloc_counter;
static void btstack_memory_tracking_add(btstack_memory_buffer_t * buffer){ static void btstack_memory_tracking_add(btstack_memory_buffer_t * buffer){
btstack_assert(buffer != NULL); btstack_assert(buffer != NULL);
if (btstack_memory_malloc_buffers != NULL) {
// let current first item prev point to new first item
btstack_memory_malloc_buffers->prev = buffer;
}
buffer->prev = NULL; buffer->prev = NULL;
buffer->next = btstack_memory_malloc_buffers; buffer->next = btstack_memory_malloc_buffers;
btstack_memory_malloc_buffers = buffer; btstack_memory_malloc_buffers = buffer;
btstack_memory_malloc_counter++;
} }
static void btstack_memory_tracking_remove(btstack_memory_buffer_t * buffer){ static void btstack_memory_tracking_remove(btstack_memory_buffer_t * buffer){
@ -81,6 +88,8 @@ static void btstack_memory_tracking_remove(btstack_memory_buffer_t * buffer){
if (buffer->next != NULL){ if (buffer->next != NULL){
buffer->next->prev = buffer->prev; buffer->next->prev = buffer->prev;
} }
btstack_memory_malloc_counter--;
} }
#endif #endif
@ -91,6 +100,7 @@ void btstack_memory_deinit(void){
btstack_memory_malloc_buffers = buffer->next; btstack_memory_malloc_buffers = buffer->next;
free(buffer); free(buffer);
} }
btstack_assert(btstack_memory_malloc_counter == 0);
#endif #endif
} }

11
tool/btstack_memory_generator.py
View File

@ -139,13 +139,19 @@ typedef struct btstack_memory_buffer {
} btstack_memory_buffer_t; } btstack_memory_buffer_t;
static btstack_memory_buffer_t * btstack_memory_malloc_buffers; static btstack_memory_buffer_t * btstack_memory_malloc_buffers;
static uint32_t btstack_memory_malloc_counter;
static void btstack_memory_tracking_add(btstack_memory_buffer_t * buffer){ static void btstack_memory_tracking_add(btstack_memory_buffer_t * buffer){
btstack_assert(buffer != NULL); btstack_assert(buffer != NULL);
btstack_memory_malloc_buffers = buffer; if (btstack_memory_malloc_buffers != NULL) {
// let current first item prev point to new first item
btstack_memory_malloc_buffers->prev = buffer;
}
buffer->prev = NULL; buffer->prev = NULL;
buffer->next = btstack_memory_malloc_buffers; buffer->next = btstack_memory_malloc_buffers;
btstack_memory_malloc_buffers = buffer; btstack_memory_malloc_buffers = buffer;
btstack_memory_malloc_counter++;
} }
static void btstack_memory_tracking_remove(btstack_memory_buffer_t * buffer){ static void btstack_memory_tracking_remove(btstack_memory_buffer_t * buffer){
@ -159,6 +165,8 @@ static void btstack_memory_tracking_remove(btstack_memory_buffer_t * buffer){
if (buffer->next != NULL){ if (buffer->next != NULL){
buffer->next->prev = buffer->prev; buffer->next->prev = buffer->prev;
} }
btstack_memory_malloc_counter--;
} }
#endif #endif
@ -169,6 +177,7 @@ void btstack_memory_deinit(void){
btstack_memory_malloc_buffers = buffer->next; btstack_memory_malloc_buffers = buffer->next;
free(buffer); free(buffer);
} }
btstack_assert(btstack_memory_malloc_counter == 0);
#endif #endif
} }
""" """