1.1 --- a/src/share/vm/gc_implementation/g1/heapRegionSet.hpp Wed Apr 11 16:18:45 2012 +0200
1.2 +++ b/src/share/vm/gc_implementation/g1/heapRegionSet.hpp Wed Apr 18 07:21:15 2012 -0400
1.3 @@ -62,20 +62,20 @@
1.4 friend class VMStructs;
1.5
1.6 protected:
1.7 - static size_t calculate_region_num(HeapRegion* hr);
1.8 + static uint calculate_region_num(HeapRegion* hr);
1.9
1.10 - static size_t _unrealistically_long_length;
1.11 + static uint _unrealistically_long_length;
1.12
1.13 // The number of regions added to the set. If the set contains
1.14 // only humongous regions, this reflects only 'starts humongous'
1.15 // regions and does not include 'continues humongous' ones.
1.16 - size_t _length;
1.17 + uint _length;
1.18
1.19 // The total number of regions represented by the set. If the set
1.20 // does not contain humongous regions, this should be the same as
1.21 // _length. If the set contains only humongous regions, this will
1.22 // include the 'continues humongous' regions.
1.23 - size_t _region_num;
1.24 + uint _region_num;
1.25
1.26 // We don't keep track of the total capacity explicitly, we instead
1.27 // recalculate it based on _region_num and the heap region size.
1.28 @@ -86,8 +86,8 @@
1.29 const char* _name;
1.30
1.31 bool _verify_in_progress;
1.32 - size_t _calc_length;
1.33 - size_t _calc_region_num;
1.34 + uint _calc_length;
1.35 + uint _calc_region_num;
1.36 size_t _calc_total_capacity_bytes;
1.37 size_t _calc_total_used_bytes;
1.38
1.39 @@ -153,18 +153,18 @@
1.40 HeapRegionSetBase(const char* name);
1.41
1.42 public:
1.43 - static void set_unrealistically_long_length(size_t len);
1.44 + static void set_unrealistically_long_length(uint len);
1.45
1.46 const char* name() { return _name; }
1.47
1.48 - size_t length() { return _length; }
1.49 + uint length() { return _length; }
1.50
1.51 bool is_empty() { return _length == 0; }
1.52
1.53 - size_t region_num() { return _region_num; }
1.54 + uint region_num() { return _region_num; }
1.55
1.56 size_t total_capacity_bytes() {
1.57 - return region_num() << HeapRegion::LogOfHRGrainBytes;
1.58 + return (size_t) region_num() << HeapRegion::LogOfHRGrainBytes;
1.59 }
1.60
1.61 size_t total_used_bytes() { return _total_used_bytes; }
1.62 @@ -341,7 +341,7 @@
1.63 // of regions that are pending for removal in the list, and
1.64 // target_count should be > 1 (currently, we never need to remove a
1.65 // single region using this).
1.66 - void remove_all_pending(size_t target_count);
1.67 + void remove_all_pending(uint target_count);
1.68
1.69 virtual void verify();
1.70
