src/hotspot/os/linux/os_linux.cpp

rev 50967 : 8206977: Minor improvements of runtime code.

*** 2106,2116 ****
--- 2106,2118 ----
      }
    }
    // special case for debian
    if (file_exists("/etc/debian_version")) {
      strncpy(buf, "Debian ", buflen);
+     if (buflen > 7) {
        parse_os_info(&buf[7], buflen-7, "/etc/debian_version");
+     }
    } else {
      strncpy(buf, "Linux", buflen);
    }
  }
  
*** 2818,2829 ****
    }
    return 0;
  }
  
  int os::Linux::get_existing_num_nodes() {
!   size_t node;
!   size_t highest_node_number = Linux::numa_max_node();
    int num_nodes = 0;
  
    // Get the total number of nodes in the system including nodes without memory.
    for (node = 0; node <= highest_node_number; node++) {
      if (isnode_in_existing_nodes(node)) {
--- 2820,2831 ----
    }
    return 0;
  }
  
  int os::Linux::get_existing_num_nodes() {
!   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.
    for (node = 0; node <= highest_node_number; node++) {
      if (isnode_in_existing_nodes(node)) {
*** 2832,2849 ****
    }
    return num_nodes;
  }
  
  size_t os::numa_get_leaf_groups(int *ids, size_t size) {
!   size_t 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
    // 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)) {
        ids[i++] = node;
      }
    }
    return i;
  }
--- 2834,2851 ----
    }
    return num_nodes;
  }
  
  size_t os::numa_get_leaf_groups(int *ids, size_t size) {
!   int highest_node_number = Linux::numa_max_node();
    size_t i = 0;
  
!   // 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 (int node = 0; node <= highest_node_number; node++) {
!     if (Linux::isnode_in_configured_nodes((unsigned int)node)) {
        ids[i++] = node;
      }
    }
    return i;
  }