daab651c5c
Also add some more debugging output to gc_dump_alloc_table(). Now that newly allocated heap is always zero'd, maybe we just make this a policy for the uPy API to keep it simple (ie any new implementation of memory allocation must zero all allocations). This follows the D language philosophy. Before this patch, a previously used memory block which had pointers in it may still retain those pointers if the new user of that block does not actually use the entire block. Eg, if I want 5 blocks worth of heap, I actually get 8 (round up to nearest 4). Then I never use the last 3, so they keep their old values, which may be pointers pointing to the heap, hence preventing GC. In rare (or maybe not that rare) cases, this leads to long, unintentional "linked lists" within the GC'd heap, filling it up completely. It's pretty rare, because you have to reuse exactly that memory which is part of this "linked list", and reuse it in just the right way. This should fix issue #522, and might have something to do with issue #510.
178 lines
4.6 KiB
C
178 lines
4.6 KiB
C
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include "misc.h"
|
|
#include "mpconfig.h"
|
|
|
|
#if 0 // print debugging info
|
|
#define DEBUG_printf DEBUG_printf
|
|
#else // don't print debugging info
|
|
#define DEBUG_printf(...) (void)0
|
|
#endif
|
|
|
|
#if MICROPY_MEM_STATS
|
|
STATIC int total_bytes_allocated = 0;
|
|
STATIC int current_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; }
|
|
#endif
|
|
|
|
#if MICROPY_ENABLE_GC
|
|
#include "gc.h"
|
|
|
|
// We redirect standard alloc functions to GC heap - just for the rest of
|
|
// this module. In the rest of micropython source, system malloc can be
|
|
// freely accessed - for interfacing with system and 3rd-party libs for
|
|
// example. On the other hand, some (e.g. bare-metal) ports may use GC
|
|
// heap as system heap, so, to avoid warnings, we do undef's first.
|
|
#undef malloc
|
|
#undef free
|
|
#undef realloc
|
|
#define malloc(b) gc_alloc((b), false)
|
|
#define malloc_with_finaliser(b) gc_alloc((b), true)
|
|
#define free gc_free
|
|
#define realloc gc_realloc
|
|
#endif // MICROPY_ENABLE_GC
|
|
|
|
void *m_malloc(int num_bytes) {
|
|
if (num_bytes == 0) {
|
|
return NULL;
|
|
}
|
|
void *ptr = malloc(num_bytes);
|
|
if (ptr == NULL) {
|
|
return m_malloc_fail(num_bytes);
|
|
}
|
|
#if MICROPY_MEM_STATS
|
|
total_bytes_allocated += num_bytes;
|
|
current_bytes_allocated += num_bytes;
|
|
UPDATE_PEAK();
|
|
#endif
|
|
DEBUG_printf("malloc %d : %p\n", num_bytes, ptr);
|
|
return ptr;
|
|
}
|
|
|
|
void *m_malloc_maybe(int num_bytes) {
|
|
void *ptr = malloc(num_bytes);
|
|
if (ptr == NULL) {
|
|
return NULL;
|
|
}
|
|
#if MICROPY_MEM_STATS
|
|
total_bytes_allocated += num_bytes;
|
|
current_bytes_allocated += num_bytes;
|
|
UPDATE_PEAK();
|
|
#endif
|
|
DEBUG_printf("malloc %d : %p\n", num_bytes, ptr);
|
|
return ptr;
|
|
}
|
|
|
|
#if MICROPY_ENABLE_FINALISER
|
|
void *m_malloc_with_finaliser(int num_bytes) {
|
|
if (num_bytes == 0) {
|
|
return NULL;
|
|
}
|
|
void *ptr = malloc_with_finaliser(num_bytes);
|
|
if (ptr == NULL) {
|
|
return m_malloc_fail(num_bytes);
|
|
}
|
|
#if MICROPY_MEM_STATS
|
|
total_bytes_allocated += num_bytes;
|
|
current_bytes_allocated += num_bytes;
|
|
UPDATE_PEAK();
|
|
#endif
|
|
DEBUG_printf("malloc %d : %p\n", num_bytes, ptr);
|
|
return ptr;
|
|
}
|
|
#endif
|
|
|
|
void *m_malloc0(int num_bytes) {
|
|
void *ptr = m_malloc(num_bytes);
|
|
#if MICROPY_ENABLE_GC
|
|
// the GC already zeros out all memory
|
|
#else
|
|
if (ptr != NULL) {
|
|
memset(ptr, 0, num_bytes);
|
|
}
|
|
#endif
|
|
return ptr;
|
|
}
|
|
|
|
void *m_realloc(void *ptr, int old_num_bytes, int new_num_bytes) {
|
|
if (new_num_bytes == 0) {
|
|
free(ptr);
|
|
return NULL;
|
|
}
|
|
void *new_ptr = realloc(ptr, new_num_bytes);
|
|
if (new_ptr == NULL) {
|
|
return m_malloc_fail(new_num_bytes);
|
|
}
|
|
#if MICROPY_MEM_STATS
|
|
// At first thought, "Total bytes allocated" should only grow,
|
|
// after all, it's *total*. But consider for example 2K block
|
|
// 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.
|
|
int diff = new_num_bytes - old_num_bytes;
|
|
total_bytes_allocated += diff;
|
|
current_bytes_allocated += diff;
|
|
UPDATE_PEAK();
|
|
#endif
|
|
DEBUG_printf("realloc %p, %d, %d : %p\n", ptr, old_num_bytes, new_num_bytes, new_ptr);
|
|
return new_ptr;
|
|
}
|
|
|
|
void *m_realloc_maybe(void *ptr, int old_num_bytes, int new_num_bytes) {
|
|
void *new_ptr = realloc(ptr, new_num_bytes);
|
|
if (new_ptr == NULL) {
|
|
return NULL;
|
|
}
|
|
#if MICROPY_MEM_STATS
|
|
// At first thought, "Total bytes allocated" should only grow,
|
|
// after all, it's *total*. But consider for example 2K block
|
|
// 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.
|
|
int diff = new_num_bytes - old_num_bytes;
|
|
total_bytes_allocated += diff;
|
|
current_bytes_allocated += diff;
|
|
UPDATE_PEAK();
|
|
#endif
|
|
DEBUG_printf("realloc %p, %d, %d : %p\n", ptr, old_num_bytes, new_num_bytes, new_ptr);
|
|
return new_ptr;
|
|
}
|
|
|
|
void m_free(void *ptr, int num_bytes) {
|
|
if (ptr != NULL) {
|
|
free(ptr);
|
|
}
|
|
#if MICROPY_MEM_STATS
|
|
current_bytes_allocated -= num_bytes;
|
|
#endif
|
|
DEBUG_printf("free %p, %d\n", ptr, num_bytes);
|
|
}
|
|
|
|
int m_get_total_bytes_allocated(void) {
|
|
#if MICROPY_MEM_STATS
|
|
return total_bytes_allocated;
|
|
#else
|
|
return -1;
|
|
#endif
|
|
}
|
|
|
|
int m_get_current_bytes_allocated(void) {
|
|
#if MICROPY_MEM_STATS
|
|
return current_bytes_allocated;
|
|
#else
|
|
return -1;
|
|
#endif
|
|
}
|
|
|
|
int m_get_peak_bytes_allocated(void) {
|
|
#if MICROPY_MEM_STATS
|
|
return peak_bytes_allocated;
|
|
#else
|
|
return -1;
|
|
#endif
|
|
}
|