# HG changeset patch
# User KUBOTA Yuji <kubota.yuji@lab.ntt.co.jp>
# Date 1510116068 -32400
# Node ID ca86f078eb34c3146f0bb4546464573a54f3e9f4
# Parent  7c3bea2249ab0e356f14d652165d32578927f584
Bug 3491: Fix potential error when conflict between VMDeath and interval logging
Reviewed-by: yasuenag
https://github.com/HeapStats/heapstats/pull/126

diff -r 7c3bea2249ab -r ca86f078eb34 ChangeLog
--- a/ChangeLog	Wed Nov 01 13:11:23 2017 +0900
+++ b/ChangeLog	Wed Nov 08 13:41:08 2017 +0900
@@ -1,3 +1,7 @@
+2017-11-08 KUBOTA Yuji <kubota.yuji@lab.ntt.co.jp>
+
+	* Bug 3491: Fix potential error when conflict between VMDeath and interval logging
+
 2017-11-01 Yasumasa Suenaga <yasuenag@gmail.com>
 
 	* Bug 3458: Temp directory for ArchiveData is not removed when exiting
diff -r 7c3bea2249ab -r ca86f078eb34 agent/src/heapstats-engines/logMain.cpp
--- a/agent/src/heapstats-engines/logMain.cpp	Wed Nov 01 13:11:23 2017 +0900
+++ b/agent/src/heapstats-engines/logMain.cpp	Wed Nov 08 13:41:08 2017 +0900
@@ -105,6 +105,8 @@
  *                   This value is always Interval.
  */
 void intervalLogProc(jvmtiEnv *jvmti, JNIEnv *env, TInvokeCause cause) {
+  TProcessMark mark(processing);
+
   /* Call collect log by interval. */
   if (unlikely(!TakeLogInfo(jvmti, env, cause,
                             (TMSecTime)getNowTimeSec(), ""))) {