diff options
| author | Ivan Maidanski <ivmai@mail.ru> | 2011-05-31 09:09:34 +0000 |
|---|---|---|
| committer | Ivan Maidanski <ivmai@mail.ru> | 2012-11-14 13:51:29 +0400 |
| commit | fd7cbb2a0f099fba2f2683694630f4e8e41b5d14 (patch) | |
| tree | 7f7fb093210bd6cf7a5af2ecede25e52f52e858e | |
| parent | ad6ce46c3b318db501ec171a3a641495a4c63c77 (diff) | |
| download | bdwgc-fd7cbb2a0f099fba2f2683694630f4e8e41b5d14.tar.gz | |
2011-05-31 Ivan Maidanski <ivmai@mail.ru>
* 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).
--HG--
branch : bdwgc
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | tests/test.c | 2 | ||||
| -rw-r--r-- | win32_threads.c | 2 |
3 files changed, 9 insertions, 2 deletions
@@ -1,5 +1,12 @@ 2011-05-31 Ivan Maidanski <ivmai@mail.ru> + * 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 <ivmai@mail.ru> + * tests/test.c (check_heap_stats): Adjust printf format specifier for max_heap_sz; cast max_heap_sz accordingly. 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)); |