Mercurial > hg > truffle
diff src/share/vm/services/memTracker.cpp @ 11152:248c459b2b75
Merge
author | dcubed |
---|---|
date | Thu, 18 Jul 2013 12:05:32 -0700 |
parents | 90d6c221d4e5 c9a5fab39234 |
children | ce8f6bb717c9 |
line wrap: on
line diff
--- a/src/share/vm/services/memTracker.cpp Thu Jul 18 09:35:02 2013 -0700 +++ b/src/share/vm/services/memTracker.cpp Thu Jul 18 12:05:32 2013 -0700 @@ -385,6 +385,7 @@ #define SAFE_SEQUENCE_THRESHOLD 30 #define HIGH_GENERATION_THRESHOLD 60 #define MAX_RECORDER_THREAD_RATIO 30 +#define MAX_RECORDER_PER_THREAD 100 void MemTracker::sync() { assert(_tracking_level > NMT_off, "NMT is not enabled"); @@ -437,6 +438,11 @@ // means that worker thread is lagging behind in processing them. if (!AutoShutdownNMT) { _slowdown_calling_thread = (MemRecorder::_instance_count > MAX_RECORDER_THREAD_RATIO * _thread_count); + } else { + // If auto shutdown is on, enforce MAX_RECORDER_PER_THREAD threshold to prevent OOM + if (MemRecorder::_instance_count >= _thread_count * MAX_RECORDER_PER_THREAD) { + shutdown(NMT_out_of_memory); + } } // check _worker_thread with lock to avoid racing condition