suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GC: fix yet another problem counting allocated bytes

Browse Source
This commit is contained in:
Matthew Flatt 2015-12-01 16:12:30 -07:00
parent 67bf4349ca
commit d56e7309ad
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
racket/src/racket/gc2/newgc.c
View File

@ -1353,7 +1353,9 @@ static int TAKE_SLOW_PATH()
#endif #endif
inline static size_t gen0_size_in_use(NewGC *gc) { inline static size_t gen0_size_in_use(NewGC *gc) {
return (gc->gen0.current_size + ((GC_gen0_alloc_page_ptr - NUM(gc->gen0.curr_alloc_page->addr)) - PREFIX_SIZE)); return (gc->gen0.current_size + (gc->gen0.curr_alloc_page
? ((GC_gen0_alloc_page_ptr - NUM(gc->gen0.curr_alloc_page->addr)) - PREFIX_SIZE)
: 0));
} }
#define BYTES_MULTIPLE_OF_WORD_TO_WORDS(sizeb) ((sizeb) >> gcLOG_WORD_SIZE) #define BYTES_MULTIPLE_OF_WORD_TO_WORDS(sizeb) ((sizeb) >> gcLOG_WORD_SIZE)
@ -1405,7 +1407,9 @@ inline static uintptr_t allocate_slowpath(NewGC *gc, size_t allocate_size, uintp
#ifdef INSTRUMENT_PRIMITIVES #ifdef INSTRUMENT_PRIMITIVES
LOG_PRIM_START(((void*)garbage_collect)); LOG_PRIM_START(((void*)garbage_collect));
#endif #endif
gc->gen0.curr_alloc_page = NULL; /* so the memory use is not counted */
collect_now(gc, 0, 0); collect_now(gc, 0, 0);
#ifdef INSTRUMENT_PRIMITIVES #ifdef INSTRUMENT_PRIMITIVES