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

Moved freeblock to NewGC struct

Browse Source 
svn: r12299
This commit is contained in:
Kevin Tew 2008-11-05 21:09:30 +00:00
parent af34446ec3
commit 397e42ae06
4 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/mzscheme/gc2/alloc_cache.c
View File

@ -42,16 +42,7 @@ static void *malloc_dirty_pages(size_t len, size_t alignment)
return do_malloc_pages(len, alignment, 1); return do_malloc_pages(len, alignment, 1);
} }
typedef struct {
void *start;
long len;
short age;
short zeroed;
} Free_Block;
#define BLOCKFREE_UNMAP_AGE 1 #define BLOCKFREE_UNMAP_AGE 1
#define BLOCKFREE_CACHE_SIZE 96
static Free_Block blockfree[BLOCKFREE_CACHE_SIZE];
static int compare_free_block(const void *a, const void *b) static int compare_free_block(const void *a, const void *b)
{ {
@ -64,6 +55,7 @@ static int compare_free_block(const void *a, const void *b)
static void collapse_adjacent_pages(void) static void collapse_adjacent_pages(void)
{ {
int i, j; int i, j;
Free_Block *blockfree = GC->blockfree;
/* collapse adjacent: */ /* collapse adjacent: */
my_qsort(blockfree, BLOCKFREE_CACHE_SIZE, sizeof(Free_Block), compare_free_block); my_qsort(blockfree, BLOCKFREE_CACHE_SIZE, sizeof(Free_Block), compare_free_block);
@ -84,6 +76,7 @@ inline static void *find_cached_pages(size_t len, size_t alignment, int dirty_ok
{ {
int i; int i;
void *r; void *r;
Free_Block *blockfree = GC->blockfree;
/* Try an exact fit: */ /* Try an exact fit: */
for (i = 0; i < BLOCKFREE_CACHE_SIZE; i++) { for (i = 0; i < BLOCKFREE_CACHE_SIZE; i++) {
@ -136,6 +129,7 @@ inline static void *find_cached_pages(size_t len, size_t alignment, int dirty_ok
static void return_mem_to_cache(void *p, size_t len, int zeroed) static void return_mem_to_cache(void *p, size_t len, int zeroed)
{ {
int i; int i;
Free_Block *blockfree = GC->blockfree;
/* Round up to nearest page: */ /* Round up to nearest page: */
if (len & (page_size - 1)) if (len & (page_size - 1))
@ -187,6 +181,7 @@ static void free_pages(void *p, size_t len)
static void flush_freed_pages(void) static void flush_freed_pages(void)
{ {
int i; int i;
Free_Block *blockfree = GC->blockfree;
collapse_adjacent_pages(); collapse_adjacent_pages();

9
src/mzscheme/gc2/commongc_internal.h
View File

@ -67,3 +67,12 @@ typedef struct finalizer {
struct finalizer *right; struct finalizer *right;
} Fnl; } Fnl;
typedef struct {
void *start;
long len;
short age;
short zeroed;
} Free_Block;
#define BLOCKFREE_CACHE_SIZE 96

6
src/mzscheme/gc2/compactgc_internal.h
View File

@ -19,8 +19,10 @@ typedef struct CompactGC {
GC_Weak_Box *weak_boxes; GC_Weak_Box *weak_boxes;
GC_Ephemeron *ephemerons; GC_Ephemeron *ephemerons;
int num_last_seen_ephemerons; int num_last_seen_ephemerons;
Free_Block *blockfree;
} CompactGC; } CompactGC;
void CompactGC_initialize(CompactGC *newgc) { void CompactGC_initialize(CompactGC *gc) {
memset(newgc, 0, sizeof(CompactGC)); memset(gc, 0, sizeof(CompactGC));
gc->blockfree = malloc(sizeof(Free_Block) *BLOCKFREE_CACHE_SIZE);
} }

2
src/mzscheme/gc2/newgc.h
View File

@ -158,6 +158,7 @@ typedef struct NewGC {
GC_Weak_Box *weak_boxes; GC_Weak_Box *weak_boxes;
GC_Ephemeron *ephemerons; GC_Ephemeron *ephemerons;
int num_last_seen_ephemerons; int num_last_seen_ephemerons;
Free_Block *blockfree;
} NewGC; } NewGC;
void NewGC_initialize(NewGC *newgc) { void NewGC_initialize(NewGC *newgc) {
@ -169,6 +170,7 @@ void NewGC_initialize(NewGC *newgc) {
#else #else
newgc->page_maps = malloc(PAGEMAP32_SIZE * sizeof (mpage*)); newgc->page_maps = malloc(PAGEMAP32_SIZE * sizeof (mpage*));
#endif #endif
newgc->blockfree = malloc(sizeof(Free_Block) * BLOCKFREE_CACHE_SIZE);
newgc->generations_available = 1; newgc->generations_available = 1;
newgc->last_full_mem_use = (20 * 1024 * 1024); newgc->last_full_mem_use = (20 * 1024 * 1024);