comparison src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp @ 142:8bd1e4487c18

Merge
author iveresov
date Sun, 04 May 2008 03:29:31 -0700
parents ba764ed4b6f2 3febac328d82
children d1605aabd0a1 05712c37c828
comparison
equal deleted inserted replaced
138:bcdc68eb7e1f 142:8bd1e4487c18
974 NOT_PRODUCT(_mark_bitmap.reset_counters()); 974 NOT_PRODUCT(_mark_bitmap.reset_counters());
975 DEBUG_ONLY(add_obj_count = add_obj_size = 0;) 975 DEBUG_ONLY(add_obj_count = add_obj_size = 0;)
976 DEBUG_ONLY(mark_bitmap_count = mark_bitmap_size = 0;) 976 DEBUG_ONLY(mark_bitmap_count = mark_bitmap_size = 0;)
977 977
978 // Increment the invocation count 978 // Increment the invocation count
979 heap->increment_total_collections(); 979 heap->increment_total_collections(true);
980 980
981 // We need to track unique mark sweep invocations as well. 981 // We need to track unique mark sweep invocations as well.
982 _total_invocations++; 982 _total_invocations++;
983 983
984 if (PrintHeapAtGC) { 984 if (PrintHeapAtGC) {
1939 // be calling invoke() instead. 1939 // be calling invoke() instead.
1940 void PSParallelCompact::invoke_no_policy(bool maximum_heap_compaction) { 1940 void PSParallelCompact::invoke_no_policy(bool maximum_heap_compaction) {
1941 assert(SafepointSynchronize::is_at_safepoint(), "must be at a safepoint"); 1941 assert(SafepointSynchronize::is_at_safepoint(), "must be at a safepoint");
1942 assert(ref_processor() != NULL, "Sanity"); 1942 assert(ref_processor() != NULL, "Sanity");
1943 1943
1944 if (GC_locker::is_active()) { 1944 if (GC_locker::check_active_before_gc()) {
1945 return; 1945 return;
1946 } 1946 }
1947 1947
1948 TimeStamp marking_start; 1948 TimeStamp marking_start;
1949 TimeStamp compaction_start; 1949 TimeStamp compaction_start;