1.1 --- a/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp Wed Apr 11 16:18:45 2012 +0200
1.2 +++ b/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp Wed Apr 18 07:21:15 2012 -0400
1.3 @@ -150,18 +150,18 @@
1.4
1.5 // Calculate the minimum number of old regions we'll add to the CSet
1.6 // during a mixed GC.
1.7 - size_t calcMinOldCSetLength();
1.8 + uint calcMinOldCSetLength();
1.9
1.10 // Calculate the maximum number of old regions we'll add to the CSet
1.11 // during a mixed GC.
1.12 - size_t calcMaxOldCSetLength();
1.13 + uint calcMaxOldCSetLength();
1.14
1.15 // Serial version.
1.16 void addMarkedHeapRegion(HeapRegion *hr);
1.17
1.18 // Must be called before calls to getParMarkedHeapRegionChunk.
1.19 // "n_regions" is the number of regions, "chunkSize" the chunk size.
1.20 - void prepareForAddMarkedHeapRegionsPar(size_t n_regions, size_t chunkSize);
1.21 + void prepareForAddMarkedHeapRegionsPar(uint n_regions, uint chunkSize);
1.22 // Returns the first index in a contiguous chunk of "n_regions" indexes
1.23 // that the calling thread has reserved. These must be set by the
1.24 // calling thread using "setMarkedHeapRegion" (to NULL if necessary).
1.25 @@ -176,7 +176,7 @@
1.26 void clearMarkedHeapRegions();
1.27
1.28 // Return the number of candidate regions that remain to be collected.
1.29 - size_t remainingRegions() { return _length - _curr_index; }
1.30 + uint remainingRegions() { return (uint) (_length - _curr_index); }
1.31
1.32 // Determine whether the CSet chooser has more candidate regions or not.
1.33 bool isEmpty() { return remainingRegions() == 0; }
