changeset 69:8a678cb965cc

Bug 3285: JVM aborted on assert code at MonitorContended JVMTI event Reviewed-by: ykubota https://github.com/HeapStats/heapstats/pull/73
author Yasumasa Suenaga <yasuenag@gmail.com>
date Mon, 16 Jan 2017 23:57:55 +0900
parents 95148c96fb6a
children 9db2ed159a6f
files agent/ChangeLog agent/heapstats.conf.in agent/src/util.cpp
diffstat 3 files changed, 11 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/agent/ChangeLog	Thu Nov 24 14:44:31 2016 +0900
+++ b/agent/ChangeLog	Mon Jan 16 23:57:55 2017 +0900
@@ -1,3 +1,7 @@
+2017-01-16 Yasumasa Suenaga  <yasuenag@gmail.com>
+
+	* Bug 3285: JVM aborted on assert code at MonitorContended JVMTI event
+
 2016-11-24 KUBOTA Yuji  <kubota.yuji@lab.ntt.co.jp>
 
 	* Bump to 1.0.6
--- a/agent/heapstats.conf.in	Thu Nov 24 14:44:31 2016 +0900
+++ b/agent/heapstats.conf.in	Mon Jan 16 23:57:55 2017 +0900
@@ -15,6 +15,9 @@
 // Trigger logging setting
 trigger_on_logerror=true
 trigger_on_logsignal=true
+
+// This feature is experimental. It might be a cause of HotSpot internal error
+// when you set this flag to true.
 trigger_on_loglock=true
 
 // Rank setting
--- a/agent/src/util.cpp	Thu Nov 24 14:44:31 2016 +0900
+++ b/agent/src/util.cpp	Mon Jan 16 23:57:55 2017 +0900
@@ -1,7 +1,7 @@
 /*!
  * \file util.cpp
  * \brief This file is utilities.
- * Copyright (C) 2011-2014 Nippon Telegraph and Telephone Corporation
+ * Copyright (C) 2011-2017 Nippon Telegraph and Telephone Corporation
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -150,7 +150,7 @@
   arg.triggerOnDump      = true;
   arg.triggerOnLogError  = true;
   arg.triggerOnLogSignal = true;
-  arg.triggerOnLogLock   = true;
+  arg.triggerOnLogLock   = false;
   arg.order              = DELTA;
   arg.AlertPercentage    = 50;
   arg.AlertThreshold     = 0; /* Alert disabled. */
@@ -708,10 +708,10 @@
   
   if (arg.triggerOnLogLock) {
     PRINT_INFO_MSG_HEADER_NOIF
-      << "Log Trigger on Deadlock = true" << NEWLINE;
+      << "Log Trigger on Deadlock (experimental feature) = true" << NEWLINE;
   } else {
     PRINT_INFO_MSG_HEADER_NOIF
-      << "Log Trigger on Deadlock = false" << NEWLINE;
+      << "Log Trigger on Deadlock (experimental feature) = false" << NEWLINE;
   }
   
   /* Output about ranking. */