hotspot/src/share/vm/prims/whitebox.cpp

rev 6886 : 8058251: assert(_count > 0) failed: Negative counter when running runtime/NMT/MallocTrackingVerify.java
Summary: Fixed an issue when overflowing the MallocSite hash table bucket
Reviewed-by: coleenp, gtriantafill

*** 307,317 ****
  // Alloc memory with pseudo call stack. The test can create psudo malloc
  // allocation site to stress the malloc tracking.
  WB_ENTRY(jlong, WB_NMTMallocWithPseudoStack(JNIEnv* env, jobject o, jlong size, jint pseudo_stack))
    address pc = (address)(size_t)pseudo_stack;
    NativeCallStack stack(&pc, 1);
!   return (jlong)os::malloc(size, mtTest, stack);
  WB_END
  
  // Free the memory allocated by NMTAllocTest
  WB_ENTRY(void, WB_NMTFree(JNIEnv* env, jobject o, jlong mem))
    os::free((void*)(uintptr_t)mem, mtTest);
--- 307,317 ----
  // Alloc memory with pseudo call stack. The test can create psudo malloc
  // allocation site to stress the malloc tracking.
  WB_ENTRY(jlong, WB_NMTMallocWithPseudoStack(JNIEnv* env, jobject o, jlong size, jint pseudo_stack))
    address pc = (address)(size_t)pseudo_stack;
    NativeCallStack stack(&pc, 1);
!   return (jlong)(uintptr_t)os::malloc(size, mtTest, stack);
  WB_END
  
  // Free the memory allocated by NMTAllocTest
  WB_ENTRY(void, WB_NMTFree(JNIEnv* env, jobject o, jlong mem))
    os::free((void*)(uintptr_t)mem, mtTest);
*** 342,360 ****
  
  WB_ENTRY(jboolean, WB_NMTIsDetailSupported(JNIEnv* env))
    return MemTracker::tracking_level() == NMT_detail;
  WB_END
  
- WB_ENTRY(void, WB_NMTOverflowHashBucket(JNIEnv* env, jobject o, jlong num))
-   address pc = (address)1;
-   for (jlong index = 0; index < num; index ++) {
-     NativeCallStack stack(&pc, 1);
-     os::malloc(0, mtTest, stack);
-     pc += MallocSiteTable::hash_buckets();
-   }
- WB_END
- 
  WB_ENTRY(jboolean, WB_NMTChangeTrackingLevel(JNIEnv* env))
    // Test that we can downgrade NMT levels but not upgrade them.
    if (MemTracker::tracking_level() == NMT_off) {
      MemTracker::transition_to(NMT_off);
      return MemTracker::tracking_level() == NMT_off;
--- 342,351 ----
*** 381,390 ****
--- 372,387 ----
      MemTracker::transition_to(NMT_detail);
      assert(MemTracker::tracking_level() == NMT_minimal, "Should still be minimal now");
      return MemTracker::tracking_level() == NMT_minimal;
    }
  WB_END
+ 
+ WB_ENTRY(jint, WB_NMTGetHashSize(JNIEnv* env, jobject o))
+   int hash_size = MallocSiteTable::hash_buckets();
+   assert(hash_size > 0, "NMT hash_size should be > 0");
+   return (jint)hash_size;
+ WB_END
  #endif // INCLUDE_NMT
  
  static jmethodID reflected_method_to_jmid(JavaThread* thread, JNIEnv* env, jobject method) {
    assert(method != NULL, "method should not be null");
    ThreadToNativeFromVM ttn(thread);
*** 979,991 ****
    {CC"NMTFree",             CC"(J)V",                 (void*)&WB_NMTFree            },
    {CC"NMTReserveMemory",    CC"(J)J",                 (void*)&WB_NMTReserveMemory   },
    {CC"NMTCommitMemory",     CC"(JJ)V",                (void*)&WB_NMTCommitMemory    },
    {CC"NMTUncommitMemory",   CC"(JJ)V",                (void*)&WB_NMTUncommitMemory  },
    {CC"NMTReleaseMemory",    CC"(JJ)V",                (void*)&WB_NMTReleaseMemory   },
-   {CC"NMTOverflowHashBucket", CC"(J)V",               (void*)&WB_NMTOverflowHashBucket},
    {CC"NMTIsDetailSupported",CC"()Z",                  (void*)&WB_NMTIsDetailSupported},
    {CC"NMTChangeTrackingLevel", CC"()Z",               (void*)&WB_NMTChangeTrackingLevel},
  #endif // INCLUDE_NMT
    {CC"deoptimizeAll",      CC"()V",                   (void*)&WB_DeoptimizeAll     },
    {CC"deoptimizeMethod",   CC"(Ljava/lang/reflect/Executable;Z)I",
                                                        (void*)&WB_DeoptimizeMethod  },
    {CC"isMethodCompiled",   CC"(Ljava/lang/reflect/Executable;Z)Z",
--- 976,988 ----
    {CC"NMTFree",             CC"(J)V",                 (void*)&WB_NMTFree            },
    {CC"NMTReserveMemory",    CC"(J)J",                 (void*)&WB_NMTReserveMemory   },
    {CC"NMTCommitMemory",     CC"(JJ)V",                (void*)&WB_NMTCommitMemory    },
    {CC"NMTUncommitMemory",   CC"(JJ)V",                (void*)&WB_NMTUncommitMemory  },
    {CC"NMTReleaseMemory",    CC"(JJ)V",                (void*)&WB_NMTReleaseMemory   },
    {CC"NMTIsDetailSupported",CC"()Z",                  (void*)&WB_NMTIsDetailSupported},
    {CC"NMTChangeTrackingLevel", CC"()Z",               (void*)&WB_NMTChangeTrackingLevel},
+   {CC"NMTGetHashSize",      CC"()I",                  (void*)&WB_NMTGetHashSize     },
  #endif // INCLUDE_NMT
    {CC"deoptimizeAll",      CC"()V",                   (void*)&WB_DeoptimizeAll     },
    {CC"deoptimizeMethod",   CC"(Ljava/lang/reflect/Executable;Z)I",
                                                        (void*)&WB_DeoptimizeMethod  },
    {CC"isMethodCompiled",   CC"(Ljava/lang/reflect/Executable;Z)Z",