Mercurial > hg > truffle

changeset 14698:ea104a115537

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author ehelin
date Tue, 11 Mar 2014 15:14:46 +0100
parents bac9ef65b71d (diff) 7380034e5b31 (current diff)
children 686d782d6121
files
diffstat 2 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/memory/collectorPolicy.cpp	Mon Mar 03 13:58:52 2014 -0500
+++ b/src/share/vm/memory/collectorPolicy.cpp	Tue Mar 11 15:14:46 2014 +0100
@@ -304,10 +304,13 @@
   }
 
   // Now take the actual NewSize into account. We will silently increase NewSize
-  // if the user specified a smaller value.
+  // if the user specified a smaller or unaligned value.
   smallest_new_size = MAX2(smallest_new_size, (uintx)align_size_down(NewSize, _gen_alignment));
   if (smallest_new_size != NewSize) {
-    FLAG_SET_ERGO(uintx, NewSize, smallest_new_size);
+    // Do not use FLAG_SET_ERGO to update NewSize here, since this will override
+    // if NewSize was set on the command line or not. This information is needed
+    // later when setting the initial and minimum young generation size.
+    NewSize = smallest_new_size;
   }
   _initial_gen0_size = NewSize;
 
--- a/src/share/vm/runtime/timer.cpp	Mon Mar 03 13:58:52 2014 -0500
+++ b/src/share/vm/runtime/timer.cpp	Tue Mar 11 15:14:46 2014 +0100
@@ -194,7 +194,7 @@
         system_secs = system_time - _starting_system_time;
         real_secs = real_time - _starting_real_time;
 
-        _logfile->print(" [Times: user=%3.2f sys=%3.2f, real=%3.2f secs] ",
+        _logfile->print(" [Times: user=%3.2f sys=%3.2f real=%3.2f secs] ",
           user_secs, system_secs, real_secs);
 
       } else {