8234274: [BACKOUT] JDK-8204128 NMT might report incorrect numbers for Compiler area
Reviewed-by: zgu
This commit is contained in:
parent
5968ac44bb
commit
e9e1948cfb
src/hotspot/share
test
@ -325,7 +325,7 @@ void Arena::destruct_contents() {
|
||||
// change the size
|
||||
void Arena::set_size_in_bytes(size_t size) {
|
||||
if (_size_in_bytes != size) {
|
||||
ssize_t delta = size - size_in_bytes();
|
||||
long delta = (long)(size - size_in_bytes());
|
||||
_size_in_bytes = size;
|
||||
MemTracker::record_arena_size_change(delta, _flags);
|
||||
}
|
||||
|
@ -797,21 +797,6 @@ WB_ENTRY(jint, WB_NMTGetHashSize(JNIEnv* env, jobject o))
|
||||
assert(hash_size > 0, "NMT hash_size should be > 0");
|
||||
return (jint)hash_size;
|
||||
WB_END
|
||||
|
||||
WB_ENTRY(jlong, WB_NMTNewArena(JNIEnv* env, jobject o, jlong init_size))
|
||||
Arena* arena = new (mtTest) Arena(mtTest, size_t(init_size));
|
||||
return (jlong)arena;
|
||||
WB_END
|
||||
|
||||
WB_ENTRY(void, WB_NMTFreeArena(JNIEnv* env, jobject o, jlong arena))
|
||||
Arena* a = (Arena*)arena;
|
||||
delete a;
|
||||
WB_END
|
||||
|
||||
WB_ENTRY(void, WB_NMTArenaMalloc(JNIEnv* env, jobject o, jlong arena, jlong size))
|
||||
Arena* a = (Arena*)arena;
|
||||
a->Amalloc(size_t(size));
|
||||
WB_END
|
||||
#endif // INCLUDE_NMT
|
||||
|
||||
static jmethodID reflected_method_to_jmid(JavaThread* thread, JNIEnv* env, jobject method) {
|
||||
@ -2259,9 +2244,6 @@ static JNINativeMethod methods[] = {
|
||||
{CC"NMTReleaseMemory", CC"(JJ)V", (void*)&WB_NMTReleaseMemory },
|
||||
{CC"NMTChangeTrackingLevel", CC"()Z", (void*)&WB_NMTChangeTrackingLevel},
|
||||
{CC"NMTGetHashSize", CC"()I", (void*)&WB_NMTGetHashSize },
|
||||
{CC"NMTNewArena", CC"(J)J", (void*)&WB_NMTNewArena },
|
||||
{CC"NMTFreeArena", CC"(J)V", (void*)&WB_NMTFreeArena },
|
||||
{CC"NMTArenaMalloc", CC"(JJ)V", (void*)&WB_NMTArenaMalloc },
|
||||
#endif // INCLUDE_NMT
|
||||
{CC"deoptimizeFrames", CC"(Z)I", (void*)&WB_DeoptimizeFrames },
|
||||
{CC"deoptimizeAll", CC"()V", (void*)&WB_DeoptimizeAll },
|
||||
|
@ -70,9 +70,8 @@ class MemoryCounter {
|
||||
}
|
||||
}
|
||||
|
||||
inline void resize(ssize_t sz) {
|
||||
inline void resize(long sz) {
|
||||
if (sz != 0) {
|
||||
assert(sz >= 0 || _size >= size_t(-sz), "Must be");
|
||||
Atomic::add(size_t(sz), &_size);
|
||||
DEBUG_ONLY(_peak_size = MAX2(_size, _peak_size);)
|
||||
}
|
||||
@ -114,7 +113,7 @@ class MallocMemory {
|
||||
_arena.deallocate(0);
|
||||
}
|
||||
|
||||
inline void record_arena_size_change(ssize_t sz) {
|
||||
inline void record_arena_size_change(long sz) {
|
||||
_arena.resize(sz);
|
||||
}
|
||||
|
||||
@ -362,7 +361,7 @@ class MallocTracker : AllStatic {
|
||||
MallocMemorySummary::record_arena_free(flags);
|
||||
}
|
||||
|
||||
static inline void record_arena_size_change(ssize_t size, MEMFLAGS flags) {
|
||||
static inline void record_arena_size_change(int size, MEMFLAGS flags) {
|
||||
MallocMemorySummary::record_arena_size_change(size, flags);
|
||||
}
|
||||
private:
|
||||
|
@ -63,7 +63,7 @@ class MemTracker : AllStatic {
|
||||
|
||||
static inline void record_new_arena(MEMFLAGS flag) { }
|
||||
static inline void record_arena_free(MEMFLAGS flag) { }
|
||||
static inline void record_arena_size_change(ssize_t diff, MEMFLAGS flag) { }
|
||||
static inline void record_arena_size_change(int diff, MEMFLAGS flag) { }
|
||||
static inline void record_virtual_memory_reserve(void* addr, size_t size, const NativeCallStack& stack,
|
||||
MEMFLAGS flag = mtNone) { }
|
||||
static inline void record_virtual_memory_reserve_and_commit(void* addr, size_t size,
|
||||
@ -203,7 +203,7 @@ class MemTracker : AllStatic {
|
||||
|
||||
// Record arena size change. Arena size is the size of all arena
|
||||
// chuncks that backing up the arena.
|
||||
static inline void record_arena_size_change(ssize_t diff, MEMFLAGS flag) {
|
||||
static inline void record_arena_size_change(int diff, MEMFLAGS flag) {
|
||||
if (tracking_level() < NMT_summary) return;
|
||||
MallocTracker::record_arena_size_change(diff, flag);
|
||||
}
|
||||
|
@ -90,7 +90,6 @@ gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java 8193639 solaris-all
|
||||
# :hotspot_runtime
|
||||
|
||||
runtime/jni/terminatedThread/TestTerminatedThread.java 8219652 aix-ppc64
|
||||
runtime/nmt/HugeArenaTracking.java 8234270 windows-x64
|
||||
runtime/ReservedStack/ReservedStackTest.java 8231031 generic-all
|
||||
|
||||
#############################################################################
|
||||
|
@ -1,75 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2019, Red Hat, Inc. All rights reserved.
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @key nmt jcmd
|
||||
* @library /test/lib
|
||||
* @modules java.base/jdk.internal.misc
|
||||
* java.management
|
||||
* @build sun.hotspot.WhiteBox
|
||||
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
|
||||
* sun.hotspot.WhiteBox$WhiteBoxPermission
|
||||
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail HugeArenaTracking
|
||||
*/
|
||||
|
||||
import jdk.test.lib.process.ProcessTools;
|
||||
import jdk.test.lib.process.OutputAnalyzer;
|
||||
import jdk.test.lib.JDKToolFinder;
|
||||
import sun.hotspot.WhiteBox;
|
||||
|
||||
public class HugeArenaTracking {
|
||||
private static final long GB = 1024 * 1024 * 1024;
|
||||
|
||||
public static void main(String args[]) throws Exception {
|
||||
OutputAnalyzer output;
|
||||
final WhiteBox wb = WhiteBox.getWhiteBox();
|
||||
|
||||
// Grab my own PID
|
||||
String pid = Long.toString(ProcessTools.getProcessId());
|
||||
ProcessBuilder pb = new ProcessBuilder();
|
||||
|
||||
long arena1 = wb.NMTNewArena(1024);
|
||||
long arena2 = wb.NMTNewArena(1024);
|
||||
|
||||
// Run 'jcmd <pid> VM.native_memory summary'
|
||||
pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "summary"});
|
||||
output = new OutputAnalyzer(pb.start());
|
||||
output.shouldContain("Test (reserved=2KB, committed=2KB)");
|
||||
|
||||
// Allocate 2GB+ from arena
|
||||
long total = 0;
|
||||
while (total < 2 * GB) {
|
||||
wb.NMTArenaMalloc(arena1, 4096);
|
||||
total += 4096;
|
||||
}
|
||||
wb.NMTFreeArena(arena1);
|
||||
|
||||
output = new OutputAnalyzer(pb.start());
|
||||
output.shouldContain("Test (reserved=1KB, committed=1KB)");
|
||||
wb.NMTFreeArena(arena2);
|
||||
|
||||
output = new OutputAnalyzer(pb.start());
|
||||
output.shouldNotContain("Test (reserved");
|
||||
}
|
||||
}
|
@ -222,9 +222,6 @@ public class WhiteBox {
|
||||
public native long NMTMallocWithPseudoStackAndType(long size, int index, int type);
|
||||
public native boolean NMTChangeTrackingLevel();
|
||||
public native int NMTGetHashSize();
|
||||
public native long NMTNewArena(long initSize);
|
||||
public native void NMTFreeArena(long arena);
|
||||
public native void NMTArenaMalloc(long arena, long size);
|
||||
|
||||
// Compiler
|
||||
public native int matchesMethod(Executable method, String pattern);
|
||||
|
Loading…
x
Reference in New Issue
Block a user