OpenXM_contrib2/asir2000/gc-7.0-risa.diff - diff

Return to gc-7.0-risa.diff CVS log

Up to [local] / OpenXM_contrib2 / asir2000

Diff for /OpenXM_contrib2/asir2000/gc-7.0-risa.diff between version 1.3 and 1.7

version 1.3, 2009/03/10 16:36:15

version 1.7, 2012/05/09 06:17:13

Line 1

%% $OpenXM: OpenXM_contrib2/asir2000/gc-7.0-risa.diff,v 1.2 2009/03/04 06:51:41 ohara Exp $

diff -urN gc-7.2alpha6.orig/alloc.c gc-7.2alpha6/alloc.c

%% This patch is based on gc6.5-risa.diff.

--- gc-7.2alpha6.orig/alloc.c 2011-06-01 00:27:11.000000000 +0900

diff -urN gc-7.0.orig/alloc.c gc-7.0/alloc.c

+++ gc-7.2alpha6/alloc.c 2012-05-08 01:22:13.000000000 +0900

--- gc-7.0.orig/alloc.c 2007-06-22 11:40:30.000000000 +0900

@@ -121,6 +121,7 @@

+++ gc-7.0/alloc.c 2007-11-09 17:29:38.000000000 +0900

#endif

@@ -100,6 +100,7 @@

GC_bool GC_dont_expand = 0;

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();

GC_INNER int GC_CALLBACK GC_never_stop_func(void)

/* Collection is in progress, or was abandoned. */

{

@@ -160,9 +161,9 @@

@@ -229,9 +230,9 @@

scan_size = 2 * GC_composite_in_use + GC_atomic_in_use

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 @@

@@ -597,6 +598,7 @@

# if defined(REGISTER_LIBRARIES_EARLY)

GET_TIME(start_time);

GC_cond_register_dynamic_libraries();

# endif

+ GC_timerstart();

STOP_WORLD();

IF_THREADS(GC_world_stopped = TRUE);

# ifdef THREAD_LOCAL_ALLOC

if (GC_print_stats) {

GC_world_stopped = TRUE;

@@ -479,6 +481,7 @@

@@ -629,6 +631,7 @@

GC_deficit = i; /* Give the mutator a chance. */

GC_world_stopped = FALSE;

IF_THREADS(GC_world_stopped = FALSE);

# endif

START_WORLD();

+ GC_timerstop();

return(FALSE);

}

if (GC_mark_some((ptr_t)(&dummy))) break;

@@ -503,6 +506,7 @@

@@ -651,6 +654,7 @@

GC_world_stopped = FALSE;

IF_THREADS(GC_world_stopped = FALSE);

# endif

START_WORLD();

+ GC_timerstop();

# ifndef SMALL_CONFIG

if (GC_print_stats) {

GET_TIME(current_time);

unsigned long time_diff;

GC_log_printf("World-stopped marking took %lu msecs\n",

@@ -796,6 +800,7 @@

@@ -603,6 +607,7 @@

/* FIXME: Add more checks. */

GC_check_tls();

# endif

+ GC_timerstart();

# ifndef SMALL_CONFIG

if (GC_print_stats)

GET_TIME(start_time);

@@ -923,6 +928,7 @@

@@ -722,6 +727,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 */

/* If stop_func == 0 then GC_default_stop_func is used instead. */

@@ -908,6 +914,9 @@

@@ -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 <signal.h>

Line 92 diff -urN gc-7.0.orig/alloc.c gc-7.0/alloc.c

Line 90 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.2alpha6.orig/misc.c gc-7.2alpha6/misc.c

diff -urN gc-7.0.orig/reclaim.c gc-7.0/reclaim.c

--- gc-7.2alpha6.orig/misc.c 2011-06-01 00:27:11.000000000 +0900

--- gc-7.0.orig/reclaim.c 2007-06-07 09:24:17.000000000 +0900

+++ gc-7.2alpha6/misc.c 2012-05-08 01:17:58.000000000 +0900

+++ gc-7.0/reclaim.c 2007-11-09 17:32:31.000000000 +0900

@@ -141,6 +141,93 @@

@@ -577,7 +577,7 @@

GC_INNER long GC_large_alloc_warn_interval = GC_LARGE_ALLOC_WARN_INTERVAL;

/* Interval between unsuppressed warnings. */

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. */

+#include <time.h>

Line 168 diff -urN gc-7.1.orig/misc.c gc-7.1/misc.c

Line 145 diff -urN gc-7.1.orig/misc.c gc-7.1/misc.c

+#elif defined(_PA_RISC1_1) || defined(__svr4__) || defined(__CYGWIN__)

+#include <sys/time.h>

+#include <sys/times.h>

+#include <limits.h>

+static double get_clock()

Line 211 diff -urN gc-7.1.orig/misc.c gc-7.1/misc.c

Line 188 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",

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>