--- a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/SAGetopt.java Tue Mar 15 10:11:02 2016 +0100
+++ b/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/SAGetopt.java Tue Mar 15 15:29:42 2016 +0100
@@ -84,7 +84,11 @@
}
else {
// Mixed style options --file name
- extractOptarg(ca[0]);
+ try {
+ extractOptarg(ca[0]);
+ } catch (ArrayIndexOutOfBoundsException e) {
+ throw new RuntimeException("Argument is expected for '" + ca[0] + "'");
+ }
}
return ca[0];
--- a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/SALauncher.java Tue Mar 15 10:11:02 2016 +0100
+++ b/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/SALauncher.java Tue Mar 15 15:29:42 2016 +0100
@@ -111,18 +111,53 @@
return launcherHelp();
}
+ private static void buildAttachArgs(ArrayList<String> newArgs,
+ String pid, String exe, String core) {
+ if ((pid == null) && (exe == null)) {
+ throw new IllegalArgumentException(
+ "You have to set --pid or --exe.");
+ }
+
+ if (pid != null) { // Attach to live process
+ if (exe != null) {
+ throw new IllegalArgumentException(
+ "Unnecessary argument: --exe");
+ } else if (core != null) {
+ throw new IllegalArgumentException(
+ "Unnecessary argument: --core");
+ } else if (!pid.matches("^\\d+$")) {
+ throw new IllegalArgumentException("Invalid pid: " + pid);
+ }
+
+ newArgs.add(pid);
+ } else {
+ if (exe.length() == 0) {
+ throw new IllegalArgumentException("You have to set --exe.");
+ }
+
+ newArgs.add(exe);
+
+ if ((core == null) || (core.length() == 0)) {
+ throw new IllegalArgumentException("You have to set --core.");
+ }
+
+ newArgs.add(core);
+ }
+ }
+
private static void runCLHSDB(String[] oldArgs) {
SAGetopt sg = new SAGetopt(oldArgs);
String[] longOpts = {"exe=", "core=", "pid="};
ArrayList<String> newArgs = new ArrayList();
- String exeORpid = null;
+ String pid = null;
+ String exe = null;
String core = null;
String s = null;
while((s = sg.next(null, longOpts)) != null) {
if (s.equals("exe")) {
- exeORpid = sg.getOptarg();
+ exe = sg.getOptarg();
continue;
}
if (s.equals("core")) {
@@ -130,17 +165,12 @@
continue;
}
if (s.equals("pid")) {
- exeORpid = sg.getOptarg();
+ pid = sg.getOptarg();
continue;
}
}
- if (exeORpid != null) {
- newArgs.add(exeORpid);
- if (core != null) {
- newArgs.add(core);
- }
- }
+ buildAttachArgs(newArgs, pid, exe, core);
CLHSDB.main(newArgs.toArray(new String[newArgs.size()]));
}
@@ -149,13 +179,14 @@
String[] longOpts = {"exe=", "core=", "pid="};
ArrayList<String> newArgs = new ArrayList();
- String exeORpid = null;
+ String pid = null;
+ String exe = null;
String core = null;
String s = null;
while((s = sg.next(null, longOpts)) != null) {
if (s.equals("exe")) {
- exeORpid = sg.getOptarg();
+ exe = sg.getOptarg();
continue;
}
if (s.equals("core")) {
@@ -163,17 +194,12 @@
continue;
}
if (s.equals("pid")) {
- exeORpid = sg.getOptarg();
+ pid = sg.getOptarg();
continue;
}
}
- if (exeORpid != null) {
- newArgs.add(exeORpid);
- if (core != null) {
- newArgs.add(core);
- }
- }
+ buildAttachArgs(newArgs, pid, exe, core);
HSDB.main(newArgs.toArray(new String[newArgs.size()]));
}
@@ -183,13 +209,14 @@
"mixed", "locks"};
ArrayList<String> newArgs = new ArrayList();
- String exeORpid = null;
+ String pid = null;
+ String exe = null;
String core = null;
String s = null;
while((s = sg.next(null, longOpts)) != null) {
if (s.equals("exe")) {
- exeORpid = sg.getOptarg();
+ exe = sg.getOptarg();
continue;
}
if (s.equals("core")) {
@@ -197,7 +224,7 @@
continue;
}
if (s.equals("pid")) {
- exeORpid = sg.getOptarg();
+ pid = sg.getOptarg();
continue;
}
if (s.equals("mixed")) {
@@ -210,13 +237,7 @@
}
}
- if (exeORpid != null) {
- newArgs.add(exeORpid);
- if (core != null) {
- newArgs.add(core);
- }
- }
-
+ buildAttachArgs(newArgs, pid, exe, core);
JStack.main(newArgs.toArray(new String[newArgs.size()]));
}
@@ -226,13 +247,14 @@
"heap", "binaryheap", "histo", "clstats", "finalizerinfo"};
ArrayList<String> newArgs = new ArrayList();
- String exeORpid = null;
+ String pid = null;
+ String exe = null;
String core = null;
String s = null;
while((s = sg.next(null, longOpts)) != null) {
if (s.equals("exe")) {
- exeORpid = sg.getOptarg();
+ exe = sg.getOptarg();
continue;
}
if (s.equals("core")) {
@@ -240,7 +262,7 @@
continue;
}
if (s.equals("pid")) {
- exeORpid = sg.getOptarg();
+ pid = sg.getOptarg();
continue;
}
if (s.equals("heap")) {
@@ -265,13 +287,7 @@
}
}
- if (exeORpid != null) {
- newArgs.add(exeORpid);
- if (core != null) {
- newArgs.add(core);
- }
- }
-
+ buildAttachArgs(newArgs, pid, exe, core);
JMap.main(newArgs.toArray(new String[newArgs.size()]));
}
@@ -281,13 +297,14 @@
"flags", "sysprops"};
ArrayList<String> newArgs = new ArrayList();
- String exeORpid = null;
+ String exe = null;
+ String pid = null;
String core = null;
String s = null;
while((s = sg.next(null, longOpts)) != null) {
if (s.equals("exe")) {
- exeORpid = sg.getOptarg();
+ exe = sg.getOptarg();
continue;
}
if (s.equals("core")) {
@@ -295,7 +312,7 @@
continue;
}
if (s.equals("pid")) {
- exeORpid = sg.getOptarg();
+ pid = sg.getOptarg();
continue;
}
if (s.equals("flags")) {
@@ -308,13 +325,7 @@
}
}
- if (exeORpid != null) {
- newArgs.add(exeORpid);
- if (core != null) {
- newArgs.add(core);
- }
- }
-
+ buildAttachArgs(newArgs, pid, exe, core);
JInfo.main(newArgs.toArray(new String[newArgs.size()]));
}
@@ -323,13 +334,14 @@
String[] longOpts = {"exe=", "core=", "pid="};
ArrayList<String> newArgs = new ArrayList();
- String exeORpid = null;
+ String exe = null;
+ String pid = null;
String core = null;
String s = null;
while((s = sg.next(null, longOpts)) != null) {
if (s.equals("exe")) {
- exeORpid = sg.getOptarg();
+ exe = sg.getOptarg();
continue;
}
if (s.equals("core")) {
@@ -337,18 +349,12 @@
continue;
}
if (s.equals("pid")) {
- exeORpid = sg.getOptarg();
+ pid = sg.getOptarg();
continue;
}
}
- if (exeORpid != null) {
- newArgs.add(exeORpid);
- if (core != null) {
- newArgs.add(core);
- }
- }
-
+ buildAttachArgs(newArgs, pid, exe, core);
JSnap.main(newArgs.toArray(new String[newArgs.size()]));
}
@@ -373,36 +379,43 @@
String[] oldArgs = Arrays.copyOfRange(args, 1, args.length);
- // Run SA interactive mode
- if (args[0].equals("clhsdb")) {
- runCLHSDB(oldArgs);
- return;
- }
+ try {
+ // Run SA interactive mode
+ if (args[0].equals("clhsdb")) {
+ runCLHSDB(oldArgs);
+ return;
+ }
- if (args[0].equals("hsdb")) {
- runHSDB(oldArgs);
- return;
- }
+ if (args[0].equals("hsdb")) {
+ runHSDB(oldArgs);
+ return;
+ }
+
+ // Run SA tmtools mode
+ if (args[0].equals("jstack")) {
+ runJSTACK(oldArgs);
+ return;
+ }
- // Run SA tmtools mode
- if (args[0].equals("jstack")) {
- runJSTACK(oldArgs);
- return;
- }
+ if (args[0].equals("jmap")) {
+ runJMAP(oldArgs);
+ return;
+ }
+
+ if (args[0].equals("jinfo")) {
+ runJINFO(oldArgs);
+ return;
+ }
- if (args[0].equals("jmap")) {
- runJMAP(oldArgs);
- return;
- }
+ if (args[0].equals("jsnap")) {
+ runJSNAP(oldArgs);
+ return;
+ }
- if (args[0].equals("jinfo")) {
- runJINFO(oldArgs);
- return;
- }
-
- if (args[0].equals("jsnap")) {
- runJSNAP(oldArgs);
- return;
+ throw new IllegalArgumentException("Unknown tool: " + args[0]);
+ } catch (Exception e) {
+ System.err.println(e.getMessage());
+ toolHelp(args[0]);
}
}
}
--- a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GCCause.java Tue Mar 15 10:11:02 2016 +0100
+++ b/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/shared/GCCause.java Tue Mar 15 15:29:42 2016 +0100
@@ -35,6 +35,10 @@
_gc_locker ("GCLocker Initiated GC"),
_heap_inspection ("Heap Inspection Initiated GC"),
_heap_dump ("Heap Dump Initiated GC"),
+ _wb_young_gc ("WhiteBox Initiated Young GC"),
+ _wb_conc_mark ("WhiteBox Initiated Concurrent Mark"),
+ _update_allocation_context_stats_inc ("Update Allocation Context Stats"),
+ _update_allocation_context_stats_full ("Update Allocation Context Stats"),
_no_gc ("No GC"),
_no_cause_specified ("Unknown GCCause"),
@@ -56,6 +60,9 @@
_g1_humongous_allocation ("G1 Humongous Allocation"),
_last_ditch_collection ("Last ditch collection"),
+
+ _dcmd_gc_run ("Diagnostic Command"),
+
_last_gc_cause ("ILLEGAL VALUE - last gc cause - ILLEGAL VALUE");
private final String value;
--- a/hotspot/src/os/linux/vm/os_linux.cpp Tue Mar 15 10:11:02 2016 +0100
+++ b/hotspot/src/os/linux/vm/os_linux.cpp Tue Mar 15 15:29:42 2016 +0100
@@ -881,6 +881,13 @@
assert(osthread != NULL, "osthread not set");
if (Thread::current()->osthread() == osthread) {
+#ifdef ASSERT
+ sigset_t current;
+ sigemptyset(¤t);
+ pthread_sigmask(SIG_SETMASK, NULL, ¤t);
+ assert(!sigismember(¤t, SR_signum), "SR signal should not be blocked!");
+#endif
+
// Restore caller's signal mask
sigset_t sigmask = osthread->caller_sigmask();
pthread_sigmask(SIG_SETMASK, &sigmask, NULL);
@@ -3903,7 +3910,8 @@
// after sigsuspend.
int old_errno = errno;
- Thread* thread = Thread::current();
+ Thread* thread = Thread::current_or_null_safe();
+ assert(thread != NULL, "Missing current thread in SR_handler");
OSThread* osthread = thread->osthread();
assert(thread->is_VM_thread() || thread->is_Java_thread(), "Must be VMThread or JavaThread");
@@ -3915,7 +3923,7 @@
os::SuspendResume::State state = osthread->sr.suspended();
if (state == os::SuspendResume::SR_SUSPENDED) {
sigset_t suspend_set; // signals for sigsuspend()
-
+ sigemptyset(&suspend_set);
// get current set of blocked signals and unblock resume signal
pthread_sigmask(SIG_BLOCK, NULL, &suspend_set);
sigdelset(&suspend_set, SR_signum);
@@ -4169,6 +4177,7 @@
// try to honor the signal mask
sigset_t oset;
+ sigemptyset(&oset);
pthread_sigmask(SIG_SETMASK, &(actp->sa_mask), &oset);
// call into the chained handler
@@ -4179,7 +4188,7 @@
}
// restore the signal mask
- pthread_sigmask(SIG_SETMASK, &oset, 0);
+ pthread_sigmask(SIG_SETMASK, &oset, NULL);
}
// Tell jvm's signal handler the signal is taken care of.
return true;
@@ -5716,6 +5725,7 @@
// Don't catch signals while blocked; let the running threads have the signals.
// (This allows a debugger to break into the running thread.)
sigset_t oldsigs;
+ sigemptyset(&oldsigs);
sigset_t* allowdebug_blocked = os::Linux::allowdebug_blocked_signals();
pthread_sigmask(SIG_BLOCK, allowdebug_blocked, &oldsigs);
#endif
--- a/hotspot/src/share/vm/gc/g1/g1HeapTransition.cpp Tue Mar 15 10:11:02 2016 +0100
+++ b/hotspot/src/share/vm/gc/g1/g1HeapTransition.cpp Tue Mar 15 15:29:42 2016 +0100
@@ -82,8 +82,8 @@
void G1HeapTransition::print() {
Data after(_g1_heap);
- size_t eden_capacity_bytes_after_gc = _g1_heap->g1_policy()->young_list_target_length() - after._survivor_length;
- size_t survivor_capacity_bytes_after_gc = _g1_heap->g1_policy()->max_survivor_regions();
+ size_t eden_capacity_length_after_gc = _g1_heap->g1_policy()->young_list_target_length() - after._survivor_length;
+ size_t survivor_capacity_length_after_gc = _g1_heap->g1_policy()->max_survivor_regions();
DetailedUsage usage;
if (log_is_enabled(Trace, gc, heap)) {
@@ -100,11 +100,11 @@
}
log_info(gc, heap)("Eden regions: " SIZE_FORMAT "->" SIZE_FORMAT "(" SIZE_FORMAT ")",
- _before._eden_length, after._eden_length, eden_capacity_bytes_after_gc);
+ _before._eden_length, after._eden_length, eden_capacity_length_after_gc);
log_trace(gc, heap)(" Used: 0K, Waste: 0K");
log_info(gc, heap)("Survivor regions: " SIZE_FORMAT "->" SIZE_FORMAT "(" SIZE_FORMAT ")",
- _before._survivor_length, after._survivor_length, survivor_capacity_bytes_after_gc);
+ _before._survivor_length, after._survivor_length, survivor_capacity_length_after_gc);
log_trace(gc, heap)(" Used: " SIZE_FORMAT "K, Waste: " SIZE_FORMAT "K",
usage._survivor_used / K, ((after._survivor_length * HeapRegion::GrainBytes) - usage._survivor_used) / K);
--- a/hotspot/src/share/vm/gc/shared/gcCause.hpp Tue Mar 15 10:11:02 2016 +0100
+++ b/hotspot/src/share/vm/gc/shared/gcCause.hpp Tue Mar 15 15:29:42 2016 +0100
@@ -33,6 +33,9 @@
// use of this class grows, we should split it into public
// and implementation-private "causes".
//
+// The definitions in the SA code should be kept in sync
+// with the definitions here.
+//
class GCCause : public AllStatic {
public:
--- a/hotspot/test/gc/arguments/TestSelectDefaultGC.java Tue Mar 15 10:11:02 2016 +0100
+++ b/hotspot/test/gc/arguments/TestSelectDefaultGC.java Tue Mar 15 15:29:42 2016 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -27,9 +27,9 @@
* @bug 8068582
* @key gc
* @library /testlibrary
+ * @requires vm.gc=="null"
* @modules java.base/sun.misc
* java.management
- * @ignore 8148239
* @run driver TestSelectDefaultGC
*/
@@ -41,24 +41,40 @@
output.shouldMatch(" " + option + " .*=.* " + value + " ");
}
- public static void main(String[] args) throws Exception {
+ public static void testDefaultGC(boolean actAsServer) throws Exception {
+ String[] args = new String[] {
+ "-XX:" + (actAsServer ? "+" : "-") + "AlwaysActAsServerClassMachine",
+ "-XX:" + (actAsServer ? "-" : "+") + "NeverActAsServerClassMachine",
+ "-XX:+PrintFlagsFinal",
+ "-version"
+ };
+
// Start VM without specifying GC
- ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+PrintFlagsFinal", "-version");
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(args);
OutputAnalyzer output = new OutputAnalyzer(pb.start());
output.shouldHaveExitValue(0);
- boolean isServerVM = Platform.isServer();
- boolean isEmbeddedVM = Platform.isEmbedded();
+ final boolean isServer = actAsServer;
+ final boolean isEmbedded = Platform.isEmbedded();
// Verify GC selection
- // G1 is default for non-embedded server VMs
- assertVMOption(output, "UseG1GC", isServerVM && !isEmbeddedVM);
- // Parallel is default for embedded server VMs
- assertVMOption(output, "UseParallelGC", isServerVM && isEmbeddedVM);
- assertVMOption(output, "UseParallelOldGC", isServerVM && isEmbeddedVM);
- // Serial is default for non-server VMs
- assertVMOption(output, "UseSerialGC", !isServerVM);
+ // 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);
+ // Serial is default for non-server class machines
+ assertVMOption(output, "UseSerialGC", !isServer);
+ // CMS is never default
assertVMOption(output, "UseConcMarkSweepGC", false);
assertVMOption(output, "UseParNewGC", false);
}
+
+ public static void main(String[] args) throws Exception {
+ // Test server class machine
+ testDefaultGC(false);
+
+ // Test non-server class machine
+ testDefaultGC(true);
+ }
}