From ecb66d2c55b3a46bdaf37c208860da376fb37c17 Mon Sep 17 00:00:00 2001
From: Stefan Karlsson <stefank@openjdk.org>
Date: Mon, 28 Oct 2019 11:26:53 +0100
Subject: [PATCH] 8232650: ZGC: Add initialization hooks for OS specific code

Reviewed-by: pliden, eosterlund
---
 .../os/posix/gc/z/zInitialize_posix.cpp       | 29 +++++++++++++++++++
 .../os/posix/gc/z/zVirtualMemory_posix.cpp    |  4 +++
 src/hotspot/share/gc/z/zInitialize.cpp        |  2 ++
 src/hotspot/share/gc/z/zInitialize.hpp        |  3 ++
 src/hotspot/share/gc/z/zVirtualMemory.cpp     |  3 ++
 src/hotspot/share/gc/z/zVirtualMemory.hpp     |  2 ++
 6 files changed, 43 insertions(+)
 create mode 100644 src/hotspot/os/posix/gc/z/zInitialize_posix.cpp

diff --git a/src/hotspot/os/posix/gc/z/zInitialize_posix.cpp b/src/hotspot/os/posix/gc/z/zInitialize_posix.cpp
new file mode 100644
index 00000000000..6b47b1e4c6c
--- /dev/null
+++ b/src/hotspot/os/posix/gc/z/zInitialize_posix.cpp
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2019, 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.
+ */
+
+#include "precompiled.hpp"
+#include "gc/z/zInitialize.hpp"
+
+void ZInitialize::initialize_os() {
+  // Does nothing
+}
diff --git a/src/hotspot/os/posix/gc/z/zVirtualMemory_posix.cpp b/src/hotspot/os/posix/gc/z/zVirtualMemory_posix.cpp
index 8bd2dfda53a..29609524ed7 100644
--- a/src/hotspot/os/posix/gc/z/zVirtualMemory_posix.cpp
+++ b/src/hotspot/os/posix/gc/z/zVirtualMemory_posix.cpp
@@ -29,6 +29,10 @@
 #include <sys/mman.h>
 #include <sys/types.h>
 
+void ZVirtualMemoryManager::initialize_os() {
+  // Does nothing
+}
+
 static void unmap(uintptr_t start, size_t size) {
   const int res = munmap((void*)start, size);
   assert(res == 0, "Failed to unmap memory");
diff --git a/src/hotspot/share/gc/z/zInitialize.cpp b/src/hotspot/share/gc/z/zInitialize.cpp
index 33ec61fa4cf..b37a187757b 100644
--- a/src/hotspot/share/gc/z/zInitialize.cpp
+++ b/src/hotspot/share/gc/z/zInitialize.cpp
@@ -50,4 +50,6 @@ ZInitialize::ZInitialize(ZBarrierSet* barrier_set) {
   ZTracer::initialize();
   ZLargePages::initialize();
   ZBarrierSet::set_barrier_set(barrier_set);
+
+  initialize_os();
 }
diff --git a/src/hotspot/share/gc/z/zInitialize.hpp b/src/hotspot/share/gc/z/zInitialize.hpp
index fb8bf1af2eb..85470ed0ec3 100644
--- a/src/hotspot/share/gc/z/zInitialize.hpp
+++ b/src/hotspot/share/gc/z/zInitialize.hpp
@@ -29,6 +29,9 @@
 class ZBarrierSet;
 
 class ZInitialize {
+private:
+  void initialize_os();
+
 public:
   ZInitialize(ZBarrierSet* barrier_set);
 };
diff --git a/src/hotspot/share/gc/z/zVirtualMemory.cpp b/src/hotspot/share/gc/z/zVirtualMemory.cpp
index 4942ab3d16a..5d5a958f120 100644
--- a/src/hotspot/share/gc/z/zVirtualMemory.cpp
+++ b/src/hotspot/share/gc/z/zVirtualMemory.cpp
@@ -47,6 +47,9 @@ ZVirtualMemoryManager::ZVirtualMemoryManager(size_t max_capacity) :
     return;
   }
 
+  // Initialize OS specific parts
+  initialize_os();
+
   // Successfully initialized
   _initialized = true;
 }
diff --git a/src/hotspot/share/gc/z/zVirtualMemory.hpp b/src/hotspot/share/gc/z/zVirtualMemory.hpp
index 0271601b3b1..4f865b7bd9b 100644
--- a/src/hotspot/share/gc/z/zVirtualMemory.hpp
+++ b/src/hotspot/share/gc/z/zVirtualMemory.hpp
@@ -50,6 +50,8 @@ private:
   ZMemoryManager _manager;
   bool           _initialized;
 
+  void initialize_os();
+
   bool reserve_contiguous_platform(uintptr_t start, size_t size);
   bool reserve_contiguous(size_t size);
   size_t reserve_discontiguous(uintptr_t start, size_t size, size_t min_range);