From 26442e871507167317ebbc13feafca164354cf7d Mon Sep 17 00:00:00 2001 From: ivmai Date: Tue, 31 May 2011 09:09:34 +0000 Subject: [PATCH] 2011-05-31 Ivan Maidanski * win32_threads.c (GC_unregister_my_thread): Use KNOWN_FINISHED() instead of FINISHED macro. * tests/test.c (check_heap_stats): Round up max_heap_sz value for Win32 (same as for USE_MMAP). --- ChangeLog | 7 +++++++ tests/test.c | 2 +- win32_threads.c | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4eb5685c..b31e5ed3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-05-31 Ivan Maidanski + + * win32_threads.c (GC_unregister_my_thread): Use KNOWN_FINISHED() + instead of FINISHED macro. + * tests/test.c (check_heap_stats): Round up max_heap_sz value for + Win32 (same as for USE_MMAP). + 2011-05-31 Ivan Maidanski * tests/test.c (check_heap_stats): Adjust printf format specifier diff --git a/tests/test.c b/tests/test.c index 153d9775..c486714a 100644 --- a/tests/test.c +++ b/tests/test.c @@ -1275,7 +1275,7 @@ void check_heap_stats(void) # endif # endif max_heap_sz *= n_tests; -# ifdef USE_MMAP +# if defined(USE_MMAP) || defined(MSWIN32) max_heap_sz = NUMBER_ROUND_UP(max_heap_sz, 4 * 1024 * 1024); # endif /* Garbage collect repeatedly so that all inaccessible objects */ diff --git a/win32_threads.c b/win32_threads.c index 68752fae..15b4b15c 100644 --- a/win32_threads.c +++ b/win32_threads.c @@ -776,7 +776,7 @@ GC_API int GC_CALL GC_unregister_my_thread(void) LOCK(); # if defined(THREAD_LOCAL_ALLOC) || defined(GC_PTHREADS) me = GC_lookup_thread_inner(thread_id); - GC_ASSERT(!(me -> flags & FINISHED)); + GC_ASSERT(!KNOWN_FINISHED(me)); # endif # if defined(THREAD_LOCAL_ALLOC) GC_destroy_thread_local(&(me->tlfs)); -- 2.40.0