/hg/icedtea7-forest/hotspot: 3 new changesets

[andrew at icedtea.classpath.org]

changeset f631660ef0a3 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=f631660ef0a3
author: dbuck
date: Fri Aug 11 23:51:07 2017 -0400

	8185164, PR3433: GetOwnedMonitorInfo() returns incorrect owned monitor
	Summary: The GetOwnedMonitorInfo() should not return a pending monitor
	Reviewed-by: dcubed


changeset 3413fb2061fb in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=3413fb2061fb
author: kevinw
date: Wed Oct 25 17:09:59 2017 +0100

	8138745, PR3465, RH1484399: Implement ExitOnOutOfMemory and CrashOnOutOfMemory in HotSpot
	Reviewed-by: dholmes
	Contributed-by: cheleswer.sahu at oracle.com


changeset 4e2348c9ec42 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=4e2348c9ec42
author: andrew
date: Sun Nov 12 23:18:51 2017 +0000

	Added tag icedtea-2.7.0pre15 for changeset 3413fb2061fb


diffstat:

 .hgtags                                |   1 +
 src/share/vm/runtime/globals.hpp       |   7 +++++++
 src/share/vm/runtime/objectMonitor.cpp |   4 ++--
 src/share/vm/utilities/debug.cpp       |  12 +++++++++++-
 4 files changed, 21 insertions(+), 3 deletions(-)

diffs (73 lines):

diff -r f3d363f40e8b -r 4e2348c9ec42 .hgtags
--- a/.hgtags	Mon Sep 11 19:03:30 2017 +0100
+++ b/.hgtags	Sun Nov 12 23:18:51 2017 +0000
@@ -905,3 +905,4 @@
 75662a7ec1719b3133636d09bd078968579a55ab jdk7u151-b00
 d0c7cea0660f7a8188a7b8c1f6d1a6c8d6388fb0 jdk7u151-b01
 46d12689c87023b51d55e45434d34c55dc1399f8 icedtea-2.7.0pre14
+3413fb2061fb1a4bb866e4af5d2b3f0270aadcfd icedtea-2.7.0pre15
diff -r f3d363f40e8b -r 4e2348c9ec42 src/share/vm/runtime/globals.hpp
--- a/src/share/vm/runtime/globals.hpp	Mon Sep 11 19:03:30 2017 +0100
+++ b/src/share/vm/runtime/globals.hpp	Sun Nov 12 23:18:51 2017 +0000
@@ -1247,6 +1247,13 @@
           "in perm.  This purely intended to allow debugging issues"        \
           "in production.")                                                 \
                                                                             \
+  product(bool, ExitOnOutOfMemoryError, false,                              \
+          "JVM exits on the first occurrence of an out-of-memory error")    \
+                                                                            \
+  product(bool, CrashOnOutOfMemoryError, false,                             \
+          "JVM aborts, producing an error log and core/mini dump, on the "  \
+          "first occurrence of an out-of-memory error")                     \
+                                                                            \
   /* tracing */                                                             \
                                                                             \
   notproduct(bool, TraceRuntimeCalls, false,                                \
diff -r f3d363f40e8b -r 4e2348c9ec42 src/share/vm/runtime/objectMonitor.cpp
--- a/src/share/vm/runtime/objectMonitor.cpp	Mon Sep 11 19:03:30 2017 +0100
+++ b/src/share/vm/runtime/objectMonitor.cpp	Sun Nov 12 23:18:51 2017 +0000
@@ -379,6 +379,8 @@
   { // Change java thread status to indicate blocked on monitor enter.
     JavaThreadBlockedOnMonitorEnterState jtbmes(jt, this);
 
+    Self->set_current_pending_monitor(this);
+
     DTRACE_MONITOR_PROBE(contended__enter, this, object(), jt);
     if (JvmtiExport::should_post_monitor_contended_enter()) {
       JvmtiExport::post_monitor_contended_enter(jt, this);
@@ -393,8 +395,6 @@
     OSThreadContendState osts(Self->osthread());
     ThreadBlockInVM tbivm(jt);
 
-    Self->set_current_pending_monitor(this);
-
     // TODO-FIXME: change the following for(;;) loop to straight-line code.
     for (;;) {
       jt->set_suspend_equivalent();
diff -r f3d363f40e8b -r 4e2348c9ec42 src/share/vm/utilities/debug.cpp
--- a/src/share/vm/utilities/debug.cpp	Mon Sep 11 19:03:30 2017 +0100
+++ b/src/share/vm/utilities/debug.cpp	Sun Nov 12 23:18:51 2017 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -317,6 +317,16 @@
       VMError err(message);
       err.report_java_out_of_memory();
     }
+
+    if (CrashOnOutOfMemoryError) {
+      tty->print_cr("Aborting due to java.lang.OutOfMemoryError: %s", message);
+      fatal(err_msg("OutOfMemory encountered: %s", message));
+    }
+
+    if (ExitOnOutOfMemoryError) {
+      tty->print_cr("Terminating due to java.lang.OutOfMemoryError: %s", message);
+      exit(3);
+    }
   }
 }