comparison src/share/vm/memory/collectorPolicy.cpp @ 14726:92aa6797d639

Backed out merge changeset: b51e29501f30 Backed out merge revision to its first parent (8f483e200405)
author Doug Simon <doug.simon@oracle.com>
date Mon, 24 Mar 2014 21:30:43 +0100
parents bac9ef65b71d
children
comparison
equal deleted inserted replaced
14719:0bdd0d157040 14726:92aa6797d639
302 _initial_heap_byte_size = smallest_heap_size; 302 _initial_heap_byte_size = smallest_heap_size;
303 } 303 }
304 } 304 }
305 305
306 // Now take the actual NewSize into account. We will silently increase NewSize 306 // Now take the actual NewSize into account. We will silently increase NewSize
307 // if the user specified a smaller or unaligned value. 307 // if the user specified a smaller value.
308 smallest_new_size = MAX2(smallest_new_size, (uintx)align_size_down(NewSize, _gen_alignment)); 308 smallest_new_size = MAX2(smallest_new_size, (uintx)align_size_down(NewSize, _gen_alignment));
309 if (smallest_new_size != NewSize) { 309 if (smallest_new_size != NewSize) {
310 // Do not use FLAG_SET_ERGO to update NewSize here, since this will override 310 FLAG_SET_ERGO(uintx, NewSize, smallest_new_size);
311 // if NewSize was set on the command line or not. This information is needed
312 // later when setting the initial and minimum young generation size.
313 NewSize = smallest_new_size;
314 } 311 }
315 _initial_gen0_size = NewSize; 312 _initial_gen0_size = NewSize;
316 313
317 if (!FLAG_IS_DEFAULT(MaxNewSize)) { 314 if (!FLAG_IS_DEFAULT(MaxNewSize)) {
318 uintx min_new_size = MAX2(_gen_alignment, _min_gen0_size); 315 uintx min_new_size = MAX2(_gen_alignment, _min_gen0_size);