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

unbreak GC for Linux and some other Unix variants

Browse Source 
Corrects another problem with cceda78374.
This commit is contained in:
Matthew Flatt 2014-11-01 14:04:49 -06:00
parent fe557c0e93
commit 0b200abe63
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
racket/src/racket/gc2/vm.c
View File

@ -20,7 +20,7 @@ enum {
/* No block cache or alloc cache */
#elif defined(OSKIT)
# define OS_ALLOCATOR_NEEDS_ALIGNMENT
#elif defined(MZ_USE_PLACES) && defined(PREFER_MMAP_LARGE_BLOCKS)
#elif defined(MZ_USE_PLACES) || defined(PREFER_MMAP_LARGE_BLOCKS)
# define USE_BLOCK_CACHE
#else
# define USE_ALLOC_CACHE
@ -133,18 +133,21 @@ static void *mmu_alloc_page(MMU* mmu, size_t len, size_t alignment, int dirty, i
mmu_assert_os_page_aligned(mmu, len);
#ifdef USE_BLOCK_CACHE
return block_cache_alloc_page(mmu->block_cache, len, alignment, dirty, type, expect_mprotect, src_block, &mmu->memory_allocated);
#elif defined(USE_ALLOC_CACHE)
#else
*src_block = NULL;
# if defined(USE_ALLOC_CACHE)
/* len = mmu_round_up_to_os_page_size(mmu, len); */
{
AllocCacheBlock *alloc_cache = mmu->alloc_caches[!!expect_mprotect];
return alloc_cache_alloc_page(alloc_cache, len, alignment, dirty, &mmu->memory_allocated);
}
#else
# else
mmu->memory_allocated += len;
# ifdef OS_ALLOCATOR_NEEDS_ALIGNMENT
# ifdef OS_ALLOCATOR_NEEDS_ALIGNMENT
return os_alloc_aligned_pages(len, alignment, dirty);
#else
# else
return os_alloc_pages(len);
# endif
# endif
#endif
}