# HG changeset patch
# User Yasumasa Suenaga  <yasuenag@gmail.com>
# Date 1484578598 -32400
# Node ID d766054a28eee65c81602629afc8bb5ba6b4341b
# Parent  2b0645fd51d3a96b5b4b4f352f50962507c605f3
Bug 3285: JVM aborted on assert code at MonitorContended JVMTI event
Reviewed-by: ykubota
https://github.com/HeapStats/heapstats/pull/73

diff -r 2b0645fd51d3 -r d766054a28ee agent/ChangeLog
--- a/agent/ChangeLog	Mon Jan 16 18:24:50 2017 +0900
+++ b/agent/ChangeLog	Mon Jan 16 23:56:38 2017 +0900
@@ -1,6 +1,7 @@
 2017-01-16 Yasumasa Suenaga  <yasuenag@gmail.com>
 
 	* Bug 3104: SEGV in TSnapShotContainer::mergeChildren with Oracle JDK8u92
+	* Bug 3285: JVM aborted on assert code at MonitorContended JVMTI event
 
 2016-11-24  KUBOTA Yuji <kubota.yuji@lab.ntt.co.jp>
 
diff -r 2b0645fd51d3 -r d766054a28ee agent/heapstats.conf.in
--- a/agent/heapstats.conf.in	Mon Jan 16 18:24:50 2017 +0900
+++ b/agent/heapstats.conf.in	Mon Jan 16 23:56:38 2017 +0900
@@ -16,7 +16,10 @@
 # Trigger logging setting
 trigger_on_logerror=true
 trigger_on_logsignal=true
-trigger_on_loglock=true
+
+# This feature is experimental. It might be a cause of HotSpot internal error
+# when you set this flag to true.
+trigger_on_loglock=false
 
 # Rank setting
 rank_level=5
diff -r 2b0645fd51d3 -r d766054a28ee agent/src/util.cpp
--- a/agent/src/util.cpp	Mon Jan 16 18:24:50 2017 +0900
+++ b/agent/src/util.cpp	Mon Jan 16 23:56:38 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
@@ -160,7 +160,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. */
@@ -741,10 +741,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. */