From 6a8aa0fdadf6e9429a0f276dad890daa72781b7a Mon Sep 17 00:00:00 2001
From: Stefan Karlsson <stefank@openjdk.org>
Date: Fri, 6 Apr 2018 11:37:28 +0200
Subject: [PATCH] 8200736: Move CMSGCStats to the cms directory
Reviewed-by: sjohanss, tschatzl
---
src/hotspot/share/gc/cms/cmsGCStats.cpp | 34 ++++++++++++++++
src/hotspot/share/gc/cms/cmsGCStats.hpp | 39 +++++++++++++++++++
.../gc/cms/concurrentMarkSweepGeneration.cpp | 1 +
src/hotspot/share/gc/shared/gcStats.cpp | 6 ---
src/hotspot/share/gc/shared/gcStats.hpp | 9 -----
5 files changed, 74 insertions(+), 15 deletions(-)
create mode 100644 src/hotspot/share/gc/cms/cmsGCStats.cpp
create mode 100644 src/hotspot/share/gc/cms/cmsGCStats.hpp
diff --git a/src/hotspot/share/gc/cms/cmsGCStats.cpp b/src/hotspot/share/gc/cms/cmsGCStats.cpp
new file mode 100644
index 00000000000..8f18334c42b
--- /dev/null
+++ b/src/hotspot/share/gc/cms/cmsGCStats.cpp
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2003, 2015, 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/cms/cmsGCStats.hpp"
+#include "gc/shared/gcUtil.inline.hpp"
+#include "runtime/globals.hpp"
+
+CMSGCStats::CMSGCStats() {
+ _avg_promoted = new AdaptivePaddedNoZeroDevAverage(
+ CMSExpAvgFactor,
+ PromotedPadding);
+}
diff --git a/src/hotspot/share/gc/cms/cmsGCStats.hpp b/src/hotspot/share/gc/cms/cmsGCStats.hpp
new file mode 100644
index 00000000000..0fd8dea5a86
--- /dev/null
+++ b/src/hotspot/share/gc/cms/cmsGCStats.hpp
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2003, 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.
+ *
+ */
+
+#ifndef SHARE_GC_CMS_CMSGCSTATS_HPP
+#define SHARE_GC_CMS_CMSGCSTATS_HPP
+
+#include "gc/shared/gcStats.hpp"
+
+class CMSGCStats : public GCStats {
+ public:
+ CMSGCStats();
+
+ virtual Name kind() {
+ return CMSGCStatsKind;
+ }
+};
+
+#endif // SHARE_GC_CMS_CMSGCSTATS_HPP
diff --git a/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp b/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp
index c9047062cbb..da4ac824003 100644
--- a/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp
+++ b/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.cpp
@@ -29,6 +29,7 @@
#include "classfile/systemDictionary.hpp"
#include "code/codeCache.hpp"
#include "gc/cms/cmsCollectorPolicy.hpp"
+#include "gc/cms/cmsGCStats.hpp"
#include "gc/cms/cmsHeap.hpp"
#include "gc/cms/cmsOopClosures.inline.hpp"
#include "gc/cms/compactibleFreeListSpace.hpp"
diff --git a/src/hotspot/share/gc/shared/gcStats.cpp b/src/hotspot/share/gc/shared/gcStats.cpp
index 14e63ea108f..4e26a83e3ee 100644
--- a/src/hotspot/share/gc/shared/gcStats.cpp
+++ b/src/hotspot/share/gc/shared/gcStats.cpp
@@ -31,9 +31,3 @@ GCStats::GCStats() {
AdaptiveSizePolicyWeight,
PromotedPadding);
}
-
-CMSGCStats::CMSGCStats() {
- _avg_promoted = new AdaptivePaddedNoZeroDevAverage(
- CMSExpAvgFactor,
- PromotedPadding);
-}
diff --git a/src/hotspot/share/gc/shared/gcStats.hpp b/src/hotspot/share/gc/shared/gcStats.hpp
index e9bd5a06875..17a457679ee 100644
--- a/src/hotspot/share/gc/shared/gcStats.hpp
+++ b/src/hotspot/share/gc/shared/gcStats.hpp
@@ -58,13 +58,4 @@ class GCStats : public CHeapObj<mtGC> {
}
};
-class CMSGCStats : public GCStats {
- public:
- CMSGCStats();
-
- virtual Name kind() {
- return CMSGCStatsKind;
- }
-};
-
#endif // SHARE_VM_GC_SHARED_GCSTATS_HPP