< prev index next >

src/hotspot/share/gc/g1/g1CollectedHeap.cpp

Print this page
rev 60594 : [mq]: 8252086-remove-g1rs

*** 1616,1631 **** } // Create the hot card cache. _hot_card_cache = new G1HotCardCache(this); ! // Carve out the G1 part of the heap. ! ReservedSpace g1_rs = heap_rs.first_part(reserved_byte_size); size_t page_size = actual_reserved_page_size(heap_rs); G1RegionToSpaceMapper* heap_storage = ! G1RegionToSpaceMapper::create_heap_mapper(g1_rs, ! g1_rs.size(), page_size, HeapRegion::GrainBytes, 1, mtJavaHeap); if(heap_storage == NULL) { --- 1616,1630 ---- } // Create the hot card cache. _hot_card_cache = new G1HotCardCache(this); ! // Create space mappers. size_t page_size = actual_reserved_page_size(heap_rs); G1RegionToSpaceMapper* heap_storage = ! G1RegionToSpaceMapper::create_heap_mapper(heap_rs, ! heap_rs.size(), page_size, HeapRegion::GrainBytes, 1, mtJavaHeap); if(heap_storage == NULL) {
*** 1642,1665 **** heap_storage->set_mapping_changed_listener(&_listener); // Create storage for the BOT, card table, card counts table (hot card cache) and the bitmaps. G1RegionToSpaceMapper* bot_storage = create_aux_memory_mapper("Block Offset Table", ! G1BlockOffsetTable::compute_size(g1_rs.size() / HeapWordSize), G1BlockOffsetTable::heap_map_factor()); G1RegionToSpaceMapper* cardtable_storage = create_aux_memory_mapper("Card Table", ! G1CardTable::compute_size(g1_rs.size() / HeapWordSize), G1CardTable::heap_map_factor()); G1RegionToSpaceMapper* card_counts_storage = create_aux_memory_mapper("Card Counts Table", ! G1CardCounts::compute_size(g1_rs.size() / HeapWordSize), G1CardCounts::heap_map_factor()); ! size_t bitmap_size = G1CMBitMap::compute_size(g1_rs.size()); G1RegionToSpaceMapper* prev_bitmap_storage = create_aux_memory_mapper("Prev Bitmap", bitmap_size, G1CMBitMap::heap_map_factor()); G1RegionToSpaceMapper* next_bitmap_storage = create_aux_memory_mapper("Next Bitmap", bitmap_size, G1CMBitMap::heap_map_factor()); --- 1641,1664 ---- heap_storage->set_mapping_changed_listener(&_listener); // Create storage for the BOT, card table, card counts table (hot card cache) and the bitmaps. G1RegionToSpaceMapper* bot_storage = create_aux_memory_mapper("Block Offset Table", ! G1BlockOffsetTable::compute_size(heap_rs.size() / HeapWordSize), G1BlockOffsetTable::heap_map_factor()); G1RegionToSpaceMapper* cardtable_storage = create_aux_memory_mapper("Card Table", ! G1CardTable::compute_size(heap_rs.size() / HeapWordSize), G1CardTable::heap_map_factor()); G1RegionToSpaceMapper* card_counts_storage = create_aux_memory_mapper("Card Counts Table", ! G1CardCounts::compute_size(heap_rs.size() / HeapWordSize), G1CardCounts::heap_map_factor()); ! size_t bitmap_size = G1CMBitMap::compute_size(heap_rs.size()); G1RegionToSpaceMapper* prev_bitmap_storage = create_aux_memory_mapper("Prev Bitmap", bitmap_size, G1CMBitMap::heap_map_factor()); G1RegionToSpaceMapper* next_bitmap_storage = create_aux_memory_mapper("Next Bitmap", bitmap_size, G1CMBitMap::heap_map_factor());
*** 1676,1686 **** const uint max_region_idx = (1U << (sizeof(RegionIdx_t)*BitsPerByte-1)) - 1; guarantee((max_regions() - 1) <= max_region_idx, "too many regions"); // The G1FromCardCache reserves card with value 0 as "invalid", so the heap must not // start within the first card. ! guarantee(g1_rs.base() >= (char*)G1CardTable::card_size, "Java heap must not start within the first card."); // Also create a G1 rem set. _rem_set = new G1RemSet(this, _card_table, _hot_card_cache); _rem_set->initialize(max_regions()); size_t max_cards_per_region = ((size_t)1 << (sizeof(CardIdx_t)*BitsPerByte-1)) - 1; --- 1675,1685 ---- const uint max_region_idx = (1U << (sizeof(RegionIdx_t)*BitsPerByte-1)) - 1; guarantee((max_regions() - 1) <= max_region_idx, "too many regions"); // The G1FromCardCache reserves card with value 0 as "invalid", so the heap must not // start within the first card. ! guarantee(heap_rs.base() >= (char*)G1CardTable::card_size, "Java heap must not start within the first card."); // Also create a G1 rem set. _rem_set = new G1RemSet(this, _card_table, _hot_card_cache); _rem_set->initialize(max_regions()); size_t max_cards_per_region = ((size_t)1 << (sizeof(CardIdx_t)*BitsPerByte-1)) - 1;
< prev index next >