=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/gc-7.0-risa.diff,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- OpenXM_contrib2/asir2000/gc-7.0-risa.diff 2010/09/01 08:07:40 1.6 +++ OpenXM_contrib2/asir2000/gc-7.0-risa.diff 2012/05/09 06:17:13 1.7 @@ -1,82 +1,80 @@ -%% $OpenXM$ -%% This patch is based on gc6.5-risa.diff. -diff -urN gc-7.0.orig/alloc.c gc-7.0/alloc.c ---- gc-7.0.orig/alloc.c 2007-06-22 11:40:30.000000000 +0900 -+++ gc-7.0/alloc.c 2007-11-09 17:29:38.000000000 +0900 -@@ -100,6 +100,7 @@ - GC_bool GC_dont_expand = 0; +diff -urN gc-7.2alpha6.orig/alloc.c gc-7.2alpha6/alloc.c +--- gc-7.2alpha6.orig/alloc.c 2011-06-01 00:27:11.000000000 +0900 ++++ gc-7.2alpha6/alloc.c 2012-05-08 01:22:13.000000000 +0900 +@@ -121,6 +121,7 @@ + #endif - word GC_free_space_divisor = 3; + word GC_free_space_divisor = GC_FREE_SPACE_DIVISOR; +word GC_free_space_numerator = 1; - extern GC_bool GC_collection_in_progress(); - /* Collection is in progress, or was abandoned. */ -@@ -160,9 +161,9 @@ - scan_size = 2 * GC_composite_in_use + GC_atomic_in_use + GC_INNER int GC_CALLBACK GC_never_stop_func(void) + { +@@ -229,9 +230,9 @@ + scan_size = 2 * GC_composite_in_use + GC_atomic_in_use / 4 + total_root_size; - if (TRUE_INCREMENTAL) { + if (GC_incremental) { - return scan_size / (2 * GC_free_space_divisor); + return scan_size * GC_free_space_numerator / (2 * GC_free_space_divisor); } else { - return scan_size / GC_free_space_divisor; -+ return scan_size * GC_free_space_numerator / GC_free_space_divisor; ++ return scan_size * GC_free_space_numerator / (2 * GC_free_space_divisor); } } -@@ -451,6 +452,7 @@ - # if defined(REGISTER_LIBRARIES_EARLY) - GC_cond_register_dynamic_libraries(); +@@ -597,6 +598,7 @@ + GET_TIME(start_time); # endif + + GC_timerstart(); STOP_WORLD(); - IF_THREADS(GC_world_stopped = TRUE); - if (GC_print_stats) { -@@ -479,6 +481,7 @@ - GC_deficit = i; /* Give the mutator a chance. */ - IF_THREADS(GC_world_stopped = FALSE); + # ifdef THREAD_LOCAL_ALLOC + GC_world_stopped = TRUE; +@@ -629,6 +631,7 @@ + GC_world_stopped = FALSE; + # endif START_WORLD(); + GC_timerstop(); return(FALSE); } if (GC_mark_some((ptr_t)(&dummy))) break; -@@ -503,6 +506,7 @@ - - IF_THREADS(GC_world_stopped = FALSE); +@@ -651,6 +654,7 @@ + GC_world_stopped = FALSE; + # endif START_WORLD(); + GC_timerstop(); + # ifndef SMALL_CONFIG if (GC_print_stats) { - GET_TIME(current_time); - GC_log_printf("World-stopped marking took %lu msecs\n", -@@ -603,6 +607,7 @@ + unsigned long time_diff; +@@ -796,6 +800,7 @@ /* FIXME: Add more checks. */ GC_check_tls(); # endif + GC_timerstart(); + # ifndef SMALL_CONFIG if (GC_print_stats) - GET_TIME(start_time); -@@ -722,6 +727,7 @@ - MS_TIME_DIFF(finalize_time,start_time), +@@ -923,6 +928,7 @@ MS_TIME_DIFF(done_time,finalize_time)); } + # endif + GC_timerstop(); } - /* Externally callable routine to invoke full, stop-world collection */ -@@ -908,6 +914,9 @@ + /* If stop_func == 0 then GC_default_stop_func is used instead. */ +@@ -1172,6 +1178,9 @@ + GC_heapsize + expansion_slop - 2*MAXHINCR*HBLKSIZE; if (GC_collect_at_heapsize < GC_heapsize /* wrapped */) GC_collect_at_heapsize = (word)(-1); - # endif +#if defined(VISUAL) + SendHeapSize(); +#endif return(TRUE); } -@@ -991,6 +1000,22 @@ +@@ -1281,6 +1290,21 @@ + GC_bool retry = FALSE; if (gran == 0) return(0); - +#if defined(_MSC_VER) + { +#include @@ -92,36 +90,15 @@ diff -urN gc-7.0.orig/alloc.c gc-7.0/alloc.c + } + } +#endif -+ + while (*flh == 0) { ENTER_GC(); - /* Do our share of marking work */ -diff -urN gc-7.0.orig/reclaim.c gc-7.0/reclaim.c ---- gc-7.0.orig/reclaim.c 2007-06-07 09:24:17.000000000 +0900 -+++ gc-7.0/reclaim.c 2007-11-09 17:32:31.000000000 +0900 -@@ -577,7 +577,7 @@ - - if (GC_print_stats == VERBOSE) - GET_TIME(start_time); -- -+ GC_timerstart(); - for (kind = 0; kind < GC_n_kinds; kind++) { - ok = &(GC_obj_kinds[kind]); - rlp = ok -> ok_reclaim_list; -@@ -599,6 +599,7 @@ - } - } - } -+ GC_timerstop(); - if (GC_print_stats == VERBOSE) { - GET_TIME(done_time); - GC_log_printf("Disposing of reclaim lists took %lu msecs\n", -diff -urN gc-7.1.orig/misc.c gc-7.1/misc.c ---- gc-7.1.orig/misc.c 2008-02-21 07:20:52.000000000 +0900 -+++ gc-7.1/misc.c 2009-03-04 14:01:58.000000000 +0900 -@@ -122,6 +122,93 @@ - long GC_large_alloc_warn_suppressed = 0; - /* Number of warnings suppressed so far. */ +diff -urN gc-7.2alpha6.orig/misc.c gc-7.2alpha6/misc.c +--- gc-7.2alpha6.orig/misc.c 2011-06-01 00:27:11.000000000 +0900 ++++ gc-7.2alpha6/misc.c 2012-05-08 01:17:58.000000000 +0900 +@@ -141,6 +141,93 @@ + GC_INNER long GC_large_alloc_warn_interval = GC_LARGE_ALLOC_WARN_INTERVAL; + /* Interval between unsuppressed warnings. */ +#include + @@ -211,5 +188,24 @@ diff -urN gc-7.1.orig/misc.c gc-7.1/misc.c +} + /*ARGSUSED*/ - void * GC_default_oom_fn(size_t bytes_requested) + STATIC void * GC_CALLBACK GC_default_oom_fn(size_t bytes_requested) { +diff -urN gc-7.2alpha6.orig/reclaim.c gc-7.2alpha6/reclaim.c +--- gc-7.2alpha6.orig/reclaim.c 2011-06-01 00:27:11.000000000 +0900 ++++ gc-7.2alpha6/reclaim.c 2012-05-08 01:25:00.000000000 +0900 +@@ -590,6 +590,7 @@ + + if (GC_print_stats == VERBOSE) + GET_TIME(start_time); ++ GC_timerstart(); + # endif + + for (kind = 0; kind < GC_n_kinds; kind++) { +@@ -614,6 +615,7 @@ + } + } + # ifndef SMALL_CONFIG ++ GC_timerstop(); + if (GC_print_stats == VERBOSE) { + GET_TIME(done_time); + GC_log_printf("Disposing of reclaim lists took %lu msecs\n",