8206977: Minor improvements of runtime code

Reviewed-by: coleenp, lfoltan
This commit is contained in:
Goetz Lindenmaier 2018-07-11 16:11:10 +02:00
parent 89f13ef117
commit 8a9b0134a8
18 changed files with 68 additions and 55 deletions

View file

@ -2108,7 +2108,9 @@ void os::get_summary_os_info(char* buf, size_t buflen) {
// special case for debian
if (file_exists("/etc/debian_version")) {
strncpy(buf, "Debian ", buflen);
parse_os_info(&buf[7], buflen-7, "/etc/debian_version");
if (buflen > 7) {
parse_os_info(&buf[7], buflen-7, "/etc/debian_version");
}
} else {
strncpy(buf, "Linux", buflen);
}
@ -2820,8 +2822,8 @@ int os::numa_get_group_id() {
}
int os::Linux::get_existing_num_nodes() {
size_t node;
size_t highest_node_number = Linux::numa_max_node();
int node;
int highest_node_number = Linux::numa_max_node();
int num_nodes = 0;
// Get the total number of nodes in the system including nodes without memory.
@ -2834,14 +2836,14 @@ int os::Linux::get_existing_num_nodes() {
}
size_t os::numa_get_leaf_groups(int *ids, size_t size) {
size_t highest_node_number = Linux::numa_max_node();
int highest_node_number = Linux::numa_max_node();
size_t i = 0;
// Map all node ids in which is possible to allocate memory. Also nodes are
// Map all node ids in which it is possible to allocate memory. Also nodes are
// not always consecutively available, i.e. available from 0 to the highest
// node number.
for (size_t node = 0; node <= highest_node_number; node++) {
if (Linux::isnode_in_configured_nodes(node)) {
for (int node = 0; node <= highest_node_number; node++) {
if (Linux::isnode_in_configured_nodes((unsigned int)node)) {
ids[i++] = node;
}
}