Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/gc_implementation/g1/heapRegionSet.hpp	Tue Sep 16 11:03:19 2014 +0200
     1.2 +++ b/src/share/vm/gc_implementation/g1/heapRegionSet.hpp	Tue Sep 16 14:27:40 2014 +0200
     1.3 @@ -81,7 +81,7 @@
     1.4    friend class VMStructs;
     1.5  private:
     1.6    bool _is_humongous;
     1.7 -  bool _is_empty;
     1.8 +  bool _is_free;
     1.9    HRSMtSafeChecker* _mt_safety_checker;
    1.10  
    1.11  protected:
    1.12 @@ -102,9 +102,9 @@
    1.13    // not. Only used during verification.
    1.14    bool regions_humongous() { return _is_humongous; }
    1.15  
    1.16 -  // Indicates whether all regions in the set should be empty or
    1.17 +  // Indicates whether all regions in the set should be free or
    1.18    // not. Only used during verification.
    1.19 -  bool regions_empty() { return _is_empty; }
    1.20 +  bool regions_free() { return _is_free; }
    1.21  
    1.22    void check_mt_safety() {
    1.23      if (_mt_safety_checker != NULL) {
    1.24 @@ -114,7 +114,7 @@
    1.25  
    1.26    virtual void fill_in_ext_msg_extra(hrs_ext_msg* msg) { }
    1.27  
    1.28 -  HeapRegionSetBase(const char* name, bool humongous, bool empty, HRSMtSafeChecker* mt_safety_checker);
    1.29 +  HeapRegionSetBase(const char* name, bool humongous, bool free, HRSMtSafeChecker* mt_safety_checker);
    1.30  
    1.31  public:
    1.32    const char* name() { return _name; }
    1.33 @@ -171,7 +171,7 @@
    1.34    do {                                                                        \
    1.35      assert(((_set1_)->regions_humongous() ==                                  \
    1.36                                              (_set2_)->regions_humongous()) && \
    1.37 -           ((_set1_)->regions_empty() == (_set2_)->regions_empty()),          \
    1.38 +           ((_set1_)->regions_free() == (_set2_)->regions_free()),            \
    1.39             hrs_err_msg("the contents of set %s and set %s should match",      \
    1.40                         (_set1_)->name(), (_set2_)->name()));                  \
    1.41    } while (0)
    1.42 @@ -184,7 +184,7 @@
    1.43  class HeapRegionSet : public HeapRegionSetBase {
    1.44  public:
    1.45    HeapRegionSet(const char* name, bool humongous, HRSMtSafeChecker* mt_safety_checker):
    1.46 -    HeapRegionSetBase(name, humongous, false /* empty */, mt_safety_checker) { }
    1.47 +    HeapRegionSetBase(name, humongous, false /* free */, mt_safety_checker) { }
    1.48  
    1.49    void bulk_remove(const HeapRegionSetCount& removed) {
    1.50      _count.decrement(removed.length(), removed.capacity());