# HG changeset patch
# User sjohanss
# Date 1416415281 -3600
#      Wed Nov 19 17:41:21 2014 +0100
# Node ID d0c3273a1d0b998ae975d9c9ba4b4909f680b922
# Parent  e8bf410d5e236961e0aac9736e620298c464857a
8065227: Report allocation context stats at end of cleanup
Summary: Moved allocation context update from remark to the cleanup phase.
Reviewed-by:

diff --git a/src/share/vm/gc_implementation/g1/concurrentMark.cpp b/src/share/vm/gc_implementation/g1/concurrentMark.cpp
--- a/src/share/vm/gc_implementation/g1/concurrentMark.cpp
+++ b/src/share/vm/gc_implementation/g1/concurrentMark.cpp
@@ -2175,6 +2175,7 @@
   // We reclaimed old regions so we should calculate the sizes to make
   // sure we update the old gen/space data.
   g1h->g1mm()->update_sizes();
+  g1h->allocation_context_stats().update_after_mark();
 
   g1h->trace_heap_after_concurrent_cycle();
 }
@@ -3346,7 +3347,6 @@
   } else {
     g1_par_agg_task.work(0);
   }
-  _g1h->allocation_context_stats().update_at_remark();
 }
 
 // Clear the per-worker arrays used to store the per-region counting data
diff --git a/src/share/vm/gc_implementation/g1/g1AllocationContext.hpp b/src/share/vm/gc_implementation/g1/g1AllocationContext.hpp
--- a/src/share/vm/gc_implementation/g1/g1AllocationContext.hpp
+++ b/src/share/vm/gc_implementation/g1/g1AllocationContext.hpp
@@ -45,7 +45,7 @@
 public:
   inline void clear() { }
   inline void update(bool full_gc) { }
-  inline void update_at_remark() { }
+  inline void update_after_mark() { }
   inline bool available() { return false; }
 };