8272651: G1 heap region info print order changed by JDK-8269914

Reviewed-by: rrich
Backport-of: f11e099a149adfecc474ba37276ec8672067d090

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

@@ -1108,8 +1108,9 @@ bool G1CollectedHeap::do_full_collection(bool explicit_gc,
   const bool do_clear_all_soft_refs = clear_all_soft_refs ||
       soft_ref_policy()->should_clear_all_soft_refs();
 
-  G1FullCollector collector(this, explicit_gc, do_clear_all_soft_refs, do_maximum_compaction);
+  G1FullGCMark gc_mark;
   GCTraceTime(Info, gc) tm("Pause Full", NULL, gc_cause(), true);
+  G1FullCollector collector(this, explicit_gc, do_clear_all_soft_refs, do_maximum_compaction);
 
   collector.prepare_collection();
   collector.collect();
@@ -2998,8 +2999,15 @@ void G1CollectedHeap::do_collection_pause_at_safepoint_helper(double target_paus
     G1MonitoringScope ms(g1mm(),
                          false /* full_gc */,
                          collector_state()->in_mixed_phase() /* all_memory_pools_affected */);
-
+    // Create the heap printer before internal pause timing to have
+    // heap information printed as last part of detailed GC log.
     G1HeapPrinterMark hpm(this);
+    // Young GC internal pause timing
+    // Not (yet) in 17: G1YoungGCNotifyPauseMark npm;
+
+    // Verification may use the gang workers, so they must be set up before.
+    // Individual parallel phases may override this.
+    // Not (yet) in 17: set_young_collection_default_active_worker_threads();
 
     {
       IsGCActiveMark x;

src/hotspot/share/gc/g1/g1FullCollector.hpp

@@ -31,6 +31,8 @@
 #include "gc/g1/g1FullGCOopClosures.hpp"
 #include "gc/g1/g1FullGCScope.hpp"
 #include "gc/g1/g1RegionMarkStatsCache.hpp"
+#include "gc/shared/gcId.hpp"
+#include "gc/shared/gcTraceTime.hpp"
 #include "gc/shared/preservedMarks.hpp"
 #include "gc/shared/referenceProcessor.hpp"
 #include "gc/shared/taskqueue.hpp"
@@ -55,6 +57,16 @@ class G1FullGCSubjectToDiscoveryClosure: public BoolObjectClosure {
   }
 };
 
+// Full GC Mark that holds GC id and CPU time trace. Needs to be separate
+// from the G1FullCollector and G1FullGCScope to allow the Full GC logging
+// to have the same structure as the Young GC logging.
+class G1FullGCMark : StackObj {
+  GCIdMark       _gc_id;
+  GCTraceCPUTime _cpu_time;
+public:
+  G1FullGCMark() : _gc_id(), _cpu_time() { }
+};
+
 // The G1FullCollector holds data associated with the current Full GC.
 class G1FullCollector : StackObj {
   G1CollectedHeap*          _heap;

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

@@ -42,12 +42,10 @@ G1FullGCScope::G1FullGCScope(G1MonitoringSupport* monitoring_support,
     _rm(),
     _explicit_gc(explicit_gc),
     _g1h(G1CollectedHeap::heap()),
-    _gc_id(),
     _svc_marker(SvcGCMarker::FULL),
     _timer(),
     _tracer(),
     _active(),
-    _cpu_time(),
     _tracer_mark(&_timer, &_tracer),
     _soft_refs(clear_soft, _g1h->soft_ref_policy()),
     _monitoring_scope(monitoring_support, true /* full_gc */, true /* all_memory_pools_affected */),

src/hotspot/share/gc/g1/g1FullGCScope.hpp

@@ -28,8 +28,6 @@
 #include "gc/g1/g1CollectedHeap.hpp"
 #include "gc/g1/g1HeapTransition.hpp"
 #include "gc/g1/g1Trace.hpp"
-#include "gc/shared/gcId.hpp"
-#include "gc/shared/gcTraceTime.hpp"
 #include "gc/shared/gcTimer.hpp"
 #include "gc/shared/gcVMOperations.hpp"
 #include "gc/shared/isGCActiveMark.hpp"
@@ -51,12 +49,10 @@ class G1FullGCScope : public StackObj {
   ResourceMark            _rm;
   bool                    _explicit_gc;
   G1CollectedHeap*        _g1h;
-  GCIdMark                _gc_id;
   SvcGCMarker             _svc_marker;
   STWGCTimer              _timer;
   G1FullGCTracer          _tracer;
   IsGCActiveMark          _active;
-  GCTraceCPUTime          _cpu_time;
   G1FullGCJFRTracerMark   _tracer_mark;
   ClearedAllSoftRefs      _soft_refs;
   G1MonitoringScope       _monitoring_scope;