# HG changeset patch
# User zgu
# Date 1373628952 25200
# Node ID 5f056abe17c663205c1bdd4b4db01f6c40a958cd
# Parent  c9a5fab392345759d9f26f087ed04837cf09cc9c# Parent  dbc0b5dc08f5bdc7d6edadae93c0ce74775d69f4
Merge

diff -r dbc0b5dc08f5 -r 5f056abe17c6 src/share/vm/services/memTracker.cpp
--- a/src/share/vm/services/memTracker.cpp	Wed Jul 10 15:49:15 2013 +0000
+++ b/src/share/vm/services/memTracker.cpp	Fri Jul 12 04:35:52 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