1.1 --- a/src/share/vm/prims/whitebox.cpp Mon Nov 10 17:14:59 2014 +0100
1.2 +++ b/src/share/vm/prims/whitebox.cpp Wed Nov 05 08:22:17 2014 -0800
1.3 @@ -344,15 +344,6 @@
1.4 return MemTracker::tracking_level() == NMT_detail;
1.5 WB_END
1.6
1.7 -WB_ENTRY(void, WB_NMTOverflowHashBucket(JNIEnv* env, jobject o, jlong num))
1.8 - address pc = (address)1;
1.9 - for (jlong index = 0; index < num; index ++) {
1.10 - NativeCallStack stack(&pc, 1);
1.11 - os::malloc(0, mtTest, stack);
1.12 - pc += MallocSiteTable::hash_buckets();
1.13 - }
1.14 -WB_END
1.15 -
1.16 WB_ENTRY(jboolean, WB_NMTChangeTrackingLevel(JNIEnv* env))
1.17 // Test that we can downgrade NMT levels but not upgrade them.
1.18 if (MemTracker::tracking_level() == NMT_off) {
1.19 @@ -383,6 +374,12 @@
1.20 return MemTracker::tracking_level() == NMT_minimal;
1.21 }
1.22 WB_END
1.23 +
1.24 +WB_ENTRY(jint, WB_NMTGetHashSize(JNIEnv* env, jobject o))
1.25 + int hash_size = MallocSiteTable::hash_buckets();
1.26 + assert(hash_size > 0, "NMT hash_size should be > 0");
1.27 + return (jint)hash_size;
1.28 +WB_END
1.29 #endif // INCLUDE_NMT
1.30
1.31 static jmethodID reflected_method_to_jmid(JavaThread* thread, JNIEnv* env, jobject method) {
1.32 @@ -981,9 +978,9 @@
1.33 {CC"NMTCommitMemory", CC"(JJ)V", (void*)&WB_NMTCommitMemory },
1.34 {CC"NMTUncommitMemory", CC"(JJ)V", (void*)&WB_NMTUncommitMemory },
1.35 {CC"NMTReleaseMemory", CC"(JJ)V", (void*)&WB_NMTReleaseMemory },
1.36 - {CC"NMTOverflowHashBucket", CC"(J)V", (void*)&WB_NMTOverflowHashBucket},
1.37 {CC"NMTIsDetailSupported",CC"()Z", (void*)&WB_NMTIsDetailSupported},
1.38 {CC"NMTChangeTrackingLevel", CC"()Z", (void*)&WB_NMTChangeTrackingLevel},
1.39 + {CC"NMTGetHashSize", CC"()I", (void*)&WB_NMTGetHashSize },
1.40 #endif // INCLUDE_NMT
1.41 {CC"deoptimizeAll", CC"()V", (void*)&WB_DeoptimizeAll },
1.42 {CC"deoptimizeMethod", CC"(Ljava/lang/reflect/Executable;Z)I",
