< prev index next >

src/hotspot/os/linux/os_linux.hpp

Print this page
rev 49214 : 8198794: Hotspot crash on Cassandra 3.11.1 startup with libnuma 2.0.3

*** 256,267 **** static void set_numa_interleave_memory_v2(numa_interleave_memory_v2_func_t func) { _numa_interleave_memory_v2 = func; } static void set_numa_set_bind_policy(numa_set_bind_policy_func_t func) { _numa_set_bind_policy = func; } static void set_numa_bitmask_isbitset(numa_bitmask_isbitset_func_t func) { _numa_bitmask_isbitset = func; } static void set_numa_distance(numa_distance_func_t func) { _numa_distance = func; } static void set_numa_all_nodes(unsigned long* ptr) { _numa_all_nodes = ptr; } ! static void set_numa_all_nodes_ptr(struct bitmask **ptr) { _numa_all_nodes_ptr = *ptr; } ! static void set_numa_nodes_ptr(struct bitmask **ptr) { _numa_nodes_ptr = *ptr; } static int sched_getcpu_syscall(void); public: static int sched_getcpu() { return _sched_getcpu != NULL ? _sched_getcpu() : -1; } static int numa_node_to_cpus(int node, unsigned long *buffer, int bufferlen) { return _numa_node_to_cpus != NULL ? _numa_node_to_cpus(node, buffer, bufferlen) : -1; --- 256,267 ---- static void set_numa_interleave_memory_v2(numa_interleave_memory_v2_func_t func) { _numa_interleave_memory_v2 = func; } static void set_numa_set_bind_policy(numa_set_bind_policy_func_t func) { _numa_set_bind_policy = func; } static void set_numa_bitmask_isbitset(numa_bitmask_isbitset_func_t func) { _numa_bitmask_isbitset = func; } static void set_numa_distance(numa_distance_func_t func) { _numa_distance = func; } static void set_numa_all_nodes(unsigned long* ptr) { _numa_all_nodes = ptr; } ! static void set_numa_all_nodes_ptr(struct bitmask **ptr) { _numa_all_nodes_ptr = (ptr == NULL ? NULL : *ptr); } ! static void set_numa_nodes_ptr(struct bitmask **ptr) { _numa_nodes_ptr = (ptr == NULL ? NULL : *ptr); } static int sched_getcpu_syscall(void); public: static int sched_getcpu() { return _sched_getcpu != NULL ? _sched_getcpu() : -1; } static int numa_node_to_cpus(int node, unsigned long *buffer, int bufferlen) { return _numa_node_to_cpus != NULL ? _numa_node_to_cpus(node, buffer, bufferlen) : -1;
*** 301,310 **** --- 301,322 ---- } // Check if numa node exists in the system (including zero memory nodes). static bool isnode_in_existing_nodes(unsigned int n) { if (_numa_bitmask_isbitset != NULL && _numa_nodes_ptr != NULL) { return _numa_bitmask_isbitset(_numa_nodes_ptr, n); + } else if (_numa_bitmask_isbitset != NULL && _numa_all_nodes_ptr != NULL) { + // Not all libnuma API v2 implement numa_nodes_ptr, so it's not possible + // to trust the API version for checking its absence. On the other hand, + // numa_nodes_ptr found in libnuma 2.0.9 and above is the only way to get + // a complete view of all numa nodes in the system, hence numa_nodes_ptr + // is used to handle CPU and nodes on architectures (like PowerPC) where + // there can exist nodes with CPUs but no memory or vice-versa and the + // nodes may be non-contiguous. For most of the architectures, like + // x86_64, numa_node_ptr presents the same node set as found in + // numa_all_nodes_ptr so it's possible to use numa_all_nodes_ptr as a + // substitute. + return _numa_bitmask_isbitset(_numa_all_nodes_ptr, n); } else return 0; } };
< prev index next >