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

8280583: Always build NMT

Browse source 
Reviewed-by: shade, ihse, zgu
This commit is contained in:
Thomas Stuefe 2022-01-27 09:18:17 +00:00
parent 7f68759c60
commit cab590517b
28 changed files with 51 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/hotspot/share/runtime/os.cpp
View file

@ -631,14 +631,11 @@ void* os::malloc(size_t size, MEMFLAGS flags) {
void* os::malloc(size_t size, MEMFLAGS memflags, const NativeCallStack& stack) {
#if INCLUDE_NMT
{
void* rc = NULL;
if (NMTPreInit::handle_malloc(&rc, size)) {
return rc;
}
// Special handling for NMT preinit phase before arguments are parsed
void* rc = NULL;
if (NMTPreInit::handle_malloc(&rc, size)) {
return rc;
}
#endif
DEBUG_ONLY(check_crash_protection());
@ -677,14 +674,11 @@ void* os::realloc(void *memblock, size_t size, MEMFLAGS flags) {
void* os::realloc(void *memblock, size_t size, MEMFLAGS memflags, const NativeCallStack& stack) {
#if INCLUDE_NMT
{
void* rc = NULL;
if (NMTPreInit::handle_realloc(&rc, memblock, size)) {
return rc;
}
// Special handling for NMT preinit phase before arguments are parsed
void* rc = NULL;
if (NMTPreInit::handle_realloc(&rc, memblock, size)) {
return rc;
}
#endif
if (memblock == NULL) {
return os::malloc(size, memflags, stack);
@ -723,11 +717,10 @@ void* os::realloc(void *memblock, size_t size, MEMFLAGS memflags, const NativeCa
void os::free(void *memblock) {
#if INCLUDE_NMT
// Special handling for NMT preinit phase before arguments are parsed
if (NMTPreInit::handle_free(memblock)) {
return;
}
#endif
if (memblock == NULL) {
return;