1.1 --- a/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp Wed Feb 01 10:36:58 2012 +0100
1.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp Wed Feb 01 07:59:01 2012 -0800
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -983,9 +983,7 @@
1.11 // We need to track unique mark sweep invocations as well.
1.12 _total_invocations++;
1.13
1.14 - if (PrintHeapAtGC) {
1.15 - Universe::print_heap_before_gc();
1.16 - }
1.17 + heap->print_heap_before_gc();
1.18
1.19 // Fill in TLABs
1.20 heap->accumulate_statistics_all_tlabs();
1.21 @@ -1838,7 +1836,6 @@
1.22 void PSParallelCompact::summary_phase(ParCompactionManager* cm,
1.23 bool maximum_compaction)
1.24 {
1.25 - EventMark m("2 summarize");
1.26 TraceTime tm("summary phase", print_phases(), true, gclog_or_tty);
1.27 // trace("2");
1.28
1.29 @@ -2237,9 +2234,7 @@
1.30
1.31 collection_exit.update();
1.32
1.33 - if (PrintHeapAtGC) {
1.34 - Universe::print_heap_after_gc();
1.35 - }
1.36 + heap->print_heap_after_gc();
1.37 if (PrintGCTaskTimeStamps) {
1.38 gclog_or_tty->print_cr("VM-Thread " INT64_FORMAT " " INT64_FORMAT " "
1.39 INT64_FORMAT,
1.40 @@ -2352,7 +2347,6 @@
1.41 void PSParallelCompact::marking_phase(ParCompactionManager* cm,
1.42 bool maximum_heap_compaction) {
1.43 // Recursively traverse all live objects and mark them
1.44 - EventMark m("1 mark object");
1.45 TraceTime tm("marking phase", print_phases(), true, gclog_or_tty);
1.46
1.47 ParallelScavengeHeap* heap = gc_heap();
1.48 @@ -2438,7 +2432,6 @@
1.49
1.50 void PSParallelCompact::adjust_roots() {
1.51 // Adjust the pointers to reflect the new locations
1.52 - EventMark m("3 adjust roots");
1.53 TraceTime tm("adjust roots", print_phases(), true, gclog_or_tty);
1.54
1.55 // General strong roots.
1.56 @@ -2469,7 +2462,6 @@
1.57 }
1.58
1.59 void PSParallelCompact::compact_perm(ParCompactionManager* cm) {
1.60 - EventMark m("4 compact perm");
1.61 TraceTime tm("compact perm gen", print_phases(), true, gclog_or_tty);
1.62 // trace("4");
1.63
1.64 @@ -2647,7 +2639,6 @@
1.65 }
1.66
1.67 void PSParallelCompact::compact() {
1.68 - EventMark m("5 compact");
1.69 // trace("5");
1.70 TraceTime tm("compaction phase", print_phases(), true, gclog_or_tty);
1.71
1.72 @@ -3502,4 +3493,3 @@
1.73 _updated_int_array_klass_obj = (klassOop)
1.74 summary_data().calc_new_pointer(Universe::intArrayKlassObj());
1.75 }
1.76 -
