stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8242459: ForceNUMA and only one available NUMA node hits a guarantee

Browse Source 
Fix some asserts to handle the single-NUMA node + ForceNUMA case.

Reviewed-by: sjohanss, tschatzl
This commit is contained in:
Kim Barrett 2020-04-28 03:02:21 -04:00
parent 1041efe027
commit 538e005813
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hotspot/share/gc/g1/g1NUMAStats.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -31,7 +31,8 @@ double G1NUMAStats::Stat::rate() const {
}
G1NUMAStats::NodeDataArray::NodeDataArray(uint num_nodes) {
guarantee(num_nodes > 1, "Number of nodes (%u) should be set", num_nodes);
// Not using > 1, for -XX:+ForceNUMA support.
guarantee(num_nodes > 0, "Number of nodes (%u) should be set", num_nodes);
// The row represents the number of nodes.
_num_column = num_nodes;
@ -124,7 +125,8 @@ void G1NUMAStats::NodeDataArray::copy(uint req_index, size_t* stat) {
G1NUMAStats::G1NUMAStats(const int* node_ids, uint num_node_ids) :
_node_ids(node_ids), _num_node_ids(num_node_ids), _node_data() {
assert(_num_node_ids > 1, "Should have more than one active memory nodes %u", _num_node_ids);
// Not using > 1, for -XX:+ForceNUMA support.
assert(_num_node_ids > 0, "Should have at least one node id: %u", _num_node_ids);
for (int i = 0; i < NodeDataItemsSentinel; i++) {
_node_data[i] = new NodeDataArray(_num_node_ids);