--- old/src/share/vm/memory/generationSpec.hpp 2015-05-12 11:57:25.721284452 +0200 +++ /dev/null 2015-03-18 17:10:38.111854831 +0100 @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2001, 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_MEMORY_GENERATIONSPEC_HPP -#define SHARE_VM_MEMORY_GENERATIONSPEC_HPP - -#include "memory/generation.hpp" - -// The specification of a generation. This class also encapsulates -// some generation-specific behavior. This is done here rather than as a -// virtual function of Generation because these methods are needed in -// initialization of the Generations. -class GenerationSpec : public CHeapObj { - friend class VMStructs; -private: - Generation::Name _name; - size_t _init_size; - size_t _max_size; - -public: - GenerationSpec(Generation::Name name, size_t init_size, size_t max_size, size_t alignment) : - _name(name), - _init_size(align_size_up(init_size, alignment)), - _max_size(align_size_up(max_size, alignment)) - { } - - Generation* init(ReservedSpace rs, int level, GenRemSet* remset); - - // Accessors - Generation::Name name() const { return _name; } - size_t init_size() const { return _init_size; } - void set_init_size(size_t size) { _init_size = size; } - size_t max_size() const { return _max_size; } - void set_max_size(size_t size) { _max_size = size; } -}; - -typedef GenerationSpec* GenerationSpecPtr; - -#endif // SHARE_VM_MEMORY_GENERATIONSPEC_HPP --- /dev/null 2015-03-18 17:10:38.111854831 +0100 +++ new/src/share/vm/gc/shared/generationSpec.hpp 2015-05-12 11:57:25.489274676 +0200 @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2001, 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_SHARED_GENERATIONSPEC_HPP +#define SHARE_VM_GC_SHARED_GENERATIONSPEC_HPP + +#include "gc/shared/generation.hpp" + +// The specification of a generation. This class also encapsulates +// some generation-specific behavior. This is done here rather than as a +// virtual function of Generation because these methods are needed in +// initialization of the Generations. +class GenerationSpec : public CHeapObj { + friend class VMStructs; +private: + Generation::Name _name; + size_t _init_size; + size_t _max_size; + +public: + GenerationSpec(Generation::Name name, size_t init_size, size_t max_size, size_t alignment) : + _name(name), + _init_size(align_size_up(init_size, alignment)), + _max_size(align_size_up(max_size, alignment)) + { } + + Generation* init(ReservedSpace rs, int level, GenRemSet* remset); + + // Accessors + Generation::Name name() const { return _name; } + size_t init_size() const { return _init_size; } + void set_init_size(size_t size) { _init_size = size; } + size_t max_size() const { return _max_size; } + void set_max_size(size_t size) { _max_size = size; } +}; + +typedef GenerationSpec* GenerationSpecPtr; + +#endif // SHARE_VM_GC_SHARED_GENERATIONSPEC_HPP