infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 12:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

8349580: Do not use address in MemTracker top level functions

Browse Source 
Reviewed-by: gziemski, stefank
This commit is contained in:
Johan Sjölen 2025-02-10 13:52:23 +00:00
parent c9cadbd23f
commit f74c4dfe0b
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hotspot/os/posix/perfMemory_posix.cpp
View File

@ -1088,7 +1088,7 @@ static void unmap_shared(char* addr, size_t bytes) {
MemTracker::NmtVirtualMemoryLocker nvml;
res = ::munmap(addr, bytes);
if (res == 0) {
MemTracker::record_virtual_memory_release((address)addr, bytes);
MemTracker::record_virtual_memory_release(addr, bytes);
}
} else {
res = ::munmap(addr, bytes);

2
src/hotspot/os/windows/perfMemory_windows.cpp
View File

@ -1804,7 +1804,7 @@ void PerfMemory::detach(char* addr, size_t bytes) {
// it does not go through os api, the operation has to record from here
MemTracker::NmtVirtualMemoryLocker nvml;
remove_file_mapping(addr);
MemTracker::record_virtual_memory_release((address)addr, bytes);
MemTracker::record_virtual_memory_release(addr, bytes);
} else {
remove_file_mapping(addr);
}

4
src/hotspot/share/nmt/memTracker.hpp
View File

@ -135,7 +135,7 @@ class MemTracker : AllStatic {
}
}
static inline void record_virtual_memory_release(address addr, size_t size) {
static inline void record_virtual_memory_release(void* addr, size_t size) {
assert_post_init();
if (!enabled()) return;
if (addr != nullptr) {
@ -143,7 +143,7 @@ class MemTracker : AllStatic {
}
}
static inline void record_virtual_memory_uncommit(address addr, size_t size) {
static inline void record_virtual_memory_uncommit(void* addr, size_t size) {
assert_post_init();
if (!enabled()) return;
if (addr != nullptr) {

8
src/hotspot/share/runtime/os.cpp
View File

@ -2204,7 +2204,7 @@ bool os::uncommit_memory(char* addr, size_t bytes, bool executable) {
MemTracker::NmtVirtualMemoryLocker nvml;
res = pd_uncommit_memory(addr, bytes, executable);
if (res) {
MemTracker::record_virtual_memory_uncommit((address)addr, bytes);
MemTracker::record_virtual_memory_uncommit(addr, bytes);
}
} else {
res = pd_uncommit_memory(addr, bytes, executable);
@ -2226,7 +2226,7 @@ bool os::release_memory(char* addr, size_t bytes) {
MemTracker::NmtVirtualMemoryLocker nvml;
res = pd_release_memory(addr, bytes);
if (res) {
MemTracker::record_virtual_memory_release((address)addr, bytes);
MemTracker::record_virtual_memory_release(addr, bytes);
}
} else {
res = pd_release_memory(addr, bytes);
@ -2311,7 +2311,7 @@ bool os::unmap_memory(char *addr, size_t bytes) {
MemTracker::NmtVirtualMemoryLocker nvml;
result = pd_unmap_memory(addr, bytes);
if (result) {
MemTracker::record_virtual_memory_release((address)addr, bytes);
MemTracker::record_virtual_memory_release(addr, bytes);
}
} else {
result = pd_unmap_memory(addr, bytes);
@ -2350,7 +2350,7 @@ bool os::release_memory_special(char* addr, size_t bytes) {
MemTracker::NmtVirtualMemoryLocker nvml;
res = pd_release_memory_special(addr, bytes);
if (res) {
MemTracker::record_virtual_memory_release((address)addr, bytes);
MemTracker::record_virtual_memory_release(addr, bytes);
}
} else {
res = pd_release_memory_special(addr, bytes);