diff -u -r gc6.5/alloc.c gc6.5-risa/alloc.c --- gc6.5/alloc.c 2005-05-21 03:12:59.000000000 +0900 +++ gc6.5-risa/alloc.c 2005-07-11 17:57:51.000000000 +0900 @@ -110,6 +110,7 @@ GC_bool GC_dont_expand = 0; word GC_free_space_divisor = 3; +word GC_free_space_numerator = 1; extern GC_bool GC_collection_in_progress(); /* Collection is in progress, or was abandoned. */ @@ -174,9 +175,9 @@ /* use a bit more of large empty heap */ + total_root_size); if (TRUE_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; } } @@ -492,6 +493,7 @@ # if defined(REGISTER_LIBRARIES_EARLY) GC_cond_register_dynamic_libraries(); # endif + GC_timerstart(); STOP_WORLD(); IF_THREADS(GC_world_stopped = TRUE); # ifdef CONDPRINT @@ -526,6 +528,7 @@ GC_deficit = i; /* Give the mutator a chance. */ IF_THREADS(GC_world_stopped = FALSE); START_WORLD(); + GC_timerstop(); return(FALSE); } if (GC_mark_some((ptr_t)(&dummy))) break; @@ -560,6 +563,7 @@ IF_THREADS(GC_world_stopped = FALSE); START_WORLD(); + GC_timerstop(); # ifdef PRINTTIMES GET_TIME(current_time); GC_printf1("World-stopped marking took %lu msecs\n", @@ -640,6 +644,7 @@ GET_TIME(start_time); finalize_time = start_time; # endif + GC_timerstart(); # ifdef GATHERSTATS GC_mem_found = 0; @@ -757,6 +762,7 @@ MS_TIME_DIFF(finalize_time,start_time), MS_TIME_DIFF(done_time,finalize_time)); # endif + GC_timerstop(); } /* Externally callable routine to invoke full, stop-world collection */ @@ -971,6 +977,9 @@ if (GC_collect_at_heapsize < GC_heapsize /* wrapped */) GC_collect_at_heapsize = (word)(-1); # endif +#if defined(VISUAL_LIB) + SendHeapSize(); +#endif return(TRUE); } @@ -1067,6 +1076,22 @@ if (sz == 0) return(0); +#if defined(VISUAL) + { +#include + extern int recv_intr; + if ( recv_intr ) { + if ( recv_intr == 1 ) { + recv_intr = 0; + int_handler(); + } else { + recv_intr = 0; + ox_usr1_handler(0); + } + } + } +#endif + while (*flh == 0) { ENTER_GC(); /* Do our share of marking work */ diff -u -r gc6.5/configure gc6.5-risa/configure --- gc6.5/configure 2005-05-17 08:28:32.000000000 +0900 +++ gc6.5-risa/configure 2005-07-11 17:59:33.000000000 +0900 @@ -9531,7 +9531,7 @@ _ACEOF cat >>confdefs.h <<\_ACEOF -#define NO_SIGNALS 1 +##define NO_SIGNALS 1 _ACEOF cat >>confdefs.h <<\_ACEOF diff -u -r gc6.5/include/private/gcconfig.h gc6.5-risa/include/private/gcconfig.h --- gc6.5/include/private/gcconfig.h 2005-05-21 05:48:29.000000000 +0900 +++ gc6.5-risa/include/private/gcconfig.h 2005-07-11 18:18:53.000000000 +0900 @@ -60,6 +60,13 @@ # endif /* Determine the machine type: */ +/* T.Saito */ +# if defined(FREEBSD) && defined(__amd64__) +# define X86_64 +# define mach_type_known +# endif + +/* Determine the machine type: */ # if defined(__arm__) || defined(__thumb__) # define ARM32 # if !defined(LINUX) && !defined(NETBSD) @@ -1936,6 +1943,28 @@ extern char etext[]; # define SEARCH_FOR_DATA_START # endif +# ifdef FREEBSD /* T.Saito */ +# define OS_TYPE "FREEBSD" +# ifndef GC_FREEBSD_THREADS +# define MPROTECT_VDB +# endif +# define SIG_SUSPEND SIGUSR1 +# define SIG_THR_RESTART SIGUSR2 +# define FREEBSD_STACKBOTTOM +# ifdef __ELF__ +# define DYNAMIC_LOADING +# endif + extern int _etext[]; + extern char etext[]; + extern char edata[]; + extern char end[]; + extern char * GC_FreeBSDGetDataStart(); +# define DATASTART ((ptr_t)((((word) (_etext)) + 0xfff) & ~0xfff)) +# define NEED_FIND_LIMIT +# define DATAEND (GC_find_limit (DATASTART, TRUE)) +# define DATASTART2 ((ptr_t)(&edata)) +# define DATAEND2 ((ptr_t)(&end)) +# endif /* end T.Saito */ # endif #if defined(LINUX) && defined(USE_MMAP) diff -u -r gc6.5/reclaim.c gc6.5-risa/reclaim.c --- gc6.5/reclaim.c 2004-11-23 02:58:18.000000000 +0900 +++ gc6.5-risa/reclaim.c 2005-07-11 18:01:16.000000000 +0900 @@ -1030,7 +1030,8 @@ GET_TIME(start_time); # endif - + GC_timerstart(); + for (kind = 0; kind < GC_n_kinds; kind++) { ok = &(GC_obj_kinds[kind]); rlp = ok -> ok_reclaim_list; @@ -1052,6 +1053,7 @@ } } } + GC_timerstop(); # ifdef PRINTTIMES GET_TIME(done_time); GC_printf1("Disposing of reclaim lists took %lu msecs\n",