--- old/src/share/vm/gc_implementation/shared/immutableSpace.cpp 2015-05-12 11:57:28.006380738 +0200 +++ /dev/null 2015-03-18 17:10:38.111854831 +0100 @@ -1,84 +0,0 @@ -/* - * Copyright (c) 2001, 2014, 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. - * - */ - -#include "precompiled.hpp" -#include "utilities/macros.hpp" -#if INCLUDE_ALL_GCS -#include "gc_implementation/shared/immutableSpace.hpp" -#include "memory/universe.hpp" -#include "oops/oop.inline.hpp" -#endif // INCLUDE_ALL_GCS - -void ImmutableSpace::initialize(MemRegion mr) { - HeapWord* bottom = mr.start(); - HeapWord* end = mr.end(); - - assert(Universe::on_page_boundary(bottom) && Universe::on_page_boundary(end), - "invalid space boundaries"); - - _bottom = bottom; - _end = end; -} - -void ImmutableSpace::oop_iterate(ExtendedOopClosure* cl) { - HeapWord* obj_addr = bottom(); - HeapWord* t = end(); - // Could call objects iterate, but this is easier. - while (obj_addr < t) { - obj_addr += oop(obj_addr)->oop_iterate(cl); - } -} - -void ImmutableSpace::object_iterate(ObjectClosure* cl) { - HeapWord* p = bottom(); - while (p < end()) { - cl->do_object(oop(p)); - p += oop(p)->size(); - } -} - -#ifndef PRODUCT - -void ImmutableSpace::print_short() const { - tty->print(" space " SIZE_FORMAT "K, 100%% used", capacity_in_bytes() / K); -} - -void ImmutableSpace::print() const { - print_short(); - tty->print_cr(" [" INTPTR_FORMAT_W(#-6) "," INTPTR_FORMAT_W(#-6) ")", p2i(bottom()), p2i(end())); -} - -#endif - -void ImmutableSpace::verify() { - HeapWord* p = bottom(); - HeapWord* t = end(); - HeapWord* prev_p = NULL; - while (p < t) { - oop(p)->verify(); - prev_p = p; - p += oop(p)->size(); - } - guarantee(p == end(), "end of last object must match end of space"); -} --- /dev/null 2015-03-18 17:10:38.111854831 +0100 +++ new/src/share/vm/gc/shared/immutableSpace.cpp 2015-05-12 11:57:27.824373069 +0200 @@ -0,0 +1,84 @@ +/* + * 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. + * + */ + +#include "precompiled.hpp" +#include "utilities/macros.hpp" +#if INCLUDE_ALL_GCS +#include "gc/shared/immutableSpace.hpp" +#include "memory/universe.hpp" +#include "oops/oop.inline.hpp" +#endif // INCLUDE_ALL_GCS + +void ImmutableSpace::initialize(MemRegion mr) { + HeapWord* bottom = mr.start(); + HeapWord* end = mr.end(); + + assert(Universe::on_page_boundary(bottom) && Universe::on_page_boundary(end), + "invalid space boundaries"); + + _bottom = bottom; + _end = end; +} + +void ImmutableSpace::oop_iterate(ExtendedOopClosure* cl) { + HeapWord* obj_addr = bottom(); + HeapWord* t = end(); + // Could call objects iterate, but this is easier. + while (obj_addr < t) { + obj_addr += oop(obj_addr)->oop_iterate(cl); + } +} + +void ImmutableSpace::object_iterate(ObjectClosure* cl) { + HeapWord* p = bottom(); + while (p < end()) { + cl->do_object(oop(p)); + p += oop(p)->size(); + } +} + +#ifndef PRODUCT + +void ImmutableSpace::print_short() const { + tty->print(" space " SIZE_FORMAT "K, 100%% used", capacity_in_bytes() / K); +} + +void ImmutableSpace::print() const { + print_short(); + tty->print_cr(" [" INTPTR_FORMAT_W(#-6) "," INTPTR_FORMAT_W(#-6) ")", p2i(bottom()), p2i(end())); +} + +#endif + +void ImmutableSpace::verify() { + HeapWord* p = bottom(); + HeapWord* t = end(); + HeapWord* prev_p = NULL; + while (p < t) { + oop(p)->verify(); + prev_p = p; + p += oop(p)->size(); + } + guarantee(p == end(), "end of last object must match end of space"); +}