src/share/vm/memory/generation.hpp

rev 8333 : 8077842: Remove the level parameter passed around in GenCollectedHeap
Reviewed-by:

*** 96,123 ****
    MemRegion _reserved;
  
    // Memory area reserved for generation
    VirtualSpace _virtual_space;
  
-   // Level in the generation hierarchy.
-   int _level;
- 
    // ("Weak") Reference processing support
    ReferenceProcessor* _ref_processor;
  
    // Performance Counters
    CollectorCounters* _gc_counters;
  
    // Statistics for garbage collection
    GCStats* _gc_stats;
  
-   // Returns the next generation in the configuration, or else NULL if this
-   // is the highest generation.
-   Generation* next_gen() const;
- 
    // Initialize the generation.
!   Generation(ReservedSpace rs, size_t initial_byte_size, int level);
  
    // Apply "cl->do_oop" to (the address of) (exactly) all the ref fields in
    // "sp" that point into younger generations.
    // The iteration is only over objects allocated at the start of the
    // iterations; objects allocated as a result of applying the closure are
--- 96,116 ----
    MemRegion _reserved;
  
    // Memory area reserved for generation
    VirtualSpace _virtual_space;
  
    // ("Weak") Reference processing support
    ReferenceProcessor* _ref_processor;
  
    // Performance Counters
    CollectorCounters* _gc_counters;
  
    // Statistics for garbage collection
    GCStats* _gc_stats;
  
    // Initialize the generation.
!   Generation(ReservedSpace rs, size_t initial_byte_size);
  
    // Apply "cl->do_oop" to (the address of) (exactly) all the ref fields in
    // "sp" that point into younger generations.
    // The iteration is only over objects allocated at the start of the
    // iterations; objects allocated as a result of applying the closure are
*** 132,141 ****
--- 125,139 ----
      MarkSweepCompact,
      ConcurrentMarkSweep,
      Other
    };
  
+   enum Type {
+     Young,
+     Old
+   };
+ 
    enum SomePublicConstants {
      // Generations are GenGrain-aligned and have size that are multiples of
      // GenGrain.
      // Note: on ARM we add 1 bit for card_table_base to be properly aligned
      // (we expect its low byte to be zero - see implementation of post_barrier)
*** 407,425 ****
  
    virtual void update_time_of_last_gc(jlong now)  {
      _time_of_last_gc = now;
    }
  
!   // Generations may keep statistics about collection.  This
!   // method updates those statistics.  current_level is
!   // the level of the collection that has most recently
!   // occurred.  This allows the generation to decide what
!   // statistics are valid to collect.  For example, the
!   // generation can decide to gather the amount of promoted data
!   // if the collection of the younger generations has completed.
    GCStats* gc_stats() const { return _gc_stats; }
!   virtual void update_gc_stats(int current_level, bool full) {}
  
    // Mark sweep support phase2
    virtual void prepare_for_compaction(CompactPoint* cp);
    // Mark sweep support phase3
    virtual void adjust_pointers();
--- 405,422 ----
  
    virtual void update_time_of_last_gc(jlong now)  {
      _time_of_last_gc = now;
    }
  
!   // Generations may keep statistics about collection. This method
!   // updates those statistics. current_generation is the generation
!   // that was most recently collected. This allows the generation to
!   // decide what statistics are valid to collect. For example, the
!   // generation can decide to gather the amount of promoted data if
!   // the collection of the younger generations has completed.
    GCStats* gc_stats() const { return _gc_stats; }
!   virtual void update_gc_stats(Generation* current_generation, bool full) {}
  
    // Mark sweep support phase2
    virtual void prepare_for_compaction(CompactPoint* cp);
    // Mark sweep support phase3
    virtual void adjust_pointers();
*** 500,511 ****
  
    // Printing
    virtual const char* name() const = 0;
    virtual const char* short_name() const = 0;
  
-   int level() const { return _level; }
- 
    // Reference Processing accessor
    ReferenceProcessor* const ref_processor() { return _ref_processor; }
  
    // Iteration.
  
--- 497,506 ----