jdk-sandbox: comparison hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp

equal deleted inserted replaced

-:48f69987dbca
+:1438e0fbfa27
 SizerMaxNewSizeOnly,
 SizerMaxAndNewSize,
 SizerNewRatio
 };
 SizerKind _sizer_kind;
-size_t _min_desired_young_length;
+uint _min_desired_young_length;
-size_t _max_desired_young_length;
+uint _max_desired_young_length;
 bool _adaptive_size;
-size_t calculate_default_min_length(size_t new_number_of_heap_regions);
+uint calculate_default_min_length(uint new_number_of_heap_regions);
-size_t calculate_default_max_length(size_t new_number_of_heap_regions);
+uint calculate_default_max_length(uint new_number_of_heap_regions);
 public:
 G1YoungGenSizer();
-void heap_size_changed(size_t new_number_of_heap_regions);
+void heap_size_changed(uint new_number_of_heap_regions);
-size_t min_desired_young_length() {
+uint min_desired_young_length() {
 return _min_desired_young_length;
 }
-size_t max_desired_young_length() {
+uint max_desired_young_length() {
 return _max_desired_young_length;
 }
 bool adaptive_young_list_length() {
 return _adaptive_size;
 }
 CollectionSetChooser* _collectionSetChooser;
 double _cur_collection_start_sec;
 size_t _cur_collection_pause_used_at_start_bytes;
-size_t _cur_collection_pause_used_regions_at_start;
+uint   _cur_collection_pause_used_regions_at_start;
 double _cur_collection_par_time_ms;
 double _cur_collection_code_root_fixup_time_ms;
 double _cur_clear_ct_time_ms;
 double* _par_last_gc_worker_other_times_ms;
 // indicates whether we are in young or mixed GC mode
 bool _gcs_are_young;
-size_t _young_list_target_length;
+uint _young_list_target_length;
-size_t _young_list_fixed_length;
+uint _young_list_fixed_length;
 size_t _prev_eden_capacity; // used for logging
 // The max number of regions we can extend the eden by while the GC
 // locker is active. This should be >= _young_list_target_length;
-size_t _young_list_max_length;
+uint _young_list_max_length;
 bool                  _last_gc_was_young;
 unsigned              _young_pause_num;
 unsigned              _mixed_pause_num;
 // add here any more surv rate groups
 double                _gc_overhead_perc;
 double _reserve_factor;
-size_t _reserve_regions;
+uint _reserve_regions;
 bool during_marking() {
 return _during_marking;
 }
 TruncatedSeq* _young_gc_eff_seq;
 G1YoungGenSizer* _young_gen_sizer;
-size_t _eden_cset_region_length;
+uint _eden_cset_region_length;
-size_t _survivor_cset_region_length;
+uint _survivor_cset_region_length;
-size_t _old_cset_region_length;
+uint _old_cset_region_length;
-void init_cset_region_lengths(size_t eden_cset_region_length,
+void init_cset_region_lengths(uint eden_cset_region_length,
-size_t survivor_cset_region_length);
+uint survivor_cset_region_length);
-size_t eden_cset_region_length()     { return _eden_cset_region_length;     }
+uint eden_cset_region_length()     { return _eden_cset_region_length;     }
-size_t survivor_cset_region_length() { return _survivor_cset_region_length; }
+uint survivor_cset_region_length() { return _survivor_cset_region_length; }
-size_t old_cset_region_length()      { return _old_cset_region_length;      }
+uint old_cset_region_length()      { return _old_cset_region_length;      }
-size_t _free_regions_at_end_of_collection;
+uint _free_regions_at_end_of_collection;
 size_t _recorded_rs_lengths;
 size_t _max_rs_lengths;
 double _recorded_young_free_cset_time_ms;
 size_t predict_bytes_to_copy(HeapRegion* hr);
 double predict_region_elapsed_time_ms(HeapRegion* hr, bool young);
 void set_recorded_rs_lengths(size_t rs_lengths);
-size_t cset_region_length()       { return young_cset_region_length() +
+uint cset_region_length()       { return young_cset_region_length() +
 old_cset_region_length(); }
-size_t young_cset_region_length() { return eden_cset_region_length() +
+uint young_cset_region_length() { return eden_cset_region_length() +
 survivor_cset_region_length(); }
 void record_young_free_cset_time_ms(double time_ms) {
 _recorded_young_free_cset_time_ms = time_ms;
 }
 void update_young_list_target_length(size_t rs_lengths = (size_t) -1);
 // Calculate and return the minimum desired young list target
 // length. This is the minimum desired young list length according
 // to the user's inputs.
-size_t calculate_young_list_desired_min_length(size_t base_min_length);
+uint calculate_young_list_desired_min_length(uint base_min_length);
 // Calculate and return the maximum desired young list target
 // length. This is the maximum desired young list length according
 // to the user's inputs.
-size_t calculate_young_list_desired_max_length();
+uint calculate_young_list_desired_max_length();
 // Calculate and return the maximum young list target length that
 // can fit into the pause time goal. The parameters are: rs_lengths
 // represent the prediction of how large the young RSet lengths will
 // be, base_min_length is the alreay existing number of regions in
 // the young list, min_length and max_length are the desired min and
 // max young list length according to the user's inputs.
-size_t calculate_young_list_target_length(size_t rs_lengths,
+uint calculate_young_list_target_length(size_t rs_lengths,
-size_t base_min_length,
+uint base_min_length,
-size_t desired_min_length,
+uint desired_min_length,
-size_t desired_max_length);
+uint desired_max_length);
 // Check whether a given young length (young_length) fits into the
 // given target pause time and whether the prediction for the amount
 // of objects to be copied for the given length will fit into the
 // given free space (expressed by base_free_regions).  It is used by
 // calculate_young_list_target_length().
-bool predict_will_fit(size_t young_length, double base_time_ms,
+bool predict_will_fit(uint young_length, double base_time_ms,
-size_t base_free_regions, double target_pause_time_ms);
+uint base_free_regions, double target_pause_time_ms);
 // Count the number of bytes used in the CS.
 void count_CS_bytes_used();
 public:
 unsigned calc_gc_alloc_time_stamp() {
 return _all_pause_times_ms->num() + 1;
 }
 // This should be called after the heap is resized.
-void record_new_heap_size(size_t new_number_of_regions);
+void record_new_heap_size(uint new_number_of_regions);
 void init();
 // Create jstat counters for the policy.
 virtual void initialize_gc_policy_counters();
 }
 // do that for any other surv rate groups
 }
 bool is_young_list_full() {
-size_t young_list_length = _g1->young_list()->length();
+uint young_list_length = _g1->young_list()->length();
-size_t young_list_target_length = _young_list_target_length;
+uint young_list_target_length = _young_list_target_length;
 return young_list_length >= young_list_target_length;
 }
 bool can_expand_young_list() {
-size_t young_list_length = _g1->young_list()->length();
+uint young_list_length = _g1->young_list()->length();
-size_t young_list_max_length = _young_list_max_length;
+uint young_list_max_length = _young_list_max_length;
 return young_list_length < young_list_max_length;
 }
-size_t young_list_max_length() {
+uint young_list_max_length() {
 return _young_list_max_length;
 }
 bool gcs_are_young() {
 return _gcs_are_young;
 // Current tenuring threshold, set to 0 if the collector reaches the
 // maximum amount of suvivors regions.
 int _tenuring_threshold;
 // The limit on the number of regions allocated for survivors.
-size_t _max_survivor_regions;
+uint _max_survivor_regions;
 // For reporting purposes.
 size_t _eden_bytes_before_gc;
 size_t _survivor_bytes_before_gc;
 size_t _capacity_before_gc;
 // The amount of survor regions after a collection.
-size_t _recorded_survivor_regions;
+uint _recorded_survivor_regions;
 // List of survivor regions.
 HeapRegion* _recorded_survivor_head;
 HeapRegion* _recorded_survivor_tail;
 ageTable _survivors_age_table;
 inline bool track_object_age(GCAllocPurpose purpose) {
 return purpose == GCAllocForSurvived;
 }
-static const size_t REGIONS_UNLIMITED = ~(size_t)0;
+static const uint REGIONS_UNLIMITED = (uint) -1;
-size_t max_regions(int purpose);
+uint max_regions(int purpose);
 // The limit on regions for a particular purpose is reached.
 void note_alloc_region_limit_reached(int purpose) {
 if (purpose == GCAllocForSurvived) {
 _tenuring_threshold = 0;
 void note_stop_adding_survivor_regions() {
 _survivor_surv_rate_group->stop_adding_regions();
 }
-void record_survivor_regions(size_t      regions,
+void record_survivor_regions(uint regions,
 HeapRegion* head,
 HeapRegion* tail) {
 _recorded_survivor_regions = regions;
 _recorded_survivor_head    = head;
 _recorded_survivor_tail    = tail;
 }
-size_t recorded_survivor_regions() {
+uint recorded_survivor_regions() {
 return _recorded_survivor_regions;
 }
-void record_thread_age_table(ageTable* age_table)
+void record_thread_age_table(ageTable* age_table) {
-{
 _survivors_age_table.merge_par(age_table);
 }
 void update_max_gc_locker_expansion();

changeset 12381	1438e0fbfa27
parent 12272	f87fd1292095
child 12382	6aaecb1cbfe1