1.1 --- a/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp Tue Jan 10 20:02:41 2012 +0100
1.2 +++ b/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp Tue Jan 10 18:58:13 2012 -0500
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -67,7 +67,7 @@
1.11 define_num_seq(satb_drain) // optional
1.12 define_num_seq(parallel) // parallel only
1.13 define_num_seq(ext_root_scan)
1.14 - define_num_seq(mark_stack_scan)
1.15 + define_num_seq(satb_filtering)
1.16 define_num_seq(update_rs)
1.17 define_num_seq(scan_rs)
1.18 define_num_seq(obj_copy)
1.19 @@ -215,7 +215,7 @@
1.20
1.21 double* _par_last_gc_worker_start_times_ms;
1.22 double* _par_last_ext_root_scan_times_ms;
1.23 - double* _par_last_mark_stack_scan_times_ms;
1.24 + double* _par_last_satb_filtering_times_ms;
1.25 double* _par_last_update_rs_times_ms;
1.26 double* _par_last_update_rs_processed_buffers;
1.27 double* _par_last_scan_rs_times_ms;
1.28 @@ -841,8 +841,8 @@
1.29 _par_last_ext_root_scan_times_ms[worker_i] = ms;
1.30 }
1.31
1.32 - void record_mark_stack_scan_time(int worker_i, double ms) {
1.33 - _par_last_mark_stack_scan_times_ms[worker_i] = ms;
1.34 + void record_satb_filtering_time(int worker_i, double ms) {
1.35 + _par_last_satb_filtering_times_ms[worker_i] = ms;
1.36 }
1.37
1.38 void record_satb_drain_time(double ms) {
1.39 @@ -1146,6 +1146,11 @@
1.40 _survivor_surv_rate_group->stop_adding_regions();
1.41 }
1.42
1.43 + void tenure_all_objects() {
1.44 + _max_survivor_regions = 0;
1.45 + _tenuring_threshold = 0;
1.46 + }
1.47 +
1.48 void record_survivor_regions(size_t regions,
1.49 HeapRegion* head,
1.50 HeapRegion* tail) {
