Mercurial > hg > graal-jvmci-8

comparison src/share/vm/gc_implementation/g1/heapRegionSet.inline.hpp @ 6254:a2f7274eb6ef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7114678: G1: various small fixes, code cleanup, and refactoring Summary: Various cleanups as a prelude to introducing iterators for HeapRegions. Reviewed-by: johnc, brutisso
author tonyp
date Thu, 19 Jul 2012 15:15:54 -0700
parents 720b6a76dd9d
children 992f62c457b0 58fc1b1523dc
comparison
equal deleted inserted replaced
6253:db823a892a55 6254:a2f7274eb6ef
31 31
32 inline void HeapRegionSetBase::update_for_addition(HeapRegion* hr) { 32 inline void HeapRegionSetBase::update_for_addition(HeapRegion* hr) {
33 // Assumes the caller has already verified the region. 33 // Assumes the caller has already verified the region.
34 34
35 _length += 1; 35 _length += 1;
36 if (!hr->isHumongous()) { 36 _region_num += hr->region_num();
37 _region_num += 1;
38 } else {
39 _region_num += calculate_region_num(hr);
40 }
41 _total_used_bytes += hr->used(); 37 _total_used_bytes += hr->used();
42 } 38 }
43 39
44 inline void HeapRegionSetBase::add_internal(HeapRegion* hr) { 40 inline void HeapRegionSetBase::add_internal(HeapRegion* hr) {
45 hrs_assert_region_ok(this, hr, NULL); 41 hrs_assert_region_ok(this, hr, NULL);
52 inline void HeapRegionSetBase::update_for_removal(HeapRegion* hr) { 48 inline void HeapRegionSetBase::update_for_removal(HeapRegion* hr) {
53 // Assumes the caller has already verified the region. 49 // Assumes the caller has already verified the region.
54 assert(_length > 0, hrs_ext_msg(this, "pre-condition")); 50 assert(_length > 0, hrs_ext_msg(this, "pre-condition"));
55 _length -= 1; 51 _length -= 1;
56 52
57 uint region_num_diff; 53 uint region_num_diff = hr->region_num();
58 if (!hr->isHumongous()) {
59 region_num_diff = 1;
60 } else {
61 region_num_diff = calculate_region_num(hr);
62 }
63 assert(region_num_diff <= _region_num, 54 assert(region_num_diff <= _region_num,
64 hrs_err_msg("[%s] region's region num: %u " 55 hrs_err_msg("[%s] region's region num: %u "
65 "should be <= region num: %u", 56 "should be <= region num: %u",
66 name(), region_num_diff, _region_num)); 57 name(), region_num_diff, _region_num));
67 _region_num -= region_num_diff; 58 _region_num -= region_num_diff;