Mercurial > hg > graal-jvmci-8
comparison src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp @ 20804:7848fc12602b
Merge with jdk8u40-b25
author | Gilles Duboscq <gilles.m.duboscq@oracle.com> |
---|---|
date | Tue, 07 Apr 2015 14:58:49 +0200 |
parents | 833b0f92429a |
children |
comparison
equal
deleted
inserted
replaced
20184:84105dcdb05b | 20804:7848fc12602b |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * | 4 * |
5 * This code is free software; you can redistribute it and/or modify it | 5 * This code is free software; you can redistribute it and/or modify it |
6 * under the terms of the GNU General Public License version 2 only, as | 6 * under the terms of the GNU General Public License version 2 only, as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
51 _space_alignment = _gen_alignment = (uintx)Generation::GenGrain; | 51 _space_alignment = _gen_alignment = (uintx)Generation::GenGrain; |
52 _heap_alignment = compute_heap_alignment(); | 52 _heap_alignment = compute_heap_alignment(); |
53 } | 53 } |
54 | 54 |
55 void ConcurrentMarkSweepPolicy::initialize_generations() { | 55 void ConcurrentMarkSweepPolicy::initialize_generations() { |
56 _generations = NEW_C_HEAP_ARRAY3(GenerationSpecPtr, number_of_generations(), mtGC, 0, AllocFailStrategy::RETURN_NULL); | 56 _generations = NEW_C_HEAP_ARRAY3(GenerationSpecPtr, number_of_generations(), mtGC, |
57 CURRENT_PC, AllocFailStrategy::RETURN_NULL); | |
57 if (_generations == NULL) | 58 if (_generations == NULL) |
58 vm_exit_during_initialization("Unable to allocate gen spec"); | 59 vm_exit_during_initialization("Unable to allocate gen spec"); |
59 | 60 |
60 if (UseParNewGC) { | 61 if (UseParNewGC) { |
61 if (UseAdaptiveSizePolicy) { | 62 if (UseAdaptiveSizePolicy) { |