src/share/vm/gc_implementation/g1/concurrentMarkThread.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>

*** 91,101 ****
      sleepBeforeNextCycle();
      {
        ResourceMark rm;
        HandleMark   hm;
        double cycle_start = os::elapsedVTime();
-       char verbose_str[128];
  
        // We have to ensure that we finish scanning the root regions
        // before the next GC takes place. To ensure this we have to
        // make sure that we do not join the STS until the root regions
        // have been scanned. If we did then it's possible that a
--- 91,100 ----
*** 153,164 ****
              gclog_or_tty->print_cr("[GC concurrent-mark-end, %1.7lf secs]",
                                        mark_end_sec - mark_start_sec);
            }
  
            CMCheckpointRootsFinalClosure final_cl(_cm);
!           sprintf(verbose_str, "GC remark");
!           VM_CGC_Operation op(&final_cl, verbose_str, true /* needs_pll */);
            VMThread::execute(&op);
          }
          if (cm()->restart_for_overflow()) {
            if (G1TraceMarkStackOverflow) {
              gclog_or_tty->print_cr("Restarting conc marking because of MS overflow "
--- 152,162 ----
              gclog_or_tty->print_cr("[GC concurrent-mark-end, %1.7lf secs]",
                                        mark_end_sec - mark_start_sec);
            }
  
            CMCheckpointRootsFinalClosure final_cl(_cm);
!           VM_CGC_Operation op(&final_cl, "GC remark", true /* needs_pll */);
            VMThread::execute(&op);
          }
          if (cm()->restart_for_overflow()) {
            if (G1TraceMarkStackOverflow) {
              gclog_or_tty->print_cr("Restarting conc marking because of MS overflow "
*** 185,196 ****
            jlong sleep_time_ms = mmu_tracker->when_ms(now, cleanup_prediction_ms);
            os::sleep(current_thread, sleep_time_ms, false);
          }
  
          CMCleanUp cl_cl(_cm);
!         sprintf(verbose_str, "GC cleanup");
!         VM_CGC_Operation op(&cl_cl, verbose_str, false /* needs_pll */);
          VMThread::execute(&op);
        } else {
          // We don't want to update the marking status if a GC pause
          // is already underway.
          _sts.join();
--- 183,193 ----
            jlong sleep_time_ms = mmu_tracker->when_ms(now, cleanup_prediction_ms);
            os::sleep(current_thread, sleep_time_ms, false);
          }
  
          CMCleanUp cl_cl(_cm);
!         VM_CGC_Operation op(&cl_cl, "GC cleanup", false /* needs_pll */);
          VMThread::execute(&op);
        } else {
          // We don't want to update the marking status if a GC pause
          // is already underway.
          _sts.join();
*** 290,299 ****
--- 287,297 ----
      // completed. This will also notify the FullGCCount_lock in case a
      // Java thread is waiting for a full GC to happen (e.g., it
      // called System.gc() with +ExplicitGCInvokesConcurrent).
      _sts.join();
      g1h->increment_old_marking_cycles_completed(true /* concurrent */);
+     g1h->register_concurrent_cycle_end();
      _sts.leave();
    }
    assert(_should_terminate, "just checking");
  
    terminate();