Make it possible to turn off collecting memory stats (MICROPY_MEM_STATS).

This commit is contained in:
Paul Sokolovsky 2014-01-03 03:06:25 +02:00
parent 780f555b2e
commit ef18102b9e
2 changed files with 31 additions and 0 deletions

7
py/defaultconfig.h Normal file
View File

@ -0,0 +1,7 @@
// This file contains default configuration settings for MicroPython.
// You can override any of these options in mpconfig.h for your port.
// Whether to collect memory allocation stats
#ifndef MICROPY_MEM_STATS
#define MICROPY_MEM_STATS (1)
#endif

View File

@ -2,12 +2,16 @@
#include <stdlib.h> #include <stdlib.h>
#include "misc.h" #include "misc.h"
#include "mpconfig.h"
#include "defaultconfig.h"
#if MICROPY_MEM_STATS
static int total_bytes_allocated = 0; static int total_bytes_allocated = 0;
static int current_bytes_allocated = 0; static int current_bytes_allocated = 0;
static int peak_bytes_allocated = 0; static int peak_bytes_allocated = 0;
#define UPDATE_PEAK() { if (current_bytes_allocated > peak_bytes_allocated) peak_bytes_allocated = current_bytes_allocated; } #define UPDATE_PEAK() { if (current_bytes_allocated > peak_bytes_allocated) peak_bytes_allocated = current_bytes_allocated; }
#endif
void *m_malloc(int num_bytes) { void *m_malloc(int num_bytes) {
if (num_bytes == 0) { if (num_bytes == 0) {
@ -18,9 +22,11 @@ void *m_malloc(int num_bytes) {
printf("could not allocate memory, allocating %d bytes\n", num_bytes); printf("could not allocate memory, allocating %d bytes\n", num_bytes);
return NULL; return NULL;
} }
#if MICROPY_MEM_STATS
total_bytes_allocated += num_bytes; total_bytes_allocated += num_bytes;
current_bytes_allocated += num_bytes; current_bytes_allocated += num_bytes;
UPDATE_PEAK(); UPDATE_PEAK();
#endif
return ptr; return ptr;
} }
@ -33,9 +39,11 @@ void *m_malloc0(int num_bytes) {
printf("could not allocate memory, allocating %d bytes\n", num_bytes); printf("could not allocate memory, allocating %d bytes\n", num_bytes);
return NULL; return NULL;
} }
#if MICROPY_MEM_STATS
total_bytes_allocated += num_bytes; total_bytes_allocated += num_bytes;
current_bytes_allocated += num_bytes; current_bytes_allocated += num_bytes;
UPDATE_PEAK(); UPDATE_PEAK();
#endif
return ptr; return ptr;
} }
@ -49,6 +57,7 @@ void *m_realloc(void *ptr, int old_num_bytes, int new_num_bytes) {
printf("could not allocate memory, reallocating %d bytes\n", new_num_bytes); printf("could not allocate memory, reallocating %d bytes\n", new_num_bytes);
return NULL; return NULL;
} }
#if MICROPY_MEM_STATS
// At first thought, "Total bytes allocated" should only grow, // At first thought, "Total bytes allocated" should only grow,
// after all, it's *total*. But consider for example 2K block // after all, it's *total*. But consider for example 2K block
// shrunk to 1K and then grown to 2K again. It's still 2K // shrunk to 1K and then grown to 2K again. It's still 2K
@ -58,6 +67,7 @@ void *m_realloc(void *ptr, int old_num_bytes, int new_num_bytes) {
total_bytes_allocated += diff; total_bytes_allocated += diff;
current_bytes_allocated += diff; current_bytes_allocated += diff;
UPDATE_PEAK(); UPDATE_PEAK();
#endif
return ptr; return ptr;
} }
@ -65,17 +75,31 @@ void m_free(void *ptr, int num_bytes) {
if (ptr != NULL) { if (ptr != NULL) {
free(ptr); free(ptr);
} }
#if MICROPY_MEM_STATS
current_bytes_allocated -= num_bytes; current_bytes_allocated -= num_bytes;
#endif
} }
int m_get_total_bytes_allocated(void) { int m_get_total_bytes_allocated(void) {
#if MICROPY_MEM_STATS
return total_bytes_allocated; return total_bytes_allocated;
#else
return -1;
#endif
} }
int m_get_current_bytes_allocated(void) { int m_get_current_bytes_allocated(void) {
#if MICROPY_MEM_STATS
return current_bytes_allocated; return current_bytes_allocated;
#else
return -1;
#endif
} }
int m_get_peak_bytes_allocated(void) { int m_get_peak_bytes_allocated(void) {
#if MICROPY_MEM_STATS
return peak_bytes_allocated; return peak_bytes_allocated;
#else
return -1;
#endif
} }