summaryrefslogtreecommitdiff
path: root/reclaim.c
diff options
context:
space:
mode:
authorhboehm <hboehm>2009-05-28 02:51:35 +0200
committerIvan Maidanski <ivmai@mail.ru>2011-07-26 19:06:45 +0200
commitebabfaa4168439668bb8b3b033276f8998cacb4b (patch)
treeca7bde930cc0c8bb24c623fe58c9c6a4a87854db /reclaim.c
parent5190c1d75ea1f284124e52628625a83bcee5fc3c (diff)
2009-05-27 Hans Boehm <Hans.Boehm@hp.com> (Really Ivan Maidanski)
(diff26) * win32_threads.c: restructure parallel marking mutex intialization. * win32_threads.c, alloc.c, darwin_stop_world.c, mallocx.c, mark.c, pthread_stop_world.c, pthread_support.c: Add runtime conditions on GC_parallel were appropriate. * pthread_support.c: Condition marker_bsp on ia64. (GC_segment_is_thread_stack): Fix loop upper bound. * reclaim.c: Limit some assertions to PARALLEL_MARK. * pthread_support.c: Don't acquire mark lock for thread-local allocation. * include/private/gc_priv.h: Don't define parallel mark sync support just for THREAD_LOCAL_ALLOC.
Diffstat (limited to 'reclaim.c')
-rw-r--r--reclaim.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/reclaim.c b/reclaim.c
index fd4521d..220caf8 100644
--- a/reclaim.c
+++ b/reclaim.c
@@ -22,7 +22,7 @@ signed_word GC_bytes_found = 0;
/* minus the number of bytes originally */
/* on free lists which we had to drop. */
-#if defined(PARALLEL_MARK) || defined(THREAD_LOCAL_ALLOC)
+#if defined(PARALLEL_MARK)
word GC_fl_builder_count = 0;
/* Number of threads currently building free lists without */
/* holding GC lock. It is not safe to collect if this is */
@@ -477,7 +477,7 @@ void GC_start_reclaim(GC_bool report_if_found)
{
unsigned kind;
-# if defined(PARALLEL_MARK) || defined(THREAD_LOCAL_ALLOC)
+# if defined(PARALLEL_MARK)
GC_ASSERT(0 == GC_fl_builder_count);
# endif
/* Reset in use counters. GC_reclaim_block recomputes them. */
@@ -522,7 +522,7 @@ void GC_start_reclaim(GC_bool report_if_found)
/* so that you can convince yourself that it really is very stupid. */
GC_reclaim_all((GC_stop_func)0, FALSE);
# endif
-# if defined(PARALLEL_MARK) || defined(THREAD_LOCAL_ALLOC)
+# if defined(PARALLEL_MARK)
GC_ASSERT(0 == GC_fl_builder_count);
# endif