diff src/share/vm/runtime/arguments.cpp @ 13083:6f206b5d258f

Merge
author drchase
date Thu, 14 Nov 2013 13:38:49 -0800
parents 8f07aa079343 78da3894b86f
children 096c224171c4 eae426d683f6 da862781b584
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp	Thu Nov 14 21:05:16 2013 +0100
+++ b/src/share/vm/runtime/arguments.cpp	Thu Nov 14 13:38:49 2013 -0800
@@ -1132,9 +1132,6 @@
     Tier3InvokeNotifyFreqLog = 0;
     Tier4InvocationThreshold = 0;
   }
-  if (FLAG_IS_DEFAULT(NmethodSweepFraction)) {
-    FLAG_SET_DEFAULT(NmethodSweepFraction, 1 + ReservedCodeCacheSize / (16 * M));
-  }
 }
 
 #if INCLUDE_ALL_GCS
@@ -3648,6 +3645,11 @@
         "Incompatible compilation policy selected", NULL);
     }
   }
+  // Set NmethodSweepFraction after the size of the code cache is adapted (in case of tiered)
+  if (FLAG_IS_DEFAULT(NmethodSweepFraction)) {
+    FLAG_SET_DEFAULT(NmethodSweepFraction, 1 + ReservedCodeCacheSize / (16 * M));
+  }
+
 
   // Set heap size based on available physical memory
   set_heap_size();