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

GC: make place-message support work with GC stress mode

Browse Source
This commit is contained in:
Matthew Flatt 2013-07-04 14:18:40 -06:00
parent b232f572a9
commit 0d60486a32
3 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
racket/src/racket/gc2/gc2.h
View File

@ -539,9 +539,11 @@ GC2_EXTERN intptr_t GC_is_place();
Otherwise returns 0; Otherwise returns 0;
*/ */
GC2_EXTERN intptr_t GC_message_objects_size(void *msg_memory); GC2_EXTERN int GC_message_small_objects_size(void *msg_memory, intptr_t up_to);
/* /*
Returns the total size of all objects allocated by the message allocator Determines whether the message qualifies as short and whether the
total size of all objects allocated by the message allocator is less
than `up_to'
*/ */
GC2_EXTERN intptr_t GC_message_allocator_size(void *msg_memory); GC2_EXTERN intptr_t GC_message_allocator_size(void *msg_memory);

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

@ -1215,8 +1215,10 @@ inline static void gen0_free_mpage(NewGC *gc, mpage *page) {
#ifdef MZ_GC_STRESS_TESTING #ifdef MZ_GC_STRESS_TESTING
# define GC_TRIGGER_COUNT 100 # define GC_TRIGGER_COUNT 100
static int stress_counter = 0; static int stress_counter = 0;
int scheme_gc_slow_path_started = 0;
static int TAKE_SLOW_PATH() static int TAKE_SLOW_PATH()
{ {
if (!scheme_gc_slow_path_started) return 0;
stress_counter++; stress_counter++;
if (stress_counter > GC_TRIGGER_COUNT) if (stress_counter > GC_TRIGGER_COUNT)
return 1; return 1;
@ -1315,8 +1317,7 @@ inline static void *allocate(const size_t request_size, const int type)
uintptr_t newptr; uintptr_t newptr;
#ifdef MZ_GC_STRESS_TESTING #ifdef MZ_GC_STRESS_TESTING
stress_counter++; if (TAKE_SLOW_PATH()) {
if (stress_counter > GC_TRIGGER_COUNT) {
NewGC *gc = GC_get_GC(); NewGC *gc = GC_get_GC();
if (!gc->dumping_avoid_collection) { if (!gc->dumping_avoid_collection) {
stress_counter = 0; stress_counter = 0;
@ -1675,15 +1676,13 @@ void GC_adopt_message_allocator(void *param) {
gc_if_needed_account_alloc_size(gc, 0); gc_if_needed_account_alloc_size(gc, 0);
} }
intptr_t GC_message_objects_size(void *param) { int GC_message_small_objects_size(void *param, intptr_t up_to) {
MsgMemory *msgm = (MsgMemory *) param; MsgMemory *msgm = (MsgMemory *) param;
if (!msgm) { return sizeof(param); } if (!msgm) return 1;
if (msgm->big_pages && msgm->size < 1024) { if (msgm->size > up_to) return 0;
printf("Error: message allocators with big pages should be bigger than %" PRIdPTR "!\n", if (msgm->big_pages) return 0;
msgm->size); if (msgm->pages && msgm->pages->next) return 0;
exit(1); return 1;
}
return msgm->size;
} }
intptr_t GC_message_allocator_size(void *param) { intptr_t GC_message_allocator_size(void *param) {
@ -1695,26 +1694,21 @@ intptr_t GC_message_allocator_size(void *param) {
void GC_dispose_short_message_allocator(void *param) { void GC_dispose_short_message_allocator(void *param) {
NewGC *gc = GC_get_GC(); NewGC *gc = GC_get_GC();
mpage *tmp;
MsgMemory *msgm = (MsgMemory *) param; MsgMemory *msgm = (MsgMemory *) param;
if (msgm->big_pages) if (msgm->big_pages) {
{
printf("Error: short disposable message allocators should not have big objects!\n"); printf("Error: short disposable message allocators should not have big objects!\n");
exit(1); abort();
} }
if (msgm->pages) if (msgm->pages) {
{ if (msgm->pages->next) {
tmp = msgm->pages;
if (tmp->next)
{
printf("Error: short disposable message allocators should not have more than one page!\n"); printf("Error: short disposable message allocators should not have more than one page!\n");
exit(1); abort();
} }
free_orphaned_page(gc, tmp); free_orphaned_page(gc, msgm->pages);
} }
free(msgm); free(msgm);
} }
@ -1873,7 +1867,7 @@ inline static int marked(NewGC *gc, const void *p)
break; break;
default: default:
fprintf(stderr, "ABORTING! INVALID SIZE_CLASS %i\n", page->size_class); fprintf(stderr, "ABORTING! INVALID SIZE_CLASS %i\n", page->size_class);
exit(EXIT_FAILURE); abort();
} }
} }
@ -2515,7 +2509,7 @@ inline static int page_mmu_type(mpage *page) {
return MMU_BIG_MED; return MMU_BIG_MED;
default: /* BIG PAGE size_class 2 or 3 */ default: /* BIG PAGE size_class 2 or 3 */
printf("Error Page class %i doesn't exist\n", page->size_class); printf("Error Page class %i doesn't exist\n", page->size_class);
exit(1); abort();
} }
} }

2
racket/src/racket/src/place.c
View File

@ -2760,7 +2760,7 @@ Scheme_Object *scheme_places_deserialize(Scheme_Object *so, void *msg_memory)
if (new_so) return new_so; if (new_so) return new_so;
/* small messages are deemed to be < 1k, this could be tuned in either direction */ /* small messages are deemed to be < 1k, this could be tuned in either direction */
if (GC_message_objects_size(msg_memory) < 1024) { if (GC_message_small_objects_size(msg_memory, 1024)) {
new_so = do_places_deep_copy(so, mzPDC_UNCOPY, 1, NULL, NULL); new_so = do_places_deep_copy(so, mzPDC_UNCOPY, 1, NULL, NULL);
GC_dispose_short_message_allocator(msg_memory); GC_dispose_short_message_allocator(msg_memory);
/* from this point, we must return immediately, so that any /* from this point, we must return immediately, so that any