src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp

Print this page
rev 2722 : 7095194: G1: HeapRegion::GrainBytes, GrainWords, and CardsPerRegion should be size_t
Summary: Declare GrainBytes, GrainWords, and CardsPerRegion as size_t.
Reviewed-by:

*** 550,561 **** } return NULL; } HeapRegion* G1CollectedHeap::new_region(size_t word_size, bool do_expand) { ! assert(!isHumongous(word_size) || ! word_size <= (size_t) HeapRegion::GrainWords, "the only time we use this to allocate a humongous region is " "when we are allocating a single humongous region"); HeapRegion* res; if (G1StressConcRegionFreeing) { --- 550,560 ---- } return NULL; } HeapRegion* G1CollectedHeap::new_region(size_t word_size, bool do_expand) { ! assert(!isHumongous(word_size) || word_size <= HeapRegion::GrainWords, "the only time we use this to allocate a humongous region is " "when we are allocating a single humongous region"); HeapRegion* res; if (G1StressConcRegionFreeing) {
*** 1168,1178 **** // We only generate output for non-empty regions. if (!hr->is_empty()) { if (!hr->isHumongous()) { _hr_printer->post_compaction(hr, G1HRPrinter::Old); } else if (hr->startsHumongous()) { ! if (hr->capacity() == (size_t) HeapRegion::GrainBytes) { // single humongous region _hr_printer->post_compaction(hr, G1HRPrinter::SingleHumongous); } else { _hr_printer->post_compaction(hr, G1HRPrinter::StartsHumongous); } --- 1167,1177 ---- // We only generate output for non-empty regions. if (!hr->is_empty()) { if (!hr->isHumongous()) { _hr_printer->post_compaction(hr, G1HRPrinter::Old); } else if (hr->startsHumongous()) { ! if (hr->capacity() == HeapRegion::GrainBytes) { // single humongous region _hr_printer->post_compaction(hr, G1HRPrinter::SingleHumongous); } else { _hr_printer->post_compaction(hr, G1HRPrinter::StartsHumongous); }
*** 1969,1979 **** const size_t max_region_idx = ((size_t)1 << (sizeof(RegionIdx_t)*BitsPerByte-1)) - 1; guarantee((max_regions() - 1) <= max_region_idx, "too many regions"); size_t max_cards_per_region = ((size_t)1 << (sizeof(CardIdx_t)*BitsPerByte-1)) - 1; guarantee(HeapRegion::CardsPerRegion > 0, "make sure it's initialized"); ! guarantee((size_t) HeapRegion::CardsPerRegion < max_cards_per_region, "too many cards per region"); HeapRegionSet::set_unrealistically_long_length(max_regions() + 1); _bot_shared = new G1BlockOffsetSharedArray(_reserved, --- 1968,1978 ---- const size_t max_region_idx = ((size_t)1 << (sizeof(RegionIdx_t)*BitsPerByte-1)) - 1; guarantee((max_regions() - 1) <= max_region_idx, "too many regions"); size_t max_cards_per_region = ((size_t)1 << (sizeof(CardIdx_t)*BitsPerByte-1)) - 1; guarantee(HeapRegion::CardsPerRegion > 0, "make sure it's initialized"); ! guarantee(HeapRegion::CardsPerRegion < max_cards_per_region, "too many cards per region"); HeapRegionSet::set_unrealistically_long_length(max_regions() + 1); _bot_shared = new G1BlockOffsetSharedArray(_reserved,
*** 3049,3060 **** st->print(" [" INTPTR_FORMAT ", " INTPTR_FORMAT ", " INTPTR_FORMAT ")", _g1_storage.low_boundary(), _g1_storage.high(), _g1_storage.high_boundary()); st->cr(); ! st->print(" region size " SIZE_FORMAT "K, ", ! HeapRegion::GrainBytes/K); size_t young_regions = _young_list->length(); st->print(SIZE_FORMAT " young (" SIZE_FORMAT "K), ", young_regions, young_regions * HeapRegion::GrainBytes / K); size_t survivor_regions = g1_policy()->recorded_survivor_regions(); st->print(SIZE_FORMAT " survivors (" SIZE_FORMAT "K)", --- 3048,3058 ---- st->print(" [" INTPTR_FORMAT ", " INTPTR_FORMAT ", " INTPTR_FORMAT ")", _g1_storage.low_boundary(), _g1_storage.high(), _g1_storage.high_boundary()); st->cr(); ! st->print(" region size " SIZE_FORMAT "K, ", HeapRegion::GrainBytes / K); size_t young_regions = _young_list->length(); st->print(SIZE_FORMAT " young (" SIZE_FORMAT "K), ", young_regions, young_regions * HeapRegion::GrainBytes / K); size_t survivor_regions = g1_policy()->recorded_survivor_regions(); st->print(SIZE_FORMAT " survivors (" SIZE_FORMAT "K)",