--- a/hotspot/src/cpu/x86/vm/globalDefinitions_x86.hpp Wed Jul 27 08:31:48 2016 -0400
+++ b/hotspot/src/cpu/x86/vm/globalDefinitions_x86.hpp Wed Jul 27 13:33:52 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2016, 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
@@ -56,7 +56,7 @@
#endif
#endif
-#if defined(COMPILER2) && !defined(JAVASE_EMBEDDED)
+#if defined(COMPILER2)
// Include Restricted Transactional Memory lock eliding optimization
#define INCLUDE_RTM_OPT 1
#endif
--- a/hotspot/src/share/vm/runtime/arguments.cpp Wed Jul 27 08:31:48 2016 -0400
+++ b/hotspot/src/share/vm/runtime/arguments.cpp Wed Jul 27 13:33:52 2016 +0000
@@ -1784,11 +1784,7 @@
if (should_auto_select_low_pause_collector()) {
FLAG_SET_ERGO_IF_DEFAULT(bool, UseConcMarkSweepGC, true);
} else {
-#if defined(JAVASE_EMBEDDED)
- FLAG_SET_ERGO_IF_DEFAULT(bool, UseParallelGC, true);
-#else
FLAG_SET_ERGO_IF_DEFAULT(bool, UseG1GC, true);
-#endif
}
} else {
FLAG_SET_ERGO_IF_DEFAULT(bool, UseSerialGC, true);
--- a/hotspot/src/share/vm/runtime/globals.hpp Wed Jul 27 08:31:48 2016 -0400
+++ b/hotspot/src/share/vm/runtime/globals.hpp Wed Jul 27 13:33:52 2016 +0000
@@ -458,12 +458,6 @@
#define falseInProduct true
#endif
-#ifdef JAVASE_EMBEDDED
-#define falseInEmbedded false
-#else
-#define falseInEmbedded true
-#endif
-
// develop flags are settable / visible only during development and are constant in the PRODUCT version
// product flags are always settable / visible
// notproduct flags are settable / visible only during development and are not declared in the PRODUCT version
@@ -592,7 +586,7 @@
product_pd(bool, UseMembar, \
"(Unstable) Issues membars on thread state transitions") \
\
- develop(bool, CleanChunkPoolAsync, falseInEmbedded, \
+ develop(bool, CleanChunkPoolAsync, true, \
"Clean the chunk pool asynchronously") \
\
experimental(bool, AlwaysSafeConstructors, false, \
@@ -2890,15 +2884,10 @@
\
/* notice: the max range value here is max_jint, not max_intx */ \
/* because of overflow issue */ \
- NOT_EMBEDDED(diagnostic(intx, GuaranteedSafepointInterval, 1000, \
+ diagnostic(intx, GuaranteedSafepointInterval, 1000, \
"Guarantee a safepoint (at least) every so many milliseconds " \
- "(0 means none)")) \
- NOT_EMBEDDED(range(0, max_jint)) \
- \
- EMBEDDED_ONLY(product(intx, GuaranteedSafepointInterval, 0, \
- "Guarantee a safepoint (at least) every so many milliseconds " \
- "(0 means none)")) \
- EMBEDDED_ONLY(range(0, max_jint)) \
+ "(0 means none)") \
+ range(0, max_jint) \
\
product(intx, SafepointTimeoutDelay, 10000, \
"Delay in milliseconds for option SafepointTimeout") \
@@ -3800,7 +3789,7 @@
\
/* flags for performance data collection */ \
\
- product(bool, UsePerfData, falseInEmbedded, \
+ product(bool, UsePerfData, true, \
"Flag to disable jvmstat instrumentation for performance testing "\
"and problem isolation purposes") \
\
--- a/hotspot/src/share/vm/runtime/vm_version.cpp Wed Jul 27 08:31:48 2016 -0400
+++ b/hotspot/src/share/vm/runtime/vm_version.cpp Wed Jul 27 13:33:52 2016 +0000
@@ -110,7 +110,7 @@
#ifndef HOTSPOT_VM_DISTRO
#error HOTSPOT_VM_DISTRO must be defined
#endif
-#define VMNAME HOTSPOT_VM_DISTRO " " VMLP EMBEDDED_ONLY("Embedded ") VMTYPE " VM"
+#define VMNAME HOTSPOT_VM_DISTRO " " VMLP VMTYPE " VM"
const char* Abstract_VM_Version::vm_name() {
return VMNAME;
--- a/hotspot/src/share/vm/services/lowMemoryDetector.cpp Wed Jul 27 08:31:48 2016 -0400
+++ b/hotspot/src/share/vm/services/lowMemoryDetector.cpp Wed Jul 27 13:33:52 2016 +0000
@@ -281,8 +281,6 @@
}
void SensorInfo::process_pending_requests(TRAPS) {
- assert(has_pending_requests(), "Must have pending request");
-
int pending_count = pending_trigger_count();
if (pending_clear_count() > 0) {
clear(pending_count, CHECK);
--- a/hotspot/src/share/vm/utilities/macros.hpp Wed Jul 27 08:31:48 2016 -0400
+++ b/hotspot/src/share/vm/utilities/macros.hpp Wed Jul 27 13:33:52 2016 +0000
@@ -458,14 +458,6 @@
#define NOT_AARCH64(code) code
#endif
-#ifdef JAVASE_EMBEDDED
-#define EMBEDDED_ONLY(code) code
-#define NOT_EMBEDDED(code)
-#else
-#define EMBEDDED_ONLY(code)
-#define NOT_EMBEDDED(code) code
-#endif
-
#define define_pd_global(type, name, value) const type pd_##name = value;
// Helper macros for constructing file names for includes.
--- a/hotspot/test/compiler/rtm/cli/RTMGenericCommandLineOptionTest.java Wed Jul 27 08:31:48 2016 -0400
+++ b/hotspot/test/compiler/rtm/cli/RTMGenericCommandLineOptionTest.java Wed Jul 27 13:33:52 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
@@ -89,7 +89,7 @@
@Override
public void runTestCases() throws Throwable {
if (Platform.isX86() || Platform.isX64() || Platform.isPPC()) {
- if (Platform.isServer() && !Platform.isEmbedded()) {
+ if (Platform.isServer()) {
runX86SupportedVMTestCases();
} else {
runX86UnsupportedVMTestCases();
--- a/hotspot/test/compiler/testlibrary/rtm/predicate/SupportedVM.java Wed Jul 27 08:31:48 2016 -0400
+++ b/hotspot/test/compiler/testlibrary/rtm/predicate/SupportedVM.java Wed Jul 27 13:33:52 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
@@ -31,6 +31,6 @@
public class SupportedVM implements BooleanSupplier {
@Override
public boolean getAsBoolean() {
- return Platform.isServer() && !Platform.isEmbedded();
+ return Platform.isServer();
}
}
--- a/hotspot/test/gc/arguments/TestSelectDefaultGC.java Wed Jul 27 08:31:48 2016 -0400
+++ b/hotspot/test/gc/arguments/TestSelectDefaultGC.java Wed Jul 27 13:33:52 2016 +0000
@@ -55,14 +55,10 @@
output.shouldHaveExitValue(0);
final boolean isServer = actAsServer;
- final boolean isEmbedded = Platform.isEmbedded();
// Verify GC selection
- // G1 is default for non-embedded server class machines
- assertVMOption(output, "UseG1GC", isServer && !isEmbedded);
- // Parallel is default for embedded server class machines
- assertVMOption(output, "UseParallelGC", isServer && isEmbedded);
- assertVMOption(output, "UseParallelOldGC", isServer && isEmbedded);
+ // G1 is default for server class machines
+ assertVMOption(output, "UseG1GC", isServer);
// Serial is default for non-server class machines
assertVMOption(output, "UseSerialGC", !isServer);
// CMS is never default
--- a/hotspot/test/runtime/logging/MonitorMismatchTest.java Wed Jul 27 08:31:48 2016 -0400
+++ b/hotspot/test/runtime/logging/MonitorMismatchTest.java Wed Jul 27 13:33:52 2016 +0000
@@ -39,23 +39,21 @@
public class MonitorMismatchTest {
public static void main(String... args) throws Exception {
- if (!Platform.isEmbedded()){
- // monitormismatch should turn on.
- ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-Xcomp",
- "-XX:+TieredCompilation",
- "-Xlog:monitormismatch=info",
- "MonitorMismatchHelper");
- OutputAnalyzer o = new OutputAnalyzer(pb.start());
- o.shouldContain("[monitormismatch] Monitor mismatch in method");
+ // monitormismatch should turn on.
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-Xcomp",
+ "-XX:+TieredCompilation",
+ "-Xlog:monitormismatch=info",
+ "MonitorMismatchHelper");
+ OutputAnalyzer o = new OutputAnalyzer(pb.start());
+ o.shouldContain("[monitormismatch] Monitor mismatch in method");
- // monitormismatch should turn off.
- pb = ProcessTools.createJavaProcessBuilder("-Xcomp",
- "-XX:+TieredCompilation",
- "-Xlog:monitormismatch=off",
- "MonitorMismatchHelper");
- o = new OutputAnalyzer(pb.start());
- o.shouldNotContain("[monitormismatch]");
- }
+ // monitormismatch should turn off.
+ pb = ProcessTools.createJavaProcessBuilder("-Xcomp",
+ "-XX:+TieredCompilation",
+ "-Xlog:monitormismatch=off",
+ "MonitorMismatchHelper");
+ o = new OutputAnalyzer(pb.start());
+ o.shouldNotContain("[monitormismatch]");
};
}
--- a/hotspot/test/testlibrary/jdk/test/lib/Platform.java Wed Jul 27 08:31:48 2016 -0400
+++ b/hotspot/test/testlibrary/jdk/test/lib/Platform.java Wed Jul 27 13:33:52 2016 +0000
@@ -60,10 +60,6 @@
return vmName.endsWith(" Minimal VM");
}
- public static boolean isEmbedded() {
- return vmName.contains("Embedded");
- }
-
public static boolean isTieredSupported() {
return compiler.contains("Tiered Compilers");
}
--- a/hotspot/test/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java Wed Jul 27 08:31:48 2016 -0400
+++ b/hotspot/test/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java Wed Jul 27 13:33:52 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
@@ -49,7 +49,7 @@
BITNESS("is32bit", "is64bit"),
OS("isAix", "isLinux", "isOSX", "isSolaris", "isWindows"),
VM_TYPE("isClient", "isServer", "isGraal", "isMinimal", "isZero"),
- IGNORED("isEmbedded", "isDebugBuild", "shouldSAAttach",
+ IGNORED("isDebugBuild", "shouldSAAttach",
"canPtraceAttachLinux", "canAttachOSX", "isTieredSupported");
public final List<String> methodNames;