--- old/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.hpp 2015-05-12 11:55:27.073298512 +0200 +++ /dev/null 2015-03-18 17:10:38.111854831 +0100 @@ -1,77 +0,0 @@ -/* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - * - */ - -#ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_ASPSYOUNGGEN_HPP -#define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_ASPSYOUNGGEN_HPP - -#include "gc_implementation/parallelScavenge/objectStartArray.hpp" -#include "gc_implementation/parallelScavenge/psVirtualspace.hpp" -#include "gc_implementation/parallelScavenge/psYoungGen.hpp" -#include "gc_implementation/shared/generationCounters.hpp" -#include "gc_implementation/shared/mutableSpace.hpp" -#include "gc_implementation/shared/spaceCounters.hpp" -#include "gc_implementation/shared/spaceDecorator.hpp" - -class ASPSYoungGen : public PSYoungGen { - friend class VMStructs; - private: - size_t _gen_size_limit; - protected: - virtual size_t available_to_live(); - - public: - ASPSYoungGen(size_t initial_byte_size, - size_t minimum_byte_size, - size_t byte_size_limit); - - ASPSYoungGen(PSVirtualSpace* vs, - size_t initial_byte_size, - size_t minimum_byte_size, - size_t byte_size_limit); - - void initialize(ReservedSpace rs, size_t alignment); - void initialize_virtual_space(ReservedSpace rs, size_t alignment); - - size_t gen_size_limit() { return _gen_size_limit; } - void set_gen_size_limit(size_t v) { _gen_size_limit = v; } - - bool resize_generation(size_t eden_size, size_t survivor_size); - void resize_spaces(size_t eden_size, size_t survivor_size); - - // Adjust eden to be consistent with the virtual space. - void reset_after_change(); - - // Adaptive size policy support - // Return number of bytes that the generation can expand/contract. - size_t available_for_expansion(); - size_t available_for_contraction(); - - // Accessors - void set_reserved(MemRegion v) { _reserved = v; } - - // Printing support - virtual const char* short_name() const { return "ASPSYoungGen"; } -}; - -#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_ASPSYOUNGGEN_HPP --- /dev/null 2015-03-18 17:10:38.111854831 +0100 +++ new/src/share/vm/gc/parallel/asPSYoungGen.hpp 2015-05-12 11:55:26.878290360 +0200 @@ -0,0 +1,77 @@ +/* + * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +#ifndef SHARE_VM_GC_PARALLEL_ASPSYOUNGGEN_HPP +#define SHARE_VM_GC_PARALLEL_ASPSYOUNGGEN_HPP + +#include "gc/parallel/objectStartArray.hpp" +#include "gc/parallel/psVirtualspace.hpp" +#include "gc/parallel/psYoungGen.hpp" +#include "gc/shared/generationCounters.hpp" +#include "gc/shared/mutableSpace.hpp" +#include "gc/shared/spaceCounters.hpp" +#include "gc/shared/spaceDecorator.hpp" + +class ASPSYoungGen : public PSYoungGen { + friend class VMStructs; + private: + size_t _gen_size_limit; + protected: + virtual size_t available_to_live(); + + public: + ASPSYoungGen(size_t initial_byte_size, + size_t minimum_byte_size, + size_t byte_size_limit); + + ASPSYoungGen(PSVirtualSpace* vs, + size_t initial_byte_size, + size_t minimum_byte_size, + size_t byte_size_limit); + + void initialize(ReservedSpace rs, size_t alignment); + void initialize_virtual_space(ReservedSpace rs, size_t alignment); + + size_t gen_size_limit() { return _gen_size_limit; } + void set_gen_size_limit(size_t v) { _gen_size_limit = v; } + + bool resize_generation(size_t eden_size, size_t survivor_size); + void resize_spaces(size_t eden_size, size_t survivor_size); + + // Adjust eden to be consistent with the virtual space. + void reset_after_change(); + + // Adaptive size policy support + // Return number of bytes that the generation can expand/contract. + size_t available_for_expansion(); + size_t available_for_contraction(); + + // Accessors + void set_reserved(MemRegion v) { _reserved = v; } + + // Printing support + virtual const char* short_name() const { return "ASPSYoungGen"; } +}; + +#endif // SHARE_VM_GC_PARALLEL_ASPSYOUNGGEN_HPP