archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8199752: NMT: Memory allocated by Unsafe.allocateMemory should be tagged as mtOther

Browse source 
Tag memory allocation from Usafe.allocateMemory as external memory allocation

Reviewed-by: coleenp, stuefe
This commit is contained in:
Zhengyu Gu 2018-03-19 08:31:57 -04:00
parent 0f92948d6f
commit d6bd698077
2 changed files with 58 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/hotspot/share/prims/unsafe.cpp
View file

@ -367,7 +367,7 @@ UNSAFE_ENTRY(jlong, Unsafe_AllocateMemory0(JNIEnv *env, jobject unsafe, jlong si
size_t sz = (size_t)size; size_t sz = (size_t)size;
sz = align_up(sz, HeapWordSize); sz = align_up(sz, HeapWordSize);
void* x = os::malloc(sz, mtInternal); void* x = os::malloc(sz, mtOther);
return addr_to_java(x); return addr_to_java(x);
} UNSAFE_END } UNSAFE_END
@ -377,7 +377,7 @@ UNSAFE_ENTRY(jlong, Unsafe_ReallocateMemory0(JNIEnv *env, jobject unsafe, jlong
size_t sz = (size_t)size; size_t sz = (size_t)size;
sz = align_up(sz, HeapWordSize); sz = align_up(sz, HeapWordSize);
void* x = os::realloc(p, sz, mtInternal); void* x = os::realloc(p, sz, mtOther);
return addr_to_java(x); return addr_to_java(x);
} UNSAFE_END } UNSAFE_END

56
test/hotspot/jtreg/runtime/NMT/UnsafeAllocMemory.java Normal file
View file

@ -0,0 +1,56 @@
/*
* Copyright (c) 2018, 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.
*
* 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
* @summary Unsafe.allocateMemory should be tagged as Other
* @key nmt jcmd
* @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main/othervm -Xbootclasspath/a:. -XX:NativeMemoryTracking=summary UnsafeAllocMemory
*/
import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.JDKToolFinder;
import jdk.internal.misc.Unsafe;
public class UnsafeAllocMemory {
public static void main(String args[]) throws Exception {
OutputAnalyzer output;
// Grab my own PID
String pid = Long.toString(ProcessTools.getProcessId());
ProcessBuilder pb = new ProcessBuilder();
Unsafe unsafe = Unsafe.getUnsafe();
unsafe.allocateMemory(128 * 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("Other (reserved=");
}
}