Skip to content
Permalink
Browse files
8265239: Shenandoah: Shenandoah heap region count could be off by 1
Backport-of: ff5bb8cf693c58a14063a351f535e3a55e51e8db
  • Loading branch information
zhengyu123 committed May 12, 2021
1 parent 1116b75 commit 319621c31ccb639f3fcaaa63585c0feb4c0e3bb2
Showing 2 changed files with 2 additions and 1 deletion.
@@ -151,6 +151,7 @@ jint ShenandoahHeap::initialize() {
Universe::check_alignment(init_byte_size, reg_size_bytes, "Shenandoah heap");

_num_regions = ShenandoahHeapRegion::region_count();
assert(_num_regions == (max_byte_size / reg_size_bytes), "Must match");

// Now we know the number of regions, initialize the heuristics.
initialize_heuristics();
@@ -573,7 +573,7 @@ void ShenandoahHeapRegion::setup_sizes(size_t max_heap_size) {
RegionSizeBytesMask = RegionSizeBytes - 1;

guarantee(RegionCount == 0, "we should only set it once");
RegionCount = max_heap_size / RegionSizeBytes;
RegionCount = align_up(max_heap_size, RegionSizeBytes) / RegionSizeBytes;
guarantee(RegionCount >= MIN_NUM_REGIONS, "Should have at least minimum regions");

guarantee(HumongousThresholdWords == 0, "we should only set it once");

1 comment on commit 319621c

@openjdk-notifier
Copy link

@openjdk-notifier openjdk-notifier bot commented on 319621c May 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.