8253418: ZGC: Use pd_ prefix to denote platform dependent code
Reviewed-by: pliden, eosterlund
This commit is contained in:
parent
7e49eaecbc
commit
5a7390b62a
src/hotspot
os
bsd/gc/z
linux/gc/z
posix/gc/z
windows/gc/z
share/gc/z
@ -25,7 +25,7 @@
|
||||
#include "gc/z/zLargePages.hpp"
|
||||
#include "runtime/globals.hpp"
|
||||
|
||||
void ZLargePages::initialize_platform() {
|
||||
void ZLargePages::pd_initialize() {
|
||||
if (UseLargePages) {
|
||||
_state = Explicit;
|
||||
} else {
|
||||
|
@ -24,7 +24,7 @@
|
||||
#include "precompiled.hpp"
|
||||
#include "gc/z/zNUMA.hpp"
|
||||
|
||||
void ZNUMA::initialize_platform() {
|
||||
void ZNUMA::pd_initialize() {
|
||||
_enabled = false;
|
||||
}
|
||||
|
||||
|
@ -25,7 +25,7 @@
|
||||
#include "gc/z/zLargePages.hpp"
|
||||
#include "runtime/globals.hpp"
|
||||
|
||||
void ZLargePages::initialize_platform() {
|
||||
void ZLargePages::pd_initialize() {
|
||||
if (UseLargePages) {
|
||||
if (UseTransparentHugePages) {
|
||||
_state = Transparent;
|
||||
|
@ -29,7 +29,7 @@
|
||||
#include "runtime/os.hpp"
|
||||
#include "utilities/debug.hpp"
|
||||
|
||||
void ZNUMA::initialize_platform() {
|
||||
void ZNUMA::pd_initialize() {
|
||||
_enabled = UseNUMA;
|
||||
}
|
||||
|
||||
|
@ -24,6 +24,6 @@
|
||||
#include "precompiled.hpp"
|
||||
#include "gc/z/zInitialize.hpp"
|
||||
|
||||
void ZInitialize::initialize_os() {
|
||||
void ZInitialize::pd_initialize() {
|
||||
// Does nothing
|
||||
}
|
||||
|
@ -29,11 +29,11 @@
|
||||
#include <sys/mman.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
void ZVirtualMemoryManager::initialize_os() {
|
||||
void ZVirtualMemoryManager::pd_initialize() {
|
||||
// Does nothing
|
||||
}
|
||||
|
||||
bool ZVirtualMemoryManager::os_reserve(uintptr_t addr, size_t size) {
|
||||
bool ZVirtualMemoryManager::pd_reserve(uintptr_t addr, size_t size) {
|
||||
const uintptr_t res = (uintptr_t)mmap((void*)addr, size, PROT_NONE, MAP_ANONYMOUS|MAP_PRIVATE|MAP_NORESERVE, -1, 0);
|
||||
if (res == (uintptr_t)MAP_FAILED) {
|
||||
// Failed to reserve memory
|
||||
@ -50,7 +50,7 @@ bool ZVirtualMemoryManager::os_reserve(uintptr_t addr, size_t size) {
|
||||
return true;
|
||||
}
|
||||
|
||||
void ZVirtualMemoryManager::os_unreserve(uintptr_t addr, size_t size) {
|
||||
void ZVirtualMemoryManager::pd_unreserve(uintptr_t addr, size_t size) {
|
||||
const int res = munmap((void*)addr, size);
|
||||
assert(res == 0, "Failed to unmap memory");
|
||||
}
|
||||
|
@ -25,6 +25,6 @@
|
||||
#include "gc/z/zInitialize.hpp"
|
||||
#include "gc/z/zSyscall_windows.hpp"
|
||||
|
||||
void ZInitialize::initialize_os() {
|
||||
void ZInitialize::pd_initialize() {
|
||||
ZSyscall::initialize();
|
||||
}
|
||||
|
@ -24,6 +24,6 @@
|
||||
#include "precompiled.hpp"
|
||||
#include "gc/z/zLargePages.hpp"
|
||||
|
||||
void ZLargePages::initialize_platform() {
|
||||
void ZLargePages::pd_initialize() {
|
||||
_state = Disabled;
|
||||
}
|
||||
|
@ -24,7 +24,7 @@
|
||||
#include "precompiled.hpp"
|
||||
#include "gc/z/zNUMA.hpp"
|
||||
|
||||
void ZNUMA::initialize_platform() {
|
||||
void ZNUMA::pd_initialize() {
|
||||
_enabled = false;
|
||||
}
|
||||
|
||||
|
@ -87,7 +87,7 @@ static void grow_from_back_callback(const ZMemory* area, size_t size) {
|
||||
coalesce_into_one_placeholder(area->start(), area->size() + size);
|
||||
}
|
||||
|
||||
void ZVirtualMemoryManager::initialize_os() {
|
||||
void ZVirtualMemoryManager::pd_initialize() {
|
||||
// Each reserved virtual memory address area registered in _manager is
|
||||
// exactly covered by a single placeholder. Callbacks are installed so
|
||||
// that whenever a memory area changes, the corresponding placeholder
|
||||
@ -116,13 +116,13 @@ void ZVirtualMemoryManager::initialize_os() {
|
||||
_manager.register_callbacks(callbacks);
|
||||
}
|
||||
|
||||
bool ZVirtualMemoryManager::os_reserve(uintptr_t addr, size_t size) {
|
||||
bool ZVirtualMemoryManager::pd_reserve(uintptr_t addr, size_t size) {
|
||||
uintptr_t res = ZMapper::reserve(addr, size);
|
||||
|
||||
assert(res == addr || res == NULL, "Should not reserve other memory than requested");
|
||||
return res == addr;
|
||||
}
|
||||
|
||||
void ZVirtualMemoryManager::os_unreserve(uintptr_t addr, size_t size) {
|
||||
void ZVirtualMemoryManager::pd_unreserve(uintptr_t addr, size_t size) {
|
||||
ZMapper::unreserve(addr, size);
|
||||
}
|
||||
|
@ -52,5 +52,5 @@ ZInitialize::ZInitialize(ZBarrierSet* barrier_set) {
|
||||
ZLargePages::initialize();
|
||||
ZBarrierSet::set_barrier_set(barrier_set);
|
||||
|
||||
initialize_os();
|
||||
pd_initialize();
|
||||
}
|
||||
|
@ -30,7 +30,7 @@ class ZBarrierSet;
|
||||
|
||||
class ZInitialize {
|
||||
private:
|
||||
void initialize_os();
|
||||
void pd_initialize();
|
||||
|
||||
public:
|
||||
ZInitialize(ZBarrierSet* barrier_set);
|
||||
|
@ -29,7 +29,7 @@
|
||||
ZLargePages::State ZLargePages::_state;
|
||||
|
||||
void ZLargePages::initialize() {
|
||||
initialize_platform();
|
||||
pd_initialize();
|
||||
|
||||
log_info_p(gc, init)("Memory: " JULONG_FORMAT "M", os::physical_memory() / M);
|
||||
log_info_p(gc, init)("Large Page Support: %s", to_string());
|
||||
|
@ -36,7 +36,7 @@ private:
|
||||
|
||||
static State _state;
|
||||
|
||||
static void initialize_platform();
|
||||
static void pd_initialize();
|
||||
|
||||
public:
|
||||
static void initialize();
|
||||
|
@ -28,7 +28,7 @@
|
||||
bool ZNUMA::_enabled;
|
||||
|
||||
void ZNUMA::initialize() {
|
||||
initialize_platform();
|
||||
pd_initialize();
|
||||
|
||||
log_info_p(gc, init)("NUMA Support: %s", to_string());
|
||||
if (_enabled) {
|
||||
|
@ -30,7 +30,7 @@ class ZNUMA : public AllStatic {
|
||||
private:
|
||||
static bool _enabled;
|
||||
|
||||
static void initialize_platform();
|
||||
static void pd_initialize();
|
||||
|
||||
public:
|
||||
static void initialize();
|
||||
|
@ -48,8 +48,8 @@ ZVirtualMemoryManager::ZVirtualMemoryManager(size_t max_capacity) :
|
||||
return;
|
||||
}
|
||||
|
||||
// Initialize OS specific parts
|
||||
initialize_os();
|
||||
// Initialize platform specific parts
|
||||
pd_initialize();
|
||||
|
||||
// Successfully initialized
|
||||
_initialized = true;
|
||||
@ -107,18 +107,18 @@ bool ZVirtualMemoryManager::reserve_contiguous(uintptr_t start, size_t size) {
|
||||
const uintptr_t remapped = ZAddress::remapped(start);
|
||||
|
||||
// Reserve address space
|
||||
if (!os_reserve(marked0, size)) {
|
||||
if (!pd_reserve(marked0, size)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!os_reserve(marked1, size)) {
|
||||
os_unreserve(marked0, size);
|
||||
if (!pd_reserve(marked1, size)) {
|
||||
pd_unreserve(marked0, size);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!os_reserve(remapped, size)) {
|
||||
os_unreserve(marked0, size);
|
||||
os_unreserve(marked1, size);
|
||||
if (!pd_reserve(remapped, size)) {
|
||||
pd_unreserve(marked0, size);
|
||||
pd_unreserve(marked1, size);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -50,10 +50,10 @@ private:
|
||||
ZMemoryManager _manager;
|
||||
bool _initialized;
|
||||
|
||||
// OS specific implementation
|
||||
void initialize_os();
|
||||
bool os_reserve(uintptr_t addr, size_t size);
|
||||
void os_unreserve(uintptr_t addr, size_t size);
|
||||
// Platform specific implementation
|
||||
void pd_initialize();
|
||||
bool pd_reserve(uintptr_t addr, size_t size);
|
||||
void pd_unreserve(uintptr_t addr, size_t size);
|
||||
|
||||
bool reserve_contiguous(uintptr_t start, size_t size);
|
||||
bool reserve_contiguous(size_t size);
|
||||
|
Loading…
x
Reference in New Issue
Block a user