1.1 --- a/src/share/vm/gc_implementation/g1/concurrentMark.hpp Mon Jun 20 09:42:26 2011 -0700
1.2 +++ b/src/share/vm/gc_implementation/g1/concurrentMark.hpp Mon Jun 20 22:03:13 2011 -0400
1.3 @@ -605,10 +605,10 @@
1.4 void mark_stack_pop(oop* arr, int max, int* n) {
1.5 _markStack.par_pop_arr(arr, max, n);
1.6 }
1.7 - size_t mark_stack_size() { return _markStack.size(); }
1.8 + size_t mark_stack_size() { return _markStack.size(); }
1.9 size_t partial_mark_stack_size_target() { return _markStack.maxElems()/3; }
1.10 - bool mark_stack_overflow() { return _markStack.overflow(); }
1.11 - bool mark_stack_empty() { return _markStack.isEmpty(); }
1.12 + bool mark_stack_overflow() { return _markStack.overflow(); }
1.13 + bool mark_stack_empty() { return _markStack.isEmpty(); }
1.14
1.15 // (Lock-free) Manipulation of the region stack
1.16 bool region_stack_push_lock_free(MemRegion mr) {
1.17 @@ -833,8 +833,9 @@
1.18 // _min_finger then we need to gray objects.
1.19 // This routine is like registerCSetRegion but for an entire
1.20 // collection of regions.
1.21 - if (max_finger > _min_finger)
1.22 + if (max_finger > _min_finger) {
1.23 _should_gray_objects = true;
1.24 + }
1.25 }
1.26
1.27 // Returns "true" if at least one mark has been completed.
1.28 @@ -880,14 +881,18 @@
1.29 // The following indicate whether a given verbose level has been
1.30 // set. Notice that anything above stats is conditional to
1.31 // _MARKING_VERBOSE_ having been set to 1
1.32 - bool verbose_stats()
1.33 - { return _verbose_level >= stats_verbose; }
1.34 - bool verbose_low()
1.35 - { return _MARKING_VERBOSE_ && _verbose_level >= low_verbose; }
1.36 - bool verbose_medium()
1.37 - { return _MARKING_VERBOSE_ && _verbose_level >= medium_verbose; }
1.38 - bool verbose_high()
1.39 - { return _MARKING_VERBOSE_ && _verbose_level >= high_verbose; }
1.40 + bool verbose_stats() {
1.41 + return _verbose_level >= stats_verbose;
1.42 + }
1.43 + bool verbose_low() {
1.44 + return _MARKING_VERBOSE_ && _verbose_level >= low_verbose;
1.45 + }
1.46 + bool verbose_medium() {
1.47 + return _MARKING_VERBOSE_ && _verbose_level >= medium_verbose;
1.48 + }
1.49 + bool verbose_high() {
1.50 + return _MARKING_VERBOSE_ && _verbose_level >= high_verbose;
1.51 + }
1.52 };
1.53
1.54 // A class representing a marking task.
1.55 @@ -1063,8 +1068,9 @@
1.56 // respective limit and calls reached_limit() if they have
1.57 void check_limits() {
1.58 if (_words_scanned >= _words_scanned_limit ||
1.59 - _refs_reached >= _refs_reached_limit)
1.60 + _refs_reached >= _refs_reached_limit) {
1.61 reached_limit();
1.62 + }
1.63 }
1.64 // this is supposed to be called regularly during a marking step as
1.65 // it checks a bunch of conditions that might cause the marking step
