src/share/vm/gc/g1/g1ConcurrentMark.hpp

rev 10498 : imported patch 8151126-clean-up-duplicate-code-for-clearing-bitmaps
rev 10500 : imported patch 8151614-improve-concurrent-mark-logging
rev 10501 : imported patch 8151920-region-liveness-printing-broken

*** 999,1020 ****
    size_t _total_used_bytes;
    size_t _total_capacity_bytes;
    size_t _total_prev_live_bytes;
    size_t _total_next_live_bytes;
  
-   // These are set up when we come across a "stars humongous" region
-   // (as this is where most of this information is stored, not in the
-   // subsequent "continues humongous" regions). After that, for every
-   // region in a given humongous region series we deduce the right
-   // values for it by simply subtracting the appropriate amount from
-   // these fields. All these values should reach 0 after we've visited
-   // the last region in the series.
-   size_t _hum_used_bytes;
-   size_t _hum_capacity_bytes;
-   size_t _hum_prev_live_bytes;
-   size_t _hum_next_live_bytes;
- 
    // Accumulator for the remembered set size
    size_t _total_remset_bytes;
  
    // Accumulator for strong code roots memory size
    size_t _total_strong_code_roots_bytes;
--- 999,1008 ----
*** 1029,1043 ****
  
    static double bytes_to_mb(size_t val) {
      return (double) val / (double) M;
    }
  
-   // See the .cpp file.
-   size_t get_hum_bytes(size_t* hum_bytes);
-   void get_hum_bytes(size_t* used_bytes, size_t* capacity_bytes,
-                      size_t* prev_live_bytes, size_t* next_live_bytes);
- 
  public:
    // The header and footer are printed in the constructor and
    // destructor respectively.
    G1PrintRegionLivenessInfoClosure(const char* phase_name);
    virtual bool doHeapRegion(HeapRegion* r);
--- 1017,1026 ----