1.1 --- a/src/share/vm/gc_implementation/g1/heapRegionSet.inline.hpp Thu Mar 03 21:02:56 2011 -0800
1.2 +++ b/src/share/vm/gc_implementation/g1/heapRegionSet.inline.hpp Fri Mar 04 17:13:19 2011 -0500
1.3 @@ -42,8 +42,8 @@
1.4 }
1.5
1.6 inline void HeapRegionSetBase::add_internal(HeapRegion* hr) {
1.7 - hrl_assert_region_ok(this, hr, NULL);
1.8 - assert(hr->next() == NULL, hrl_ext_msg(this, "should not already be linked"));
1.9 + hrs_assert_region_ok(this, hr, NULL);
1.10 + assert(hr->next() == NULL, hrs_ext_msg(this, "should not already be linked"));
1.11
1.12 update_for_addition(hr);
1.13 hr->set_containing_set(this);
1.14 @@ -51,7 +51,7 @@
1.15
1.16 inline void HeapRegionSetBase::update_for_removal(HeapRegion* hr) {
1.17 // Assumes the caller has already verified the region.
1.18 - assert(_length > 0, hrl_ext_msg(this, "pre-condition"));
1.19 + assert(_length > 0, hrs_ext_msg(this, "pre-condition"));
1.20 _length -= 1;
1.21
1.22 size_t region_num_diff;
1.23 @@ -61,22 +61,22 @@
1.24 region_num_diff = calculate_region_num(hr);
1.25 }
1.26 assert(region_num_diff <= _region_num,
1.27 - hrl_err_msg("[%s] region's region num: "SIZE_FORMAT" "
1.28 + hrs_err_msg("[%s] region's region num: "SIZE_FORMAT" "
1.29 "should be <= region num: "SIZE_FORMAT,
1.30 name(), region_num_diff, _region_num));
1.31 _region_num -= region_num_diff;
1.32
1.33 size_t used_bytes = hr->used();
1.34 assert(used_bytes <= _total_used_bytes,
1.35 - hrl_err_msg("[%s] region's used bytes: "SIZE_FORMAT" "
1.36 + hrs_err_msg("[%s] region's used bytes: "SIZE_FORMAT" "
1.37 "should be <= used bytes: "SIZE_FORMAT,
1.38 name(), used_bytes, _total_used_bytes));
1.39 _total_used_bytes -= used_bytes;
1.40 }
1.41
1.42 inline void HeapRegionSetBase::remove_internal(HeapRegion* hr) {
1.43 - hrl_assert_region_ok(this, hr, this);
1.44 - assert(hr->next() == NULL, hrl_ext_msg(this, "should already be unlinked"));
1.45 + hrs_assert_region_ok(this, hr, this);
1.46 + assert(hr->next() == NULL, hrs_ext_msg(this, "should already be unlinked"));
1.47
1.48 hr->set_containing_set(NULL);
1.49 update_for_removal(hr);
1.50 @@ -85,13 +85,13 @@
1.51 //////////////////// HeapRegionSet ////////////////////
1.52
1.53 inline void HeapRegionSet::add(HeapRegion* hr) {
1.54 - hrl_assert_mt_safety_ok(this);
1.55 + hrs_assert_mt_safety_ok(this);
1.56 // add_internal() will verify the region.
1.57 add_internal(hr);
1.58 }
1.59
1.60 inline void HeapRegionSet::remove(HeapRegion* hr) {
1.61 - hrl_assert_mt_safety_ok(this);
1.62 + hrs_assert_mt_safety_ok(this);
1.63 // remove_internal() will verify the region.
1.64 remove_internal(hr);
1.65 }
1.66 @@ -101,8 +101,8 @@
1.67 // No need to fo the MT safety check here given that this method
1.68 // does not update the contents of the set but instead accumulates
1.69 // the changes in proxy_set which is assumed to be thread-local.
1.70 - hrl_assert_sets_match(this, proxy_set);
1.71 - hrl_assert_region_ok(this, hr, this);
1.72 + hrs_assert_sets_match(this, proxy_set);
1.73 + hrs_assert_region_ok(this, hr, this);
1.74
1.75 hr->set_containing_set(NULL);
1.76 proxy_set->update_for_addition(hr);
1.77 @@ -111,10 +111,10 @@
1.78 //////////////////// HeapRegionLinkedList ////////////////////
1.79
1.80 inline void HeapRegionLinkedList::add_as_tail(HeapRegion* hr) {
1.81 - hrl_assert_mt_safety_ok(this);
1.82 + hrs_assert_mt_safety_ok(this);
1.83 assert((length() == 0 && _head == NULL && _tail == NULL) ||
1.84 (length() > 0 && _head != NULL && _tail != NULL),
1.85 - hrl_ext_msg(this, "invariant"));
1.86 + hrs_ext_msg(this, "invariant"));
1.87 // add_internal() will verify the region.
1.88 add_internal(hr);
1.89
1.90 @@ -128,10 +128,10 @@
1.91 }
1.92
1.93 inline HeapRegion* HeapRegionLinkedList::remove_head() {
1.94 - hrl_assert_mt_safety_ok(this);
1.95 - assert(!is_empty(), hrl_ext_msg(this, "the list should not be empty"));
1.96 + hrs_assert_mt_safety_ok(this);
1.97 + assert(!is_empty(), hrs_ext_msg(this, "the list should not be empty"));
1.98 assert(length() > 0 && _head != NULL && _tail != NULL,
1.99 - hrl_ext_msg(this, "invariant"));
1.100 + hrs_ext_msg(this, "invariant"));
1.101
1.102 // We need to unlink it first.
1.103 HeapRegion* hr = _head;
1.104 @@ -147,7 +147,7 @@
1.105 }
1.106
1.107 inline HeapRegion* HeapRegionLinkedList::remove_head_or_null() {
1.108 - hrl_assert_mt_safety_ok(this);
1.109 + hrs_assert_mt_safety_ok(this);
1.110
1.111 if (!is_empty()) {
1.112 return remove_head();
