1.1 --- a/src/share/vm/services/memTracker.cpp Thu Jul 18 09:35:02 2013 -0700
1.2 +++ b/src/share/vm/services/memTracker.cpp Thu Jul 18 12:05:32 2013 -0700
1.3 @@ -385,6 +385,7 @@
1.4 #define SAFE_SEQUENCE_THRESHOLD 30
1.5 #define HIGH_GENERATION_THRESHOLD 60
1.6 #define MAX_RECORDER_THREAD_RATIO 30
1.7 +#define MAX_RECORDER_PER_THREAD 100
1.8
1.9 void MemTracker::sync() {
1.10 assert(_tracking_level > NMT_off, "NMT is not enabled");
1.11 @@ -437,6 +438,11 @@
1.12 // means that worker thread is lagging behind in processing them.
1.13 if (!AutoShutdownNMT) {
1.14 _slowdown_calling_thread = (MemRecorder::_instance_count > MAX_RECORDER_THREAD_RATIO * _thread_count);
1.15 + } else {
1.16 + // If auto shutdown is on, enforce MAX_RECORDER_PER_THREAD threshold to prevent OOM
1.17 + if (MemRecorder::_instance_count >= _thread_count * MAX_RECORDER_PER_THREAD) {
1.18 + shutdown(NMT_out_of_memory);
1.19 + }
1.20 }
1.21
1.22 // check _worker_thread with lock to avoid racing condition
