1.1 --- a/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp Thu Jul 22 10:27:41 2010 -0400
1.2 +++ b/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp Wed Aug 04 13:03:23 2010 -0400
1.3 @@ -76,9 +76,6 @@
1.4 virtual MainBodySummary* main_body_summary() { return this; }
1.5 };
1.6
1.7 -class AbandonedSummary: public PauseSummary {
1.8 -};
1.9 -
1.10 class G1CollectorPolicy: public CollectorPolicy {
1.11 protected:
1.12 // The number of pauses during the execution.
1.13 @@ -148,7 +145,6 @@
1.14 TruncatedSeq* _concurrent_mark_cleanup_times_ms;
1.15
1.16 Summary* _summary;
1.17 - AbandonedSummary* _abandoned_summary;
1.18
1.19 NumberSeq* _all_pause_times_ms;
1.20 NumberSeq* _all_full_gc_times_ms;
1.21 @@ -573,7 +569,6 @@
1.22 NumberSeq* calc_other_times_ms) const;
1.23
1.24 void print_summary (PauseSummary* stats) const;
1.25 - void print_abandoned_summary(PauseSummary* summary) const;
1.26
1.27 void print_summary (int level, const char* str, NumberSeq* seq) const;
1.28 void print_summary_sd (int level, const char* str, NumberSeq* seq) const;
1.29 @@ -886,7 +881,7 @@
1.30 virtual void record_collection_pause_end_CH_strong_roots();
1.31 virtual void record_collection_pause_end_G1_strong_roots();
1.32
1.33 - virtual void record_collection_pause_end(bool abandoned);
1.34 + virtual void record_collection_pause_end();
1.35
1.36 // Record the fact that a full collection occurred.
1.37 virtual void record_full_collection_start();
1.38 @@ -999,7 +994,7 @@
1.39 // Choose a new collection set. Marks the chosen regions as being
1.40 // "in_collection_set", and links them together. The head and number of
1.41 // the collection set are available via access methods.
1.42 - virtual bool choose_collection_set(double target_pause_time_ms) = 0;
1.43 + virtual void choose_collection_set(double target_pause_time_ms) = 0;
1.44
1.45 // The head of the list (via "next_in_collection_set()") representing the
1.46 // current collection set.
1.47 @@ -1256,7 +1251,7 @@
1.48 // If the estimated is less then desirable, resize if possible.
1.49 void expand_if_possible(size_t numRegions);
1.50
1.51 - virtual bool choose_collection_set(double target_pause_time_ms);
1.52 + virtual void choose_collection_set(double target_pause_time_ms);
1.53 virtual void record_collection_pause_start(double start_time_sec,
1.54 size_t start_used);
1.55 virtual void record_concurrent_mark_cleanup_end(size_t freed_bytes,
1.56 @@ -1267,7 +1262,7 @@
1.57 G1CollectorPolicy_BestRegionsFirst() {
1.58 _collectionSetChooser = new CollectionSetChooser();
1.59 }
1.60 - void record_collection_pause_end(bool abandoned);
1.61 + void record_collection_pause_end();
1.62 bool should_do_collection_pause(size_t word_size);
1.63 // This is not needed any more, after the CSet choosing code was
1.64 // changed to use the pause prediction work. But let's leave the
