src/hotspot/share/prims/whitebox.cpp

rev 56448 : imported patch 8220310.mut.0
rev 56449 : imported patch 8220310.mut.1
rev 56452 : [mq]: 8220310.mut.4

*** 617,626 ****
--- 617,649 ----
      return JNIHandles::make_local(env, h());
    }
    THROW_MSG_0(vmSymbols::java_lang_UnsupportedOperationException(), "WB_G1AuxiliaryMemoryUsage: G1 GC is not enabled");
  WB_END
  
+ WB_ENTRY(jint, WB_G1ActiveMemoryNodeCount(JNIEnv* env, jobject o))
+   if (UseG1GC) {
+     G1NUMA* numa = G1NUMA::numa();
+     return (jint)numa->num_active_nodes();
+   }
+   THROW_MSG_0(vmSymbols::java_lang_UnsupportedOperationException(), "WB_G1ActiveMemoryNodeCount: G1 GC is not enabled");
+ WB_END
+ 
+ WB_ENTRY(jintArray, WB_G1MemoryNodeIds(JNIEnv* env, jobject o))
+   if (UseG1GC) {
+     G1NUMA* numa = G1NUMA::numa();
+     int num_node_ids = (int)numa->num_active_nodes();
+     const int* node_ids = numa->node_ids();
+ 
+     typeArrayOop result = oopFactory::new_intArray(num_node_ids, CHECK_NULL);
+     for (int i = 0; i < num_node_ids; i++) {
+       result->int_at_put(i, (jint)node_ids[i]);
+     }
+     return (jintArray) JNIHandles::make_local(env, result);
+   }
+   THROW_MSG_NULL(vmSymbols::java_lang_UnsupportedOperationException(), "WB_G1MemoryNodeIds: G1 GC is not enabled");
+ WB_END
+ 
  class OldRegionsLivenessClosure: public HeapRegionClosure {
  
   private:
    const int _liveness;
    size_t _total_count;
*** 2197,2206 ****
--- 2220,2231 ----
    {CC"g1NumFreeRegions",   CC"()J",                   (void*)&WB_G1NumFreeRegions  },
    {CC"g1RegionSize",       CC"()I",                   (void*)&WB_G1RegionSize      },
    {CC"g1StartConcMarkCycle",       CC"()Z",           (void*)&WB_G1StartMarkCycle  },
    {CC"g1AuxiliaryMemoryUsage", CC"()Ljava/lang/management/MemoryUsage;",
                                                        (void*)&WB_G1AuxiliaryMemoryUsage  },
+   {CC"g1ActiveMemoryNodeCount", CC"()I",              (void*)&WB_G1ActiveMemoryNodeCount },
+   {CC"g1MemoryNodeIds",    CC"()[I",                  (void*)&WB_G1MemoryNodeIds },
    {CC"g1GetMixedGCInfo",   CC"(I)[J",                 (void*)&WB_G1GetMixedGCInfo },
  #endif // INCLUDE_G1GC
  #if INCLUDE_G1GC || INCLUDE_PARALLELGC
    {CC"dramReservedStart",   CC"()J",                  (void*)&WB_DramReservedStart },
    {CC"dramReservedEnd",     CC"()J",                  (void*)&WB_DramReservedEnd },