diff options
| -rw-r--r-- | backgraph.c | 9 | ||||
| -rw-r--r-- | headers.c | 12 | ||||
| -rw-r--r-- | include/private/gc_priv.h | 7 | ||||
| -rw-r--r-- | include/private/gcconfig.h | 9 | ||||
| -rw-r--r-- | misc.c | 2 | ||||
| -rw-r--r-- | os_dep.c | 5 |
6 files changed, 25 insertions, 19 deletions
diff --git a/backgraph.c b/backgraph.c index d6f3223d..5cc85b4a 100644 --- a/backgraph.c +++ b/backgraph.c @@ -86,8 +86,9 @@ static back_edges *avail_back_edges = 0; static back_edges * new_back_edges(void) { if (0 == back_edge_space) { - back_edge_space = (back_edges *) - GET_MEM(MAX_BACK_EDGE_STRUCTS*sizeof(back_edges)); + back_edge_space = (back_edges *)GET_MEM( + ROUNDUP_PAGESIZE_IF_MMAP(MAX_BACK_EDGE_STRUCTS + * sizeof(back_edges))); GC_add_to_our_memory((ptr_t)back_edge_space, MAX_BACK_EDGE_STRUCTS*sizeof(back_edges)); } @@ -127,7 +128,9 @@ static void push_in_progress(ptr_t p) { if (n_in_progress >= in_progress_size) { if (in_progress_size == 0) { - in_progress_size = INITIAL_IN_PROGRESS; + in_progress_size = ROUNDUP_PAGESIZE_IF_MMAP(INITIAL_IN_PROGRESS + * sizeof(ptr_t)) + / sizeof(ptr_t); in_progress_space = (ptr_t *)GET_MEM(in_progress_size * sizeof(ptr_t)); GC_add_to_our_memory((ptr_t)in_progress_space, in_progress_size * sizeof(ptr_t)); @@ -129,25 +129,21 @@ GC_INNER ptr_t GC_scratch_alloc(size_t bytes) if (bytes_to_get <= bytes) { /* Undo the damage, and get memory directly */ - bytes_to_get = bytes; -# ifdef USE_MMAP - bytes_to_get = ROUNDUP_PAGESIZE(bytes_to_get); -# endif + bytes_to_get = ROUNDUP_PAGESIZE_IF_MMAP(bytes); result = (ptr_t)GET_MEM(bytes_to_get); GC_add_to_our_memory(result, bytes_to_get); scratch_free_ptr -= bytes; GC_scratch_last_end_ptr = result + bytes; return(result); } + + bytes_to_get = ROUNDUP_PAGESIZE_IF_MMAP(bytes_to_get); /* for safety */ result = (ptr_t)GET_MEM(bytes_to_get); GC_add_to_our_memory(result, bytes_to_get); if (result == 0) { WARN("Out of memory - trying to allocate less\n", 0); scratch_free_ptr -= bytes; - bytes_to_get = bytes; -# ifdef USE_MMAP - bytes_to_get = ROUNDUP_PAGESIZE(bytes_to_get); -# endif + bytes_to_get = ROUNDUP_PAGESIZE_IF_MMAP(bytes); result = (ptr_t)GET_MEM(bytes_to_get); GC_add_to_our_memory(result, bytes_to_get); return result; diff --git a/include/private/gc_priv.h b/include/private/gc_priv.h index fe77e3a2..c3235421 100644 --- a/include/private/gc_priv.h +++ b/include/private/gc_priv.h @@ -1407,6 +1407,13 @@ GC_EXTERN word GC_page_size; #define ROUNDUP_PAGESIZE(bytes) \ (((bytes) + GC_page_size - 1) & ~(GC_page_size - 1)) +/* Same as above but used to make GET_MEM() argument safe. */ +#ifdef MMAP_SUPPORTED +# define ROUNDUP_PAGESIZE_IF_MMAP(bytes) ROUNDUP_PAGESIZE(bytes) +#else +# define ROUNDUP_PAGESIZE_IF_MMAP(bytes) (bytes) +#endif + #if defined(MSWIN32) || defined(MSWINCE) || defined(CYGWIN32) struct _SYSTEM_INFO; GC_EXTERN struct _SYSTEM_INFO GC_sysinfo; diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h index 5bbf4940..de7998be 100644 --- a/include/private/gcconfig.h +++ b/include/private/gcconfig.h @@ -2558,6 +2558,11 @@ # undef USE_MMAP #endif +#if defined(LINUX) || defined(FREEBSD) || defined(SOLARIS) || defined(IRIX5) \ + || ((defined(USE_MMAP) || defined(USE_MUNMAP)) && !defined(USE_WINALLOC)) +# define MMAP_SUPPORTED +#endif + #if defined(GC_DISABLE_INCREMENTAL) || defined(MANUAL_VDB) # undef GWW_VDB # undef MPROTECT_VDB @@ -2894,8 +2899,8 @@ /* REDIRECT_MALLOC macro defined. */ /* GET_MEM() returns a HLKSIZE aligned chunk. */ /* 0 is taken to mean failure. */ - /* In the case os USE_MMAP, the argument must also be a */ - /* physical page size. */ + /* In case of MMAP_SUPPORTED, the argument must also be */ + /* a multiple of a physical page size. */ /* GET_MEM is currently not assumed to retrieve 0 filled space, */ /* though we should perhaps take advantage of the case in which */ /* does. */ @@ -682,7 +682,7 @@ GC_API void GC_CALL GC_get_heap_usage_safe(GC_word *pheap_size, } /* At this execution point, GC_setpagesize() and GC_init_win32() */ /* must already be called (for GET_MEM() to work correctly). */ - content = (char *)GET_MEM(len + 1); + content = (char *)GET_MEM(ROUNDUP_PAGESIZE_IF_MMAP(len + 1)); if (content == NULL) { CloseHandle(hFile); return; /* allocation failure */ @@ -98,11 +98,6 @@ # include <malloc.h> /* for locking */ #endif -#if defined(LINUX) || defined(FREEBSD) || defined(SOLARIS) || defined(IRIX5) \ - || ((defined(USE_MMAP) || defined(USE_MUNMAP)) && !defined(USE_WINALLOC)) -# define MMAP_SUPPORTED -#endif - #if defined(MMAP_SUPPORTED) || defined(ADD_HEAP_GUARD_PAGES) # if defined(USE_MUNMAP) && !defined(USE_MMAP) # error "invalid config - USE_MUNMAP requires USE_MMAP" |