45
45
G1CardSet::CardSetPtr G1CardSet::FullCardSet = (G1CardSet::CardSetPtr)-1 ;
46
46
47
47
static uint default_log2_card_region_per_region () {
48
- uint log2_card_region_per_heap_region = 0 ;
48
+ uint log2_card_regions_per_heap_region = 0 ;
49
49
50
50
const uint card_container_limit = G1CardSetContainer::LogCardsPerRegionLimit;
51
51
if (card_container_limit < (uint)HeapRegion::LogCardsPerRegion) {
52
- log2_card_region_per_heap_region = (uint)HeapRegion::LogCardsPerRegion - card_container_limit;
52
+ log2_card_regions_per_heap_region = (uint)HeapRegion::LogCardsPerRegion - card_container_limit;
53
53
}
54
54
55
- return log2_card_region_per_heap_region ;
55
+ return log2_card_regions_per_heap_region ;
56
56
}
57
57
58
58
G1CardSetConfiguration::G1CardSetConfiguration () :
@@ -64,7 +64,7 @@ G1CardSetConfiguration::G1CardSetConfiguration() :
64
64
(uint)HeapRegion::CardsPerRegion, /* max_cards_in_cardset */
65
65
default_log2_card_region_per_region()) /* log2_card_region_per_region */
66
66
{
67
- assert ((_log2_card_region_per_heap_region + _log2_cards_per_card_region) == (uint)HeapRegion::LogCardsPerRegion,
67
+ assert ((_log2_card_regions_per_heap_region + _log2_cards_per_card_region) == (uint)HeapRegion::LogCardsPerRegion,
68
68
" inconsistent heap region virtualization setup" );
69
69
}
70
70
@@ -91,7 +91,7 @@ G1CardSetConfiguration::G1CardSetConfiguration(uint inline_ptr_bits_per_card,
91
91
uint num_buckets_in_howl,
92
92
double cards_in_howl_threshold_percent,
93
93
uint max_cards_in_card_set,
94
- uint log2_card_region_per_heap_region ) :
94
+ uint log2_card_regions_per_heap_region ) :
95
95
_inline_ptr_bits_per_card(inline_ptr_bits_per_card),
96
96
_num_cards_in_array(num_cards_in_array),
97
97
_num_buckets_in_howl(num_buckets_in_howl),
@@ -101,8 +101,8 @@ G1CardSetConfiguration::G1CardSetConfiguration(uint inline_ptr_bits_per_card,
101
101
_cards_in_howl_bitmap_threshold(_num_cards_in_howl_bitmap * cards_in_bitmap_threshold_percent),
102
102
_log2_num_cards_in_howl_bitmap(log2i_exact(_num_cards_in_howl_bitmap)),
103
103
_bitmap_hash_mask(~(~(0 ) << _log2_num_cards_in_howl_bitmap)),
104
- _log2_card_region_per_heap_region(log2_card_region_per_heap_region ),
105
- _log2_cards_per_card_region(log2i_exact(_max_cards_in_card_set) - _log2_card_region_per_heap_region ) {
104
+ _log2_card_regions_per_heap_region(log2_card_regions_per_heap_region ),
105
+ _log2_cards_per_card_region(log2i_exact(_max_cards_in_card_set) - _log2_card_regions_per_heap_region ) {
106
106
107
107
assert (is_power_of_2 (_max_cards_in_card_set),
108
108
" max_cards_in_card_set must be a power of 2: %u" , _max_cards_in_card_set);
@@ -134,7 +134,7 @@ void G1CardSetConfiguration::log_configuration() {
134
134
num_cards_in_array (), G1CardSetArray::size_in_bytes (num_cards_in_array ()),
135
135
num_buckets_in_howl (), cards_in_howl_threshold (),
136
136
num_cards_in_howl_bitmap (), G1CardSetBitMap::size_in_bytes (num_cards_in_howl_bitmap ()), cards_in_howl_bitmap_threshold (),
137
- (uint)1 << log2_card_region_per_heap_region (),
137
+ (uint)1 << log2_card_regions_per_heap_region (),
138
138
(uint)1 << log2_cards_per_card_region ());
139
139
}
140
140
0 commit comments