src/os/linux/vm/os_linux.hpp

*** 1,7 ****
  /*
!  * Copyright (c) 1999, 2016, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 1999, 2017, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 171,180 ****
--- 171,182 ----
    static const char *libpthread_version()     { return _libpthread_version; }
  
    static void libpthread_init();
    static bool libnuma_init();
    static void* libnuma_dlsym(void* handle, const char* name);
+   // libnuma v2 (libnuma_1.2) symbols
+   static void* libnuma_v2_dlsym(void* handle, const char* name);
  
    // Return default guard size for the specified thread type
    static size_t default_guard_size(os::ThreadType thr_type);
  
    static void capture_initial_stack(size_t max_size);
*** 224,233 ****
--- 226,237 ----
    typedef int (*numa_max_node_func_t)(void);
    typedef int (*numa_num_configured_nodes_func_t)(void);
    typedef int (*numa_available_func_t)(void);
    typedef int (*numa_tonode_memory_func_t)(void *start, size_t size, int node);
    typedef void (*numa_interleave_memory_func_t)(void *start, size_t size, unsigned long *nodemask);
+   typedef void (*numa_interleave_memory_v2_func_t)(void *start, size_t size, struct bitmask* mask);
+ 
    typedef void (*numa_set_bind_policy_func_t)(int policy);
    typedef int (*numa_bitmask_isbitset_func_t)(struct bitmask *bmp, unsigned int n);
    typedef int (*numa_distance_func_t)(int node1, int node2);
  
    static sched_getcpu_func_t _sched_getcpu;
*** 235,244 ****
--- 239,249 ----
    static numa_max_node_func_t _numa_max_node;
    static numa_num_configured_nodes_func_t _numa_num_configured_nodes;
    static numa_available_func_t _numa_available;
    static numa_tonode_memory_func_t _numa_tonode_memory;
    static numa_interleave_memory_func_t _numa_interleave_memory;
+   static numa_interleave_memory_v2_func_t _numa_interleave_memory_v2;
    static numa_set_bind_policy_func_t _numa_set_bind_policy;
    static numa_bitmask_isbitset_func_t _numa_bitmask_isbitset;
    static numa_distance_func_t _numa_distance;
    static unsigned long* _numa_all_nodes;
    static struct bitmask* _numa_all_nodes_ptr;
*** 249,258 ****
--- 254,264 ----
    static void set_numa_max_node(numa_max_node_func_t func) { _numa_max_node = func; }
    static void set_numa_num_configured_nodes(numa_num_configured_nodes_func_t func) { _numa_num_configured_nodes = func; }
    static void set_numa_available(numa_available_func_t func) { _numa_available = func; }
    static void set_numa_tonode_memory(numa_tonode_memory_func_t func) { _numa_tonode_memory = func; }
    static void set_numa_interleave_memory(numa_interleave_memory_func_t func) { _numa_interleave_memory = func; }
+   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; }
*** 270,280 ****
    static int numa_available() { return _numa_available != NULL ? _numa_available() : -1; }
    static int numa_tonode_memory(void *start, size_t size, int node) {
      return _numa_tonode_memory != NULL ? _numa_tonode_memory(start, size, node) : -1;
    }
    static void numa_interleave_memory(void *start, size_t size) {
!     if (_numa_interleave_memory != NULL && _numa_all_nodes != NULL) {
        _numa_interleave_memory(start, size, _numa_all_nodes);
      }
    }
    static void numa_set_bind_policy(int policy) {
      if (_numa_set_bind_policy != NULL) {
--- 276,289 ----
    static int numa_available() { return _numa_available != NULL ? _numa_available() : -1; }
    static int numa_tonode_memory(void *start, size_t size, int node) {
      return _numa_tonode_memory != NULL ? _numa_tonode_memory(start, size, node) : -1;
    }
    static void numa_interleave_memory(void *start, size_t size) {
!     // Use v2 api if available
!     if (_numa_interleave_memory_v2 != NULL && _numa_all_nodes_ptr != NULL) {
!       _numa_interleave_memory_v2(start, size, _numa_all_nodes_ptr);
!     } else if (_numa_interleave_memory != NULL && _numa_all_nodes != NULL) {
        _numa_interleave_memory(start, size, _numa_all_nodes);      
      }
    }
    static void numa_set_bind_policy(int policy) {
      if (_numa_set_bind_policy != NULL) {