version 1.5, 2010/09/01 08:01:09 |
version 1.9, 2013/06/13 08:10:10 |
|
|
diff -urN gc-7.2alpha4.org/alloc.c gc-7.2alpha4/alloc.c |
diff -urN gc-7.2alpha6.orig/alloc.c gc-7.2alpha6/alloc.c |
--- gc-7.2alpha4.org/alloc.c 2010-01-04 16:54:50.892052700 -0500 |
--- gc-7.2alpha6.orig/alloc.c 2011-06-01 00:27:11.000000000 +0900 |
+++ gc-7.2alpha4/alloc.c 2010-01-04 17:03:29.952052700 -0500 |
+++ gc-7.2alpha6/alloc.c 2012-05-08 01:22:13.000000000 +0900 |
@@ -117,6 +117,7 @@ |
@@ -121,6 +121,7 @@ |
#endif |
#endif |
|
|
word GC_free_space_divisor = GC_FREE_SPACE_DIVISOR; |
word GC_free_space_divisor = GC_FREE_SPACE_DIVISOR; |
Line 9 diff -urN gc-7.2alpha4.org/alloc.c gc-7.2alpha4/alloc. |
|
Line 9 diff -urN gc-7.2alpha4.org/alloc.c gc-7.2alpha4/alloc. |
|
|
|
GC_INNER int GC_CALLBACK GC_never_stop_func(void) |
GC_INNER int GC_CALLBACK GC_never_stop_func(void) |
{ |
{ |
@@ -222,9 +223,9 @@ |
@@ -229,9 +230,9 @@ |
scan_size = 2 * GC_composite_in_use + GC_atomic_in_use / 4 |
scan_size = 2 * GC_composite_in_use + GC_atomic_in_use / 4 |
+ total_root_size; |
+ total_root_size; |
if (GC_incremental) { |
if (GC_incremental) { |
Line 21 diff -urN gc-7.2alpha4.org/alloc.c gc-7.2alpha4/alloc. |
|
Line 21 diff -urN gc-7.2alpha4.org/alloc.c gc-7.2alpha4/alloc. |
|
} |
} |
} |
} |
|
|
@@ -581,6 +582,7 @@ |
@@ -597,6 +598,7 @@ |
GET_TIME(start_time); |
GET_TIME(start_time); |
# endif |
# endif |
|
|
Line 29 diff -urN gc-7.2alpha4.org/alloc.c gc-7.2alpha4/alloc. |
|
Line 29 diff -urN gc-7.2alpha4.org/alloc.c gc-7.2alpha4/alloc. |
|
STOP_WORLD(); |
STOP_WORLD(); |
# ifdef THREAD_LOCAL_ALLOC |
# ifdef THREAD_LOCAL_ALLOC |
GC_world_stopped = TRUE; |
GC_world_stopped = TRUE; |
@@ -613,6 +615,7 @@ |
@@ -629,6 +631,7 @@ |
GC_world_stopped = FALSE; |
GC_world_stopped = FALSE; |
# endif |
# endif |
START_WORLD(); |
START_WORLD(); |
+ GC_timerstop(); |
+ GC_timerstop(); |
return(FALSE); |
return(FALSE); |
} |
} |
if (GC_mark_some((ptr_t)(&dummy))) break; |
if (GC_mark_some((ptr_t)(&dummy))) break; |
@@ -635,6 +638,7 @@ |
@@ -651,6 +654,7 @@ |
GC_world_stopped = FALSE; |
GC_world_stopped = FALSE; |
# endif |
# endif |
START_WORLD(); |
START_WORLD(); |
Line 45 diff -urN gc-7.2alpha4.org/alloc.c gc-7.2alpha4/alloc. |
|
Line 45 diff -urN gc-7.2alpha4.org/alloc.c gc-7.2alpha4/alloc. |
|
# ifndef SMALL_CONFIG |
# ifndef SMALL_CONFIG |
if (GC_print_stats) { |
if (GC_print_stats) { |
unsigned long time_diff; |
unsigned long time_diff; |
@@ -784,6 +788,7 @@ |
@@ -796,6 +800,7 @@ |
/* FIXME: Add more checks. */ |
/* FIXME: Add more checks. */ |
GC_check_tls(); |
GC_check_tls(); |
# endif |
# endif |
Line 53 diff -urN gc-7.2alpha4.org/alloc.c gc-7.2alpha4/alloc. |
|
Line 53 diff -urN gc-7.2alpha4.org/alloc.c gc-7.2alpha4/alloc. |
|
|
|
# ifndef SMALL_CONFIG |
# ifndef SMALL_CONFIG |
if (GC_print_stats) |
if (GC_print_stats) |
@@ -917,6 +922,7 @@ |
@@ -923,6 +928,7 @@ |
MS_TIME_DIFF(done_time,finalize_time)); |
MS_TIME_DIFF(done_time,finalize_time)); |
} |
} |
# endif |
# endif |
Line 61 diff -urN gc-7.2alpha4.org/alloc.c gc-7.2alpha4/alloc. |
|
Line 61 diff -urN gc-7.2alpha4.org/alloc.c gc-7.2alpha4/alloc. |
|
} |
} |
|
|
/* If stop_func == 0 then GC_default_stop_func is used instead. */ |
/* If stop_func == 0 then GC_default_stop_func is used instead. */ |
@@ -1169,6 +1175,9 @@ |
@@ -1172,6 +1178,9 @@ |
|
GC_heapsize + expansion_slop - 2*MAXHINCR*HBLKSIZE; |
if (GC_collect_at_heapsize < GC_heapsize /* wrapped */) |
if (GC_collect_at_heapsize < GC_heapsize /* wrapped */) |
GC_collect_at_heapsize = (word)(-1); |
GC_collect_at_heapsize = (word)(-1); |
# endif |
|
+#if defined(VISUAL) |
+#if defined(VISUAL) |
+ SendHeapSize(); |
+ SendHeapSize(); |
+#endif |
+#endif |
return(TRUE); |
return(TRUE); |
} |
} |
|
|
@@ -1278,6 +1287,21 @@ |
@@ -1281,6 +1290,21 @@ |
GC_bool retry = FALSE; |
GC_bool retry = FALSE; |
|
|
if (gran == 0) return(0); |
if (gran == 0) return(0); |
Line 93 diff -urN gc-7.2alpha4.org/alloc.c gc-7.2alpha4/alloc. |
|
Line 93 diff -urN gc-7.2alpha4.org/alloc.c gc-7.2alpha4/alloc. |
|
|
|
while (*flh == 0) { |
while (*flh == 0) { |
ENTER_GC(); |
ENTER_GC(); |
diff -urN gc-7.2alpha4.org/reclaim.c gc-7.2alpha4/reclaim.c |
diff -urN gc-7.2alpha6.orig/misc.c gc-7.2alpha6/misc.c |
--- gc-7.2alpha4.org/reclaim.c 2010-01-04 17:04:36.987052700 -0500 |
--- gc-7.2alpha6.orig/misc.c 2011-06-01 00:27:11.000000000 +0900 |
+++ gc-7.2alpha4/reclaim.c 2010-01-04 17:06:56.439052700 -0500 |
+++ gc-7.2alpha6/misc.c 2012-05-08 01:17:58.000000000 +0900 |
@@ -572,6 +572,7 @@ |
@@ -141,6 +141,93 @@ |
|
|
if (GC_print_stats == VERBOSE) |
|
GET_TIME(start_time); |
|
+ GC_timerstart(); |
|
# endif |
|
|
|
for (kind = 0; kind < GC_n_kinds; kind++) { |
|
@@ -596,6 +597,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", |
|
diff -urN gc-7.2alpha4.org/misc.c gc-7.2alpha4/misc.c |
|
--- gc-7.2alpha4.org/misc.c 2010-01-04 17:07:45.244052700 -0500 |
|
+++ gc-7.2alpha4/misc.c 2010-01-04 17:13:03.397052700 -0500 |
|
@@ -128,6 +128,93 @@ |
|
GC_INNER long GC_large_alloc_warn_interval = GC_LARGE_ALLOC_WARN_INTERVAL; |
GC_INNER long GC_large_alloc_warn_interval = GC_LARGE_ALLOC_WARN_INTERVAL; |
/* Interval between unsuppressed warnings. */ |
/* Interval between unsuppressed warnings. */ |
|
|
Line 209 diff -urN gc-7.2alpha4.org/misc.c gc-7.2alpha4/misc.c |
|
Line 190 diff -urN gc-7.2alpha4.org/misc.c gc-7.2alpha4/misc.c |
|
/*ARGSUSED*/ |
/*ARGSUSED*/ |
STATIC void * GC_CALLBACK 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", |
|
diff -urN gc-7.2.orig/NT_X64_STATIC_THREADS_MAKEFILE gc-7.2/NT_X64_STATIC_THREADS_MAKEFILE |
|
--- gc-7.2.orig/NT_X64_STATIC_THREADS_MAKEFILE 2012-05-12 02:09:00.000000000 +0900 |
|
+++ gc-7.2/NT_X64_STATIC_THREADS_MAKEFILE 2013-06-13 14:43:07.000000000 +0900 |
|
@@ -22,13 +22,13 @@ |
|
all: gctest.exe cord\de.exe test_cpp.exe |
|
|
|
.c.obj: |
|
- $(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DGC_NOT_DLL -DGC_THREADS -DTHREAD_LOCAL_ALLOC -D_CRT_SECURE_NO_DEPRECATE $*.c /Fo$*.obj /wd4701 |
|
+ $(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DGC_NOT_DLL -DGC_THREADS -DTHREAD_LOCAL_ALLOC -D_CRT_SECURE_NO_DEPRECATE -DLARGE_CONFIG $*.c /Fo$*.obj /wd4701 |
|
# Disable "may not be initialized" warnings. They're too approximate. |
|
# Disable crt security warnings, since unfortunately they warn about all sorts |
|
# of safe uses of strncpy. It would be nice to leave the rest enabled. |
|
|
|
.cpp.obj: |
|
- $(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DGC_NOT_DLL -DGC_THREADS -DTHREAD_LOCAL_ALLOC -D_CRT_SECURE_NO_DEPRECATE $*.cpp /Fo$*.obj |
|
+ $(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DGC_NOT_DLL -DGC_THREADS -DTHREAD_LOCAL_ALLOC -D_CRT_SECURE_NO_DEPRECATE -DLARGE_CONFIG $*.cpp /Fo$*.obj |
|
|
|
$(OBJS) tests\test.obj: include\private\gc_priv.h include\private\gc_hdrs.h include\gc.h include\private\gcconfig.h include\private\gc_locks.h include\private\gc_pmark.h include\gc_mark.h include\private\msvc_dbg.h |
|
|
|
diff -urN gc-7.2.orig/NT_STATIC_THREADS_MAKEFILE gc-7.2/NT_STATIC_THREADS_MAKEFILE |
|
--- gc-7.2.orig/NT_STATIC_THREADS_MAKEFILE 2012-05-12 02:09:00.000000000 +0900 |
|
+++ gc-7.2/NT_STATIC_THREADS_MAKEFILE 2013-06-13 17:07:36.000000000 +0900 |
|
@@ -22,10 +22,10 @@ |
|
all: gctest.exe cord\de.exe test_cpp.exe |
|
|
|
.c.obj: |
|
- $(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DGC_NOT_DLL -DGC_THREADS -DTHREAD_LOCAL_ALLOC -DPARALLEL_MARK -D_CRT_SECURE_NO_DEPRECATE $*.c /Fo$*.obj |
|
+ $(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DGC_NOT_DLL -DGC_THREADS -DTHREAD_LOCAL_ALLOC -DPARALLEL_MARK -D_CRT_SECURE_NO_DEPRECATE -DLARGE_CONFIG $*.c /Fo$*.obj |
|
|
|
.cpp.obj: |
|
- $(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DGC_NOT_DLL -DGC_THREADS -DTHREAD_LOCAL_ALLOC -D_CRT_SECURE_NO_DEPRECATE $*.cpp /Fo$*.obj |
|
+ $(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DGC_NOT_DLL -DGC_THREADS -DTHREAD_LOCAL_ALLOC -D_CRT_SECURE_NO_DEPRECATE -DLARGE_CONFIG $*.cpp /Fo$*.obj |
|
|
|
$(OBJS) tests\test.obj: include\private\gc_priv.h include\private\gc_hdrs.h include\gc.h include\private\gcconfig.h include\private\gc_locks.h include\private\gc_pmark.h include\gc_mark.h include\private\msvc_dbg.h |
|
|
|
|