src/share/vm/gc_implementation/g1/vm_operations_g1.cpp

rev 4773 : 8005849: JEP 167: Event-Based JVM Tracing
Reviewed-by: acorn, coleenp, sla
Contributed-by: Karen Kinnear <karen.kinnear@oracle.com>, Bengt Rutisson <bengt.rutisson@oracle.com>, Calvin Cheung <calvin.cheung@oracle.com>, Erik Gahlin <erik.gahlin@oracle.com>, Erik Helin <erik.helin@oracle.com>, Jesper Wilhelmsson <jesper.wilhelmsson@oracle.com>, Keith McGuigan <keith.mcguigan@oracle.com>, Mattias Tobiasson <mattias.tobiasson@oracle.com>, Markus Gronlund <markus.gronlund@oracle.com>, Mikael Auno <mikael.auno@oracle.com>, Nils Eliasson <nils.eliasson@oracle.com>, Nils Loodin <nils.loodin@oracle.com>, Rickard Backman <rickard.backman@oracle.com>, Staffan Larsen <staffan.larsen@oracle.com>, Stefan Karlsson <stefan.karlsson@oracle.com>, Yekaterina Kantserova <yekaterina.kantserova@oracle.com>

*** 1,7 ****
  /*
!  * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 26,35 ****
--- 26,37 ----
  #include "gc_implementation/g1/concurrentMarkThread.inline.hpp"
  #include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
  #include "gc_implementation/g1/g1CollectorPolicy.hpp"
  #include "gc_implementation/g1/g1Log.hpp"
  #include "gc_implementation/g1/vm_operations_g1.hpp"
+ #include "gc_implementation/shared/gcTimer.hpp"
+ #include "gc_implementation/shared/gcTraceTime.hpp"
  #include "gc_implementation/shared/isGCActiveMark.hpp"
  #include "gc_implementation/g1/vm_operations_g1.hpp"
  #include "runtime/interfaceSupport.hpp"
  
  VM_G1CollectForAllocation::VM_G1CollectForAllocation(
*** 225,235 ****
  }
  
  void VM_CGC_Operation::doit() {
    gclog_or_tty->date_stamp(G1Log::fine() && PrintGCDateStamps);
    TraceCPUTime tcpu(G1Log::finer(), true, gclog_or_tty);
!   TraceTime t(_printGCMessage, G1Log::fine(), true, gclog_or_tty);
    SharedHeap* sh = SharedHeap::heap();
    // This could go away if CollectedHeap gave access to _gc_is_active...
    if (sh != NULL) {
      IsGCActiveMark x;
      _cl->do_void();
--- 227,237 ----
  }
  
  void VM_CGC_Operation::doit() {
    gclog_or_tty->date_stamp(G1Log::fine() && PrintGCDateStamps);
    TraceCPUTime tcpu(G1Log::finer(), true, gclog_or_tty);
!   GCTraceTime t(_printGCMessage, G1Log::fine(), true, G1CollectedHeap::heap()->gc_timer_cm());
    SharedHeap* sh = SharedHeap::heap();
    // This could go away if CollectedHeap gave access to _gc_is_active...
    if (sh != NULL) {
      IsGCActiveMark x;
      _cl->do_void();