changeset 7530:b4e48cad8cc6

8066781: Minor cleanups to TenuredGeneration Reviewed-by: kbarrett, tschatzl
author brutisso
date Wed, 10 Dec 2014 11:31:43 +0100
parents f1833a8541d8
children 4c99c4e3fb74
files src/share/vm/memory/tenuredGeneration.cpp src/share/vm/memory/tenuredGeneration.hpp src/share/vm/memory/tenuredGeneration.inline.hpp src/share/vm/runtime/vmStructs.cpp
diffstat 4 files changed, 3 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/memory/tenuredGeneration.cpp	Wed Dec 10 11:30:46 2014 +0100
+++ b/src/share/vm/memory/tenuredGeneration.cpp	Wed Dec 10 11:31:43 2014 +0100
@@ -389,8 +389,6 @@
 
 
 void TenuredGeneration::gc_epilogue(bool full) {
-  _last_gc = WaterMark(the_space(), the_space()->top());
-
   // update the generation and space performance counters
   update_counters();
   if (ZapUnusedHeapArea) {
--- a/src/share/vm/memory/tenuredGeneration.hpp	Wed Dec 10 11:30:46 2014 +0100
+++ b/src/share/vm/memory/tenuredGeneration.hpp	Wed Dec 10 11:31:43 2014 +0100
@@ -43,8 +43,6 @@
 
  protected:
   ContiguousSpace*  _the_space;       // actual space holding objects
-  WaterMark  _last_gc;                // watermark between objects allocated before
-                                      // and after last GC.
 
   GenerationCounters*   _gen_counters;
   CSpaceCounters*       _space_counters;
@@ -104,10 +102,6 @@
   virtual inline HeapWord* allocate(size_t word_size, bool is_tlab);
   virtual inline HeapWord* par_allocate(size_t word_size, bool is_tlab);
 
-  // Accessing marks
-  inline WaterMark top_mark();
-  inline WaterMark bottom_mark();
-
 #define TenuredGen_SINCE_SAVE_MARKS_DECL(OopClosureType, nv_suffix)     \
   void oop_since_save_marks_iterate##nv_suffix(OopClosureType* cl);
   TenuredGen_SINCE_SAVE_MARKS_DECL(OopsInGenClosure,_v)
--- a/src/share/vm/memory/tenuredGeneration.inline.hpp	Wed Dec 10 11:30:46 2014 +0100
+++ b/src/share/vm/memory/tenuredGeneration.inline.hpp	Wed Dec 10 11:31:43 2014 +0100
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_MEMORY_GENERATION_INLINE_HPP
-#define SHARE_VM_MEMORY_GENERATION_INLINE_HPP
+#ifndef SHARE_VM_MEMORY_TENUREDGENERATION_INLINE_HPP
+#define SHARE_VM_MEMORY_TENUREDGENERATION_INLINE_HPP
 
 #include "memory/genCollectedHeap.hpp"
 #include "memory/space.hpp"
@@ -33,11 +33,6 @@
   return the_space()->is_in(p);
 }
 
-
-WaterMark TenuredGeneration::top_mark() {
-  return the_space()->top_mark();
-}
-
 CompactibleSpace*
 TenuredGeneration::first_compaction_space() const {
   return the_space();
@@ -55,10 +50,6 @@
   return the_space()->par_allocate(word_size);
 }
 
-WaterMark TenuredGeneration::bottom_mark() {
-  return the_space()->bottom_mark();
-}
-
 size_t TenuredGeneration::block_size(const HeapWord* addr) const {
   if (addr < the_space()->top()) return oop(addr)->size();
   else {
@@ -71,4 +62,4 @@
   return addr < the_space()->top();
 }
 
-#endif // SHARE_VM_MEMORY_GENERATION_INLINE_HPP
+#endif // SHARE_VM_MEMORY_TENUREDGENERATION_INLINE_HPP
--- a/src/share/vm/runtime/vmStructs.cpp	Wed Dec 10 11:30:46 2014 +0100
+++ b/src/share/vm/runtime/vmStructs.cpp	Wed Dec 10 11:31:43 2014 +0100
@@ -556,9 +556,6 @@
                                                                                                                                      \
   nonstatic_field(TenuredGeneration,           _min_heap_delta_bytes,                         size_t)                                \
   nonstatic_field(TenuredGeneration,           _the_space,                                    ContiguousSpace*)                      \
-  nonstatic_field(TenuredGeneration,           _last_gc,                                      WaterMark)                             \
-                                                                                                                                     \
-                                                                                                                                     \
                                                                                                                                      \
   nonstatic_field(Space,                       _bottom,                                       HeapWord*)                             \
   nonstatic_field(Space,                       _end,                                          HeapWord*)                             \