src/hotspot/share/gc/g1/g1CollectedHeap.cpp

rev 50541 : imported patch 8204084-last-young-gc-marker
rev 50542 : imported patch 8204084-stefanj-review
rev 50543 : [mq]: 8204084-stefanj-review2

*** 2809,2827 ****
      _gc_tracer_stw->report_yc_type(collector_state()->yc_type());
  
      GCTraceCPUTime tcpu;
  
      G1HeapVerifier::G1VerifyType verify_type;
!     FormatBuffer<> gc_string("Pause ");
      if (collector_state()->in_initial_mark_gc()) {
!       gc_string.append("Initial Mark");
        verify_type = G1HeapVerifier::G1VerifyInitialMark;
      } else if (collector_state()->in_young_only_phase()) {
!       gc_string.append("Young");
        verify_type = G1HeapVerifier::G1VerifyYoungOnly;
      } else {
!       gc_string.append("Mixed");
        verify_type = G1HeapVerifier::G1VerifyMixed;
      }
      GCTraceTime(Info, gc) tm(gc_string, NULL, gc_cause(), true);
  
      uint active_workers = AdaptiveSizePolicy::calc_active_workers(workers()->total_workers(),
--- 2809,2831 ----
      _gc_tracer_stw->report_yc_type(collector_state()->yc_type());
  
      GCTraceCPUTime tcpu;
  
      G1HeapVerifier::G1VerifyType verify_type;
!     FormatBuffer<> gc_string("Pause Young ");
      if (collector_state()->in_initial_mark_gc()) {
!       gc_string.append("(Concurrent Start)");
        verify_type = G1HeapVerifier::G1VerifyInitialMark;
      } else if (collector_state()->in_young_only_phase()) {
!       if (collector_state()->in_young_gc_before_mixed()) {
!         gc_string.append("(Concurrent End)");
!       } else {
!         gc_string.append("(Normal)");
!       }
        verify_type = G1HeapVerifier::G1VerifyYoungOnly;
      } else {
!       gc_string.append("(Mixed)");
        verify_type = G1HeapVerifier::G1VerifyMixed;
      }
      GCTraceTime(Info, gc) tm(gc_string, NULL, gc_cause(), true);
  
      uint active_workers = AdaptiveSizePolicy::calc_active_workers(workers()->total_workers(),