From b7d09977ec345c93ba01ec329d615fe39b226fd8 Mon Sep 17 00:00:00 2001
From: Chuansheng Lu <chuansheng.lcs@alibaba-inc.com>
Date: Wed, 6 Mar 2019 15:55:24 +0800
Subject: [PATCH] [Misc] Use CMS as default GC policy
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Summary:
- Port fix D2553 to Dragonwell
- Change default GC policy to UseConcMarkSweepGC

Test Plan: hotspot/test/gc/TestDefaultGC.sh

Reviewers: 井桐

Reviewed By: 井桐

Subscribers:

Differential Revision: https://aone.alibaba-inc.com/code/D849276
---
 src/share/vm/runtime/arguments.cpp |  2 +-
 test/gc/TestDefaultGC.sh           | 38 ++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 test/gc/TestDefaultGC.sh

diff --git a/src/share/vm/runtime/arguments.cpp b/src/share/vm/runtime/arguments.cpp
index 9757aef7f..2a9bbb3bf 100644
--- a/src/share/vm/runtime/arguments.cpp
+++ b/src/share/vm/runtime/arguments.cpp
@@ -1581,7 +1581,7 @@ void Arguments::select_gc_ergonomically() {
 
 void Arguments::select_gc() {
   if (!gc_selected()) {
-    select_gc_ergonomically();
+    FLAG_SET_ERGO(bool, UseConcMarkSweepGC, true);
   }
 }
 
diff --git a/test/gc/TestDefaultGC.sh b/test/gc/TestDefaultGC.sh
new file mode 100644
index 000000000..35710a483
--- /dev/null
+++ b/test/gc/TestDefaultGC.sh
@@ -0,0 +1,38 @@
+#
+# Copyright (c) 2019 Alibaba Group Holding Limited. 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. Alibaba designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# 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.
+#
+
+#
+# @test
+# @summary test the default gc
+# @run shell TestDefaultGC.sh
+#
+
+${TESTJAVA}/bin/java -XX:+PrintFlagsFinal -version | grep UseConcMarkSweepGC |grep true
+
+if [ "0" == $? ];
+then
+    echo "CMS is Default GC"
+    echo "--- Test passed"
+else
+    echo "CMS is not Default GC"
+    echo "--- Test failed"
+    exit 1
+fi
-- 
GitLab