1.1 --- a/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.cpp Mon Oct 21 18:56:20 2013 +0200
1.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.cpp Fri Nov 01 17:09:38 2013 +0100
1.3 @@ -75,7 +75,7 @@
1.4 "generation size limit is wrong");
1.5 ParallelScavengeHeap* heap = (ParallelScavengeHeap*)Universe::heap();
1.6 size_t result = gen_size_limit() - current_committed_size;
1.7 - size_t result_aligned = align_size_down(result, heap->young_gen_alignment());
1.8 + size_t result_aligned = align_size_down(result, heap->generation_alignment());
1.9 return result_aligned;
1.10 }
1.11
1.12 @@ -92,8 +92,8 @@
1.13 if (eden_space()->is_empty()) {
1.14 // Respect the minimum size for eden and for the young gen as a whole.
1.15 ParallelScavengeHeap* heap = (ParallelScavengeHeap*)Universe::heap();
1.16 - const size_t eden_alignment = heap->intra_heap_alignment();
1.17 - const size_t gen_alignment = heap->young_gen_alignment();
1.18 + const size_t eden_alignment = heap->space_alignment();
1.19 + const size_t gen_alignment = heap->generation_alignment();
1.20
1.21 assert(eden_space()->capacity_in_bytes() >= eden_alignment,
1.22 "Alignment is wrong");
1.23 @@ -129,7 +129,7 @@
1.24 // to_space can be.
1.25 size_t ASPSYoungGen::available_to_live() {
1.26 ParallelScavengeHeap* heap = (ParallelScavengeHeap*)Universe::heap();
1.27 - const size_t alignment = heap->intra_heap_alignment();
1.28 + const size_t alignment = heap->space_alignment();
1.29
1.30 // Include any space that is committed but is not in eden.
1.31 size_t available = pointer_delta(eden_space()->bottom(),
1.32 @@ -293,7 +293,7 @@
1.33 assert(eden_start < from_start, "Cannot push into from_space");
1.34
1.35 ParallelScavengeHeap* heap = (ParallelScavengeHeap*)Universe::heap();
1.36 - const size_t alignment = heap->intra_heap_alignment();
1.37 + const size_t alignment = heap->space_alignment();
1.38 const bool maintain_minimum =
1.39 (requested_eden_size + 2 * requested_survivor_size) <= min_gen_size();
1.40
