X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fgencgc.c;h=18687975ce20bc096c1f60ce14c38d372a3f76ff;hb=ba12c5c0420f28250ef4931b47af92c6d7963195;hp=972697cd0a16a0a53a6d6a05fd1dae044713fc58;hpb=f71d9c8d57630ca41e149e03305e678cc3e7fc0f;p=sbcl.git diff --git a/src/runtime/gencgc.c b/src/runtime/gencgc.c index 972697c..1868797 100644 --- a/src/runtime/gencgc.c +++ b/src/runtime/gencgc.c @@ -81,7 +81,13 @@ enum { boolean enable_page_protection = 1; /* the minimum size (in bytes) for a large object*/ +#if (GENCGC_ALLOC_GRANULARITY >= PAGE_BYTES) && (GENCGC_ALLOC_GRANULARITY >= GENCGC_CARD_BYTES) +long large_object_size = 4 * GENCGC_ALLOC_GRANULARITY; +#elif (GENCGC_CARD_BYTES >= PAGE_BYTES) && (GENCGC_CARD_BYTES >= GENCGC_ALLOC_GRANULARITY) +long large_object_size = 4 * GENCGC_CARD_BYTES; +#else long large_object_size = 4 * PAGE_BYTES; +#endif /* @@ -217,7 +223,7 @@ static void *heap_base = NULL; inline void * page_address(page_index_t page_num) { - return (heap_base + (page_num * PAGE_BYTES)); + return (heap_base + (page_num * GENCGC_CARD_BYTES)); } /* Calculate the address where the allocation region associated with @@ -235,7 +241,7 @@ find_page_index(void *addr) { if (addr >= heap_base) { page_index_t index = ((pointer_sized_uint_t)addr - - (pointer_sized_uint_t)heap_base) / PAGE_BYTES; + (pointer_sized_uint_t)heap_base) / GENCGC_CARD_BYTES; if (index < page_table_pages) return (index); } @@ -246,7 +252,7 @@ static size_t npage_bytes(long npages) { gc_assert(npages>=0); - return ((unsigned long)npages)*PAGE_BYTES; + return ((unsigned long)npages)*GENCGC_CARD_BYTES; } /* Check that X is a higher address than Y and return offset from Y to @@ -355,6 +361,12 @@ static pthread_mutex_t free_pages_lock = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t allocation_lock = PTHREAD_MUTEX_INITIALIZER; #endif +extern unsigned long gencgc_release_granularity; +unsigned long gencgc_release_granularity = GENCGC_RELEASE_GRANULARITY; + +extern unsigned long gencgc_alloc_granularity; +unsigned long gencgc_alloc_granularity = GENCGC_ALLOC_GRANULARITY; + /* * miscellaneous heap functions @@ -513,7 +525,29 @@ write_generation_stats(FILE *file) } extern void -print_generation_stats() +write_heap_exhaustion_report(FILE *file, long available, long requested, + struct thread *thread) +{ + fprintf(file, + "Heap exhausted during %s: %ld bytes available, %ld requested.\n", + gc_active_p ? "garbage collection" : "allocation", + available, + requested); + write_generation_stats(file); + fprintf(file, "GC control variables:\n"); + fprintf(file, " *GC-INHIBIT* = %s\n *GC-PENDING* = %s\n", + SymbolValue(GC_INHIBIT,thread)==NIL ? "false" : "true", + (SymbolValue(GC_PENDING, thread) == T) ? + "true" : ((SymbolValue(GC_PENDING, thread) == NIL) ? + "false" : "in progress")); +#ifdef LISP_FEATURE_SB_THREAD + fprintf(file, " *STOP-FOR-GC-PENDING* = %s\n", + SymbolValue(STOP_FOR_GC_PENDING,thread)==NIL ? "false" : "true"); +#endif +} + +extern void +print_generation_stats(void) { write_generation_stats(stderr); } @@ -531,10 +565,27 @@ log_generation_stats(char *logfile, char *header) write_generation_stats(log); fclose(log); } else { - fprintf(stderr, "Could not open gc logile: %s\n", gc_logfile); + fprintf(stderr, "Could not open gc logfile: %s\n", logfile); + fflush(stderr); + } + } +} + +extern void +report_heap_exhaustion(long available, long requested, struct thread *th) +{ + if (gc_logfile) { + FILE * log = fopen(gc_logfile, "a"); + if (log) { + write_heap_exhaustion_report(log, available, requested, th); + fclose(log); + } else { + fprintf(stderr, "Could not open gc logfile: %s\n", gc_logfile); fflush(stderr); } } + /* Always to stderr as well. */ + write_heap_exhaustion_report(stderr, available, requested, th); } @@ -554,6 +605,9 @@ void zero_pages_with_mmap(page_index_t start, page_index_t end) { if (start > end) return; + gc_assert(length >= gencgc_release_granularity); + gc_assert((length % gencgc_release_granularity) == 0); + os_invalidate(addr, length); new_addr = os_validate(addr, length); if (new_addr == NULL || new_addr != addr) { @@ -582,19 +636,28 @@ zero_pages(page_index_t start, page_index_t end) { } +static void +zero_and_mark_pages(page_index_t start, page_index_t end) { + page_index_t i; + + zero_pages(start, end); + for (i = start; i <= end; i++) + page_table[i].need_to_zero = 0; +} + /* Zero the pages from START to END (inclusive), except for those * pages that are known to already zeroed. Mark all pages in the * ranges as non-zeroed. */ static void zero_dirty_pages(page_index_t start, page_index_t end) { - page_index_t i; + page_index_t i, j; for (i = start; i <= end; i++) { - if (page_table[i].need_to_zero == 1) { - zero_pages(start, end); - break; - } + if (!page_table[i].need_to_zero) continue; + for (j = i+1; (j <= end) && (page_table[j].need_to_zero); j++); + zero_pages(i, j-1); + i = j; } for (i = start; i <= end; i++) { @@ -752,7 +815,7 @@ gc_alloc_new_region(long nbytes, int page_type_flag, struct alloc_region *alloc_ gc_assert(ret == 0); first_page = generation_alloc_start_page(gc_alloc_generation, page_type_flag, 0); last_page=gc_find_freeish_pages(&first_page, nbytes, page_type_flag); - bytes_found=(PAGE_BYTES - page_table[first_page].bytes_used) + bytes_found=(GENCGC_CARD_BYTES - page_table[first_page].bytes_used) + npage_bytes(last_page-first_page); /* Set up the alloc_region. */ @@ -982,8 +1045,8 @@ gc_alloc_update_page_tables(int page_type_flag, struct alloc_region *alloc_regio more = 0; if ((bytes_used = void_diff(alloc_region->free_pointer, page_address(first_page))) - >PAGE_BYTES) { - bytes_used = PAGE_BYTES; + >GENCGC_CARD_BYTES) { + bytes_used = GENCGC_CARD_BYTES; more = 1; } page_table[first_page].bytes_used = bytes_used; @@ -1007,8 +1070,8 @@ gc_alloc_update_page_tables(int page_type_flag, struct alloc_region *alloc_regio /* Calculate the number of bytes used in this page. */ more = 0; if ((bytes_used = void_diff(alloc_region->free_pointer, - page_address(next_page)))>PAGE_BYTES) { - bytes_used = PAGE_BYTES; + page_address(next_page)))>GENCGC_CARD_BYTES) { + bytes_used = GENCGC_CARD_BYTES; more = 1; } page_table[next_page].bytes_used = bytes_used; @@ -1109,8 +1172,8 @@ gc_alloc_large(long nbytes, int page_type_flag, struct alloc_region *alloc_regio /* Calc. the number of bytes used in this page. This is not * always the number of new bytes, unless it was free. */ more = 0; - if ((bytes_used = nbytes+orig_first_page_bytes_used) > PAGE_BYTES) { - bytes_used = PAGE_BYTES; + if ((bytes_used = nbytes+orig_first_page_bytes_used) > GENCGC_CARD_BYTES) { + bytes_used = GENCGC_CARD_BYTES; more = 1; } page_table[first_page].bytes_used = bytes_used; @@ -1134,8 +1197,8 @@ gc_alloc_large(long nbytes, int page_type_flag, struct alloc_region *alloc_regio /* Calculate the number of bytes used in this page. */ more = 0; bytes_used=(nbytes+orig_first_page_bytes_used)-byte_cnt; - if (bytes_used > PAGE_BYTES) { - bytes_used = PAGE_BYTES; + if (bytes_used > GENCGC_CARD_BYTES) { + bytes_used = GENCGC_CARD_BYTES; more = 1; } page_table[next_page].bytes_used = bytes_used; @@ -1184,20 +1247,7 @@ gc_heap_exhausted_error_or_lose (long available, long requested) * the danger that we bounce back here before the error has been * handled, or indeed even printed. */ - fprintf(stderr, "Heap exhausted during %s: %ld bytes available, %ld requested.\n", - gc_active_p ? "garbage collection" : "allocation", - available, requested); - print_generation_stats(); - fprintf(stderr, "GC control variables:\n"); - fprintf(stderr, " *GC-INHIBIT* = %s\n *GC-PENDING* = %s\n", - SymbolValue(GC_INHIBIT,thread)==NIL ? "false" : "true", - (SymbolValue(GC_PENDING, thread) == T) ? - "true" : ((SymbolValue(GC_PENDING, thread) == NIL) ? - "false" : "in progress")); -#ifdef LISP_FEATURE_SB_THREAD - fprintf(stderr, " *STOP-FOR-GC-PENDING* = %s\n", - SymbolValue(STOP_FOR_GC_PENDING,thread)==NIL ? "false" : "true"); -#endif + report_heap_exhaustion(available, requested, thread); if (gc_active_p || (available == 0)) { /* If we are in GC, or totally out of memory there is no way * to sanely transfer control to the lisp-side of things. @@ -1231,84 +1281,87 @@ gc_find_freeish_pages(page_index_t *restart_page_ptr, long nbytes, { page_index_t first_page, last_page; page_index_t restart_page = *restart_page_ptr; + long nbytes_goal = nbytes; long bytes_found = 0; long most_bytes_found = 0; + page_index_t most_bytes_found_from, most_bytes_found_to; + int small_object = nbytes < GENCGC_CARD_BYTES; /* FIXME: assert(free_pages_lock is held); */ + if (nbytes_goal < gencgc_alloc_granularity) + nbytes_goal = gencgc_alloc_granularity; + /* Toggled by gc_and_save for heap compaction, normally -1. */ if (gencgc_alloc_start_page != -1) { restart_page = gencgc_alloc_start_page; } gc_assert(nbytes>=0); - if (((unsigned long)nbytes)>=PAGE_BYTES) { - /* Search for a contiguous free space of at least nbytes, - * aligned on a page boundary. The page-alignment is strictly - * speaking needed only for objects at least large_object_size - * bytes in size. */ - do { - first_page = restart_page; - while ((first_page < page_table_pages) && - page_allocated_p(first_page)) + /* Search for a page with at least nbytes of space. We prefer + * not to split small objects on multiple pages, to reduce the + * number of contiguous allocation regions spaning multiple + * pages: this helps avoid excessive conservativism. + * + * For other objects, we guarantee that they start on their own + * page boundary. + */ + first_page = restart_page; + while (first_page < page_table_pages) { + bytes_found = 0; + if (page_free_p(first_page)) { + gc_assert(0 == page_table[first_page].bytes_used); + bytes_found = GENCGC_CARD_BYTES; + } else if (small_object && + (page_table[first_page].allocated == page_type_flag) && + (page_table[first_page].large_object == 0) && + (page_table[first_page].gen == gc_alloc_generation) && + (page_table[first_page].write_protected == 0) && + (page_table[first_page].dont_move == 0)) { + bytes_found = GENCGC_CARD_BYTES - page_table[first_page].bytes_used; + if (bytes_found < nbytes) { + if (bytes_found > most_bytes_found) + most_bytes_found = bytes_found; first_page++; - - last_page = first_page; - bytes_found = PAGE_BYTES; - while ((bytes_found < nbytes) && - (last_page < (page_table_pages-1)) && - page_free_p(last_page+1)) { - last_page++; - bytes_found += PAGE_BYTES; - gc_assert(0 == page_table[last_page].bytes_used); - gc_assert(0 == page_table[last_page].write_protected); + continue; } - if (bytes_found > most_bytes_found) - most_bytes_found = bytes_found; - restart_page = last_page + 1; - } while ((restart_page < page_table_pages) && (bytes_found < nbytes)); - - } else { - /* Search for a page with at least nbytes of space. We prefer - * not to split small objects on multiple pages, to reduce the - * number of contiguous allocation regions spaning multiple - * pages: this helps avoid excessive conservativism. */ - first_page = restart_page; - while (first_page < page_table_pages) { - if (page_free_p(first_page)) - { - gc_assert(0 == page_table[first_page].bytes_used); - bytes_found = PAGE_BYTES; - break; - } - else if ((page_table[first_page].allocated == page_type_flag) && - (page_table[first_page].large_object == 0) && - (page_table[first_page].gen == gc_alloc_generation) && - (page_table[first_page].write_protected == 0) && - (page_table[first_page].dont_move == 0)) - { - bytes_found = PAGE_BYTES - - page_table[first_page].bytes_used; - if (bytes_found > most_bytes_found) - most_bytes_found = bytes_found; - if (bytes_found >= nbytes) - break; - } + } else { first_page++; + continue; } - last_page = first_page; - restart_page = first_page + 1; + + gc_assert(page_table[first_page].write_protected == 0); + for (last_page = first_page+1; + ((last_page < page_table_pages) && + page_free_p(last_page) && + (bytes_found < nbytes_goal)); + last_page++) { + bytes_found += GENCGC_CARD_BYTES; + gc_assert(0 == page_table[last_page].bytes_used); + gc_assert(0 == page_table[last_page].write_protected); + } + + if (bytes_found > most_bytes_found) { + most_bytes_found = bytes_found; + most_bytes_found_from = first_page; + most_bytes_found_to = last_page; + } + if (bytes_found >= nbytes_goal) + break; + + first_page = last_page; } + bytes_found = most_bytes_found; + restart_page = first_page + 1; + /* Check for a failure */ if (bytes_found < nbytes) { gc_assert(restart_page >= page_table_pages); gc_heap_exhausted_error_or_lose(most_bytes_found, nbytes); } - gc_assert(page_table[first_page].write_protected == 0); - - *restart_page_ptr = first_page; - return last_page; + *restart_page_ptr = most_bytes_found_from; + return most_bytes_found_to-1; } /* Allocate bytes. All the rest of the special-purpose allocation @@ -1431,19 +1484,19 @@ copy_large_object(lispobj object, long nwords) next_page = first_page; remaining_bytes = nwords*N_WORD_BYTES; - while (remaining_bytes > PAGE_BYTES) { + while (remaining_bytes > GENCGC_CARD_BYTES) { gc_assert(page_table[next_page].gen == from_space); gc_assert(page_boxed_p(next_page)); gc_assert(page_table[next_page].large_object); gc_assert(page_table[next_page].region_start_offset == npage_bytes(next_page-first_page)); - gc_assert(page_table[next_page].bytes_used == PAGE_BYTES); + gc_assert(page_table[next_page].bytes_used == GENCGC_CARD_BYTES); /* Should have been unprotected by unprotect_oldspace(). */ gc_assert(page_table[next_page].write_protected == 0); page_table[next_page].gen = new_space; - remaining_bytes -= PAGE_BYTES; + remaining_bytes -= GENCGC_CARD_BYTES; next_page++; } @@ -1464,7 +1517,7 @@ copy_large_object(lispobj object, long nwords) /* Free any remaining pages; needs care. */ next_page++; - while ((old_bytes_used == PAGE_BYTES) && + while ((old_bytes_used == GENCGC_CARD_BYTES) && (page_table[next_page].gen == from_space) && page_boxed_p(next_page) && page_table[next_page].large_object && @@ -1573,17 +1626,17 @@ copy_large_unboxed_object(lispobj object, long nwords) next_page = first_page; remaining_bytes = nwords*N_WORD_BYTES; - while (remaining_bytes > PAGE_BYTES) { + while (remaining_bytes > GENCGC_CARD_BYTES) { gc_assert(page_table[next_page].gen == from_space); gc_assert(page_allocated_no_region_p(next_page)); gc_assert(page_table[next_page].large_object); gc_assert(page_table[next_page].region_start_offset == npage_bytes(next_page-first_page)); - gc_assert(page_table[next_page].bytes_used == PAGE_BYTES); + gc_assert(page_table[next_page].bytes_used == GENCGC_CARD_BYTES); page_table[next_page].gen = new_space; page_table[next_page].allocated = UNBOXED_PAGE_FLAG; - remaining_bytes -= PAGE_BYTES; + remaining_bytes -= GENCGC_CARD_BYTES; next_page++; } @@ -1604,7 +1657,7 @@ copy_large_unboxed_object(lispobj object, long nwords) /* Free any remaining pages; needs care. */ next_page++; - while ((old_bytes_used == PAGE_BYTES) && + while ((old_bytes_used == GENCGC_CARD_BYTES) && (page_table[next_page].gen == from_space) && page_allocated_no_region_p(next_page) && page_table[next_page].large_object && @@ -2671,20 +2724,20 @@ maybe_adjust_large_object(lispobj *where) next_page = first_page; remaining_bytes = nwords*N_WORD_BYTES; - while (remaining_bytes > PAGE_BYTES) { + while (remaining_bytes > GENCGC_CARD_BYTES) { gc_assert(page_table[next_page].gen == from_space); gc_assert(page_allocated_no_region_p(next_page)); gc_assert(page_table[next_page].large_object); gc_assert(page_table[next_page].region_start_offset == npage_bytes(next_page-first_page)); - gc_assert(page_table[next_page].bytes_used == PAGE_BYTES); + gc_assert(page_table[next_page].bytes_used == GENCGC_CARD_BYTES); page_table[next_page].allocated = boxed; /* Shouldn't be write-protected at this stage. Essential that the * pages aren't. */ gc_assert(!page_table[next_page].write_protected); - remaining_bytes -= PAGE_BYTES; + remaining_bytes -= GENCGC_CARD_BYTES; next_page++; } @@ -2706,7 +2759,7 @@ maybe_adjust_large_object(lispobj *where) /* Free any remaining pages; needs care. */ next_page++; - while ((old_bytes_used == PAGE_BYTES) && + while ((old_bytes_used == GENCGC_CARD_BYTES) && (page_table[next_page].gen == from_space) && page_allocated_no_region_p(next_page) && page_table[next_page].large_object && @@ -2774,7 +2827,7 @@ preserve_pointer(void *addr) /* quick check 2: Check the offset within the page. * */ - if (((unsigned long)addr & (PAGE_BYTES - 1)) > + if (((unsigned long)addr & (GENCGC_CARD_BYTES - 1)) > page_table[addr_page_index].bytes_used) return; @@ -2809,7 +2862,7 @@ preserve_pointer(void *addr) while (page_table[first_page].region_start_offset != 0) { --first_page; /* Do some checks. */ - gc_assert(page_table[first_page].bytes_used == PAGE_BYTES); + gc_assert(page_table[first_page].bytes_used == GENCGC_CARD_BYTES); gc_assert(page_table[first_page].gen == from_space); gc_assert(page_table[first_page].allocated == region_allocation); } @@ -2826,7 +2879,7 @@ preserve_pointer(void *addr) if (page_free_p(addr_page_index) || (page_table[addr_page_index].bytes_used == 0) /* Check the offset within the page. */ - || (((unsigned long)addr & (PAGE_BYTES - 1)) + || (((unsigned long)addr & (GENCGC_CARD_BYTES - 1)) > page_table[addr_page_index].bytes_used)) { FSHOW((stderr, "weird? ignore ptr 0x%x to freed area of large object\n", @@ -2860,8 +2913,8 @@ preserve_pointer(void *addr) gc_assert(!page_table[i].write_protected); /* Check whether this is the last page in this contiguous block.. */ - if ((page_table[i].bytes_used < PAGE_BYTES) - /* ..or it is PAGE_BYTES and is the last in the block */ + if ((page_table[i].bytes_used < GENCGC_CARD_BYTES) + /* ..or it is CARD_BYTES and is the last in the block */ || page_free_p(i+1) || (page_table[i+1].bytes_used == 0) /* next page free */ || (page_table[i+1].gen != from_space) /* diff. gen */ @@ -2936,7 +2989,7 @@ update_page_write_prot(page_index_t page) /*FSHOW((stderr, "/write-protecting page %d gen %d\n", page, gen));*/ os_protect((void *)page_addr, - PAGE_BYTES, + GENCGC_CARD_BYTES, OS_VM_PROT_READ|OS_VM_PROT_EXECUTE); /* Note the page as protected in the page tables. */ @@ -3005,8 +3058,8 @@ scavenge_generations(generation_index_t from, generation_index_t to) for (last_page = i; ; last_page++) { write_protected = write_protected && page_table[last_page].write_protected; - if ((page_table[last_page].bytes_used < PAGE_BYTES) - /* Or it is PAGE_BYTES and is the last in the block */ + if ((page_table[last_page].bytes_used < GENCGC_CARD_BYTES) + /* Or it is CARD_BYTES and is the last in the block */ || (!page_boxed_p(last_page+1)) || (page_table[last_page+1].bytes_used == 0) || (page_table[last_page+1].gen != generation) @@ -3121,8 +3174,8 @@ scavenge_newspace_generation_one_scan(generation_index_t generation) /* Check whether this is the last page in this * contiguous block */ - if ((page_table[last_page].bytes_used < PAGE_BYTES) - /* Or it is PAGE_BYTES and is the last in the block */ + if ((page_table[last_page].bytes_used < GENCGC_CARD_BYTES) + /* Or it is CARD_BYTES and is the last in the block */ || (!page_boxed_p(last_page+1)) || (page_table[last_page+1].bytes_used == 0) || (page_table[last_page+1].gen != generation) @@ -3310,16 +3363,16 @@ unprotect_oldspace(void) if (!region_addr) { /* First region. */ region_addr = page_addr; - region_bytes = PAGE_BYTES; + region_bytes = GENCGC_CARD_BYTES; } else if (region_addr + region_bytes == page_addr) { /* Region continue. */ - region_bytes += PAGE_BYTES; + region_bytes += GENCGC_CARD_BYTES; } else { /* Unprotect previous region. */ os_protect(region_addr, region_bytes, OS_VM_PROT_ALL); /* First page in new region. */ region_addr = page_addr; - region_bytes = PAGE_BYTES; + region_bytes = GENCGC_CARD_BYTES; } } } @@ -3741,8 +3794,8 @@ verify_generation(generation_index_t generation) for (last_page = i; ;last_page++) /* Check whether this is the last page in this contiguous * block. */ - if ((page_table[last_page].bytes_used < PAGE_BYTES) - /* Or it is PAGE_BYTES and is the last in the block */ + if ((page_table[last_page].bytes_used < GENCGC_CARD_BYTES) + /* Or it is CARD_BYTES and is the last in the block */ || (page_table[last_page+1].allocated != region_allocation) || (page_table[last_page+1].bytes_used == 0) || (page_table[last_page+1].gen != generation) @@ -3777,7 +3830,7 @@ verify_zero_fill(void) } } } else { - long free_bytes = PAGE_BYTES - page_table[page].bytes_used; + long free_bytes = GENCGC_CARD_BYTES - page_table[page].bytes_used; if (free_bytes > 0) { long *start_addr = (long *)((unsigned long)page_address(page) + page_table[page].bytes_used); @@ -4230,32 +4283,54 @@ update_dynamic_space_free_pointer(void) } static void -remap_free_pages (page_index_t from, page_index_t to) +remap_page_range (page_index_t from, page_index_t to) +{ + /* There's a mysterious Solaris/x86 problem with using mmap + * tricks for memory zeroing. See sbcl-devel thread + * "Re: patch: standalone executable redux". + */ +#if defined(LISP_FEATURE_SUNOS) + zero_and_mark_pages(from, to); +#else + const page_index_t + release_granularity = gencgc_release_granularity/GENCGC_CARD_BYTES, + release_mask = release_granularity-1, + end = to+1, + aligned_from = (from+release_mask)&~release_mask, + aligned_end = (end&~release_mask); + + if (aligned_from < aligned_end) { + zero_pages_with_mmap(aligned_from, aligned_end-1); + if (aligned_from != from) + zero_and_mark_pages(from, aligned_from-1); + if (aligned_end != end) + zero_and_mark_pages(aligned_end, end-1); + } else { + zero_and_mark_pages(from, to); + } +#endif +} + +static void +remap_free_pages (page_index_t from, page_index_t to, int forcibly) { page_index_t first_page, last_page; + if (forcibly) + return remap_page_range(from, to); + for (first_page = from; first_page <= to; first_page++) { if (page_allocated_p(first_page) || - (page_table[first_page].need_to_zero == 0)) { + (page_table[first_page].need_to_zero == 0)) continue; - } last_page = first_page + 1; while (page_free_p(last_page) && - (last_page < to) && - (page_table[last_page].need_to_zero == 1)) { + (last_page <= to) && + (page_table[last_page].need_to_zero == 1)) last_page++; - } - /* There's a mysterious Solaris/x86 problem with using mmap - * tricks for memory zeroing. See sbcl-devel thread - * "Re: patch: standalone executable redux". - */ -#if defined(LISP_FEATURE_SUNOS) - zero_pages(first_page, last_page-1); -#else - zero_pages_with_mmap(first_page, last_page-1); -#endif + remap_page_range(first_page, last_page-1); first_page = last_page; } @@ -4401,7 +4476,7 @@ collect_garbage(generation_index_t last_gen) if (gen > small_generation_limit) { if (last_free_page > high_water_mark) high_water_mark = last_free_page; - remap_free_pages(0, high_water_mark); + remap_free_pages(0, high_water_mark, 0); high_water_mark = 0; } @@ -4419,7 +4494,7 @@ collect_garbage(generation_index_t last_gen) void gc_free_heap(void) { - page_index_t page; + page_index_t page, last_page; if (gencgc_verbose > 1) { SHOW("entering gc_free_heap"); @@ -4429,33 +4504,25 @@ gc_free_heap(void) /* Skip free pages which should already be zero filled. */ if (page_allocated_p(page)) { void *page_start, *addr; - - /* Mark the page free. The other slots are assumed invalid - * when it is a FREE_PAGE_FLAG and bytes_used is 0 and it - * should not be write-protected -- except that the - * generation is used for the current region but it sets - * that up. */ - page_table[page].allocated = FREE_PAGE_FLAG; - page_table[page].bytes_used = 0; + for (last_page = page; + (last_page < page_table_pages) && page_allocated_p(last_page); + last_page++) { + /* Mark the page free. The other slots are assumed invalid + * when it is a FREE_PAGE_FLAG and bytes_used is 0 and it + * should not be write-protected -- except that the + * generation is used for the current region but it sets + * that up. */ + page_table[page].allocated = FREE_PAGE_FLAG; + page_table[page].bytes_used = 0; + page_table[page].write_protected = 0; + } #ifndef LISP_FEATURE_WIN32 /* Pages already zeroed on win32? Not sure * about this change. */ - /* Zero the page. */ page_start = (void *)page_address(page); - - /* First, remove any write-protection. */ - os_protect(page_start, PAGE_BYTES, OS_VM_PROT_ALL); - page_table[page].write_protected = 0; - - os_invalidate(page_start,PAGE_BYTES); - addr = os_validate(page_start,PAGE_BYTES); - if (addr == NULL || addr != page_start) { - lose("gc_free_heap: page moved, 0x%08x ==> 0x%08x\n", - page_start, - addr); - } -#else - page_table[page].write_protected = 0; + os_protect(page_start, npage_bytes(last_page-page), OS_VM_PROT_ALL); + remap_free_pages(page, last_page-1, 1); + page = last_page-1; #endif } else if (gencgc_zero_check_during_free_heap) { /* Double-check that the page is zero filled. */ @@ -4464,7 +4531,7 @@ gc_free_heap(void) gc_assert(page_free_p(page)); gc_assert(page_table[page].bytes_used == 0); page_start = (long *)page_address(page); - for (i=0; i<1024; i++) { + for (i=0; i