From 02de0c57d233bf969ed3971c319a96dd9f998549 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Wed, 1 Jan 2014 23:15:47 +0200 Subject: [PATCH] Add new alloc metric: current_bytes_allocated. Unlike total_bytes_allocated, this tracks m_free()'s too. --- py/malloc.c | 12 +++++++++++- py/misc.h | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/py/malloc.c b/py/malloc.c index a94edd3fe9..13f0a8fc3e 100644 --- a/py/malloc.c +++ b/py/malloc.c @@ -4,6 +4,7 @@ #include "misc.h" static int total_bytes_allocated = 0; +static int current_bytes_allocated = 0; void *m_malloc(int num_bytes) { if (num_bytes == 0) { @@ -15,6 +16,7 @@ void *m_malloc(int num_bytes) { return NULL; } total_bytes_allocated += num_bytes; + current_bytes_allocated += num_bytes; return ptr; } @@ -28,6 +30,7 @@ void *m_malloc0(int num_bytes) { return NULL; } total_bytes_allocated += num_bytes; + current_bytes_allocated += num_bytes; return ptr; } @@ -46,7 +49,9 @@ void *m_realloc(void *ptr, int old_num_bytes, int new_num_bytes) { // shrunk to 1K and then grown to 2K again. It's still 2K // allocated total. If we process only positive increments, // we'll count 3K. - total_bytes_allocated += new_num_bytes - old_num_bytes; + int diff = new_num_bytes - old_num_bytes; + total_bytes_allocated += diff; + current_bytes_allocated += diff; return ptr; } @@ -54,8 +59,13 @@ void m_free(void *ptr, int num_bytes) { if (ptr != NULL) { free(ptr); } + current_bytes_allocated -= num_bytes; } int m_get_total_bytes_allocated(void) { return total_bytes_allocated; } + +int m_get_current_bytes_allocated(void) { + return current_bytes_allocated; +} diff --git a/py/misc.h b/py/misc.h index 9f83ab526f..383d3986a7 100644 --- a/py/misc.h +++ b/py/misc.h @@ -32,6 +32,7 @@ void *m_realloc(void *ptr, int old_num_bytes, int new_num_bytes); void m_free(void *ptr, int num_bytes); int m_get_total_bytes_allocated(void); +int m_get_current_bytes_allocated(void); /** unichar / UTF-8 *********************************************/