1.1 --- a/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp Wed Jan 18 09:50:16 2012 -0800
1.2 +++ b/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp Wed Feb 15 13:06:53 2012 -0500
1.3 @@ -312,16 +312,13 @@
1.4 double _recorded_non_young_free_cset_time_ms;
1.5
1.6 double _sigma;
1.7 - double _expensive_region_limit_ms;
1.8
1.9 size_t _rs_lengths_prediction;
1.10
1.11 size_t _known_garbage_bytes;
1.12 double _known_garbage_ratio;
1.13
1.14 - double sigma() {
1.15 - return _sigma;
1.16 - }
1.17 + double sigma() { return _sigma; }
1.18
1.19 // A function that prevents us putting too much stock in small sample
1.20 // sets. Returns a number between 2.0 and 1.0, depending on the number
1.21 @@ -491,8 +488,6 @@
1.22 get_new_prediction(_non_young_other_cost_per_region_ms_seq);
1.23 }
1.24
1.25 - void check_if_region_is_too_expensive(double predicted_time_ms);
1.26 -
1.27 double predict_young_collection_elapsed_time_ms(size_t adjustment);
1.28 double predict_base_elapsed_time_ms(size_t pending_cards);
1.29 double predict_base_elapsed_time_ms(size_t pending_cards,
1.30 @@ -707,7 +702,6 @@
1.31 // initial-mark work.
1.32 volatile bool _during_initial_mark_pause;
1.33
1.34 - bool _should_revert_to_young_gcs;
1.35 bool _last_young_gc;
1.36
1.37 // This set of variables tracks the collector efficiency, in order to
1.38 @@ -946,10 +940,17 @@
1.39 return _bytes_copied_during_gc;
1.40 }
1.41
1.42 + // Determine whether the next GC should be mixed. Called to determine
1.43 + // whether to start mixed GCs or whether to carry on doing mixed
1.44 + // GCs. The two action strings are used in the ergo output when the
1.45 + // method returns true or false.
1.46 + bool next_gc_should_be_mixed(const char* true_action_str,
1.47 + const char* false_action_str);
1.48 +
1.49 // Choose a new collection set. Marks the chosen regions as being
1.50 // "in_collection_set", and links them together. The head and number of
1.51 // the collection set are available via access methods.
1.52 - void choose_collection_set(double target_pause_time_ms);
1.53 + void finalize_cset(double target_pause_time_ms);
1.54
1.55 // The head of the list (via "next_in_collection_set()") representing the
1.56 // current collection set.
