infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-11 22:19:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

8066781: Minor cleanups to TenuredGeneration

Browse Source 
Reviewed-by: kbarrett, tschatzl
This commit is contained in:
Bengt Rutisson 2014-12-10 11:31:43 +01:00
parent ef7d6c3b9d
commit b26180dfe9
4 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hotspot/src/share/vm/memory/tenuredGeneration.cpp
View File

@ -389,8 +389,6 @@ ALL_SINCE_SAVE_MARKS_CLOSURES(TenuredGen_SINCE_SAVE_MARKS_ITERATE_DEFN)
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) {

6
hotspot/src/share/vm/memory/tenuredGeneration.hpp
View File

@ -43,8 +43,6 @@ class TenuredGeneration: public CardGeneration {
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 @@ class TenuredGeneration: public CardGeneration {
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)

15
hotspot/src/share/vm/memory/tenuredGeneration.inline.hpp
View File

@ -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 @@ bool TenuredGeneration::is_in(const void* p) const {
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 @@ HeapWord* TenuredGeneration::par_allocate(size_t word_size,
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 @@ bool TenuredGeneration::block_is_obj(const HeapWord* addr) const {
return addr < the_space()->top();
}
#endif // SHARE_VM_MEMORY_GENERATION_INLINE_HPP
#endif // SHARE_VM_MEMORY_TENUREDGENERATION_INLINE_HPP

3
hotspot/src/share/vm/runtime/vmStructs.cpp
View File

@ -556,9 +556,6 @@ typedef TwoOopHashtable<Symbol*, mtClass> SymbolTwoOopHashtable;
\
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*) \