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

Places: refactor allocate for custom allocators

Browse Source
This commit is contained in:
Kevin Tew 2010-08-26 12:17:15 -06:00
parent 4d8cc1bc51
commit 04dceafe49
1 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1034,28 +1034,10 @@ inline static size_t gen0_size_in_use(NewGC *gc) {
#define BYTES_MULTIPLE_OF_WORD_TO_WORDS(sizeb) ((sizeb) >> gcLOG_WORD_SIZE) #define BYTES_MULTIPLE_OF_WORD_TO_WORDS(sizeb) ((sizeb) >> gcLOG_WORD_SIZE)
inline static void *allocate(const size_t request_size, const int type) inline unsigned long allocate_slowpath(NewGC *gc, size_t allocate_size, unsigned long newptr)
{ {
size_t allocate_size; do {
unsigned long newptr;
if(request_size == 0) return (void *) zero_sized;
allocate_size = COMPUTE_ALLOC_SIZE_FOR_OBJECT_SIZE(request_size);
if(allocate_size > MAX_OBJECT_SIZE) return allocate_big(request_size, type);
/* ensure that allocation will fit in a gen0 page */
newptr = GC_gen0_alloc_page_ptr + allocate_size;
ASSERT_VALID_OBJPTR(newptr);
/* master always overflows and uses allocate_medium because master allocations can't move */ /* master always overflows and uses allocate_medium because master allocations can't move */
while (OVERFLOWS_GEN0(newptr)) {
NewGC *gc = GC_get_GC();
#ifdef MZ_USE_PLACES
if (postmaster_and_master_gc(gc)) {
return allocate_medium(request_size, type);
}
#endif
/* bring page size used up to date */ /* bring page size used up to date */
gc->gen0.curr_alloc_page->size = GC_gen0_alloc_page_ptr - NUM(gc->gen0.curr_alloc_page->addr); gc->gen0.curr_alloc_page->size = GC_gen0_alloc_page_ptr - NUM(gc->gen0.curr_alloc_page->addr);
gc->gen0.current_size += gc->gen0.curr_alloc_page->size; gc->gen0.current_size += gc->gen0.curr_alloc_page->size;
@ -1094,7 +1076,36 @@ inline static void *allocate(const size_t request_size, const int type)
} }
newptr = GC_gen0_alloc_page_ptr + allocate_size; newptr = GC_gen0_alloc_page_ptr + allocate_size;
ASSERT_VALID_OBJPTR(newptr); ASSERT_VALID_OBJPTR(newptr);
}
} while (OVERFLOWS_GEN0(newptr));
return newptr;
}
inline static void *allocate(const size_t request_size, const int type)
{
size_t allocate_size;
unsigned long newptr;
if(request_size == 0) return (void *) zero_sized;
allocate_size = COMPUTE_ALLOC_SIZE_FOR_OBJECT_SIZE(request_size);
if(allocate_size > MAX_OBJECT_SIZE) return allocate_big(request_size, type);
/* ensure that allocation will fit in a gen0 page */
newptr = GC_gen0_alloc_page_ptr + allocate_size;
ASSERT_VALID_OBJPTR(newptr);
/* SLOW PATH: allocate_size overflows current gen0 page */
if(OVERFLOWS_GEN0(newptr)) {
NewGC *gc = GC_get_GC();
#ifdef MZ_USE_PLACES
if (postmaster_and_master_gc(gc)) { return allocate_medium(request_size, type); }
#endif
newptr = allocate_slowpath(gc, allocate_size, newptr);
}
/* actual Allocation */ /* actual Allocation */
{ {