Mon, 20 Jul 2009 08:20:00 -0700
6860920: serialize.cpp shouldn't use objArrayOopDesc::base_offset_in_bytes(T_BYTE)
Summary: serialize.cpp currently uses objArrayOopDesc::base_offset_in_bytes(T_BYTE), which seems to be wrong.
Reviewed-by: coleenp, kvn
duke@435 | 1 | /* |
xdono@631 | 2 | * Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved. |
duke@435 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
duke@435 | 4 | * |
duke@435 | 5 | * This code is free software; you can redistribute it and/or modify it |
duke@435 | 6 | * under the terms of the GNU General Public License version 2 only, as |
duke@435 | 7 | * published by the Free Software Foundation. |
duke@435 | 8 | * |
duke@435 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
duke@435 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
duke@435 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
duke@435 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
duke@435 | 13 | * accompanied this code). |
duke@435 | 14 | * |
duke@435 | 15 | * You should have received a copy of the GNU General Public License version |
duke@435 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
duke@435 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
duke@435 | 18 | * |
duke@435 | 19 | * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, |
duke@435 | 20 | * CA 95054 USA or visit www.sun.com if you need additional information or |
duke@435 | 21 | * have any questions. |
duke@435 | 22 | * |
duke@435 | 23 | */ |
duke@435 | 24 | |
duke@435 | 25 | # include "incls/_precompiled.incl" |
duke@435 | 26 | # include "incls/_serialize.cpp.incl" |
duke@435 | 27 | |
duke@435 | 28 | |
duke@435 | 29 | // Serialize out the block offset shared array for the shared spaces. |
duke@435 | 30 | |
duke@435 | 31 | void CompactingPermGenGen::serialize_bts(SerializeOopClosure* soc) { |
duke@435 | 32 | _ro_bts->serialize(soc, readonly_bottom, readonly_end); |
duke@435 | 33 | _rw_bts->serialize(soc, readwrite_bottom, readwrite_end); |
duke@435 | 34 | } |
duke@435 | 35 | |
duke@435 | 36 | |
duke@435 | 37 | // Read/write a data stream for restoring/preserving oop pointers and |
duke@435 | 38 | // miscellaneous data from/to the shared archive file. |
duke@435 | 39 | |
duke@435 | 40 | void CompactingPermGenGen::serialize_oops(SerializeOopClosure* soc) { |
duke@435 | 41 | int tag = 0; |
duke@435 | 42 | soc->do_tag(--tag); |
duke@435 | 43 | |
coleenp@548 | 44 | assert(!UseCompressedOops, "UseCompressedOops doesn't work with shared archive"); |
duke@435 | 45 | // Verify the sizes of various oops in the system. |
duke@435 | 46 | soc->do_tag(sizeof(oopDesc)); |
duke@435 | 47 | soc->do_tag(sizeof(instanceOopDesc)); |
duke@435 | 48 | soc->do_tag(sizeof(methodOopDesc)); |
duke@435 | 49 | soc->do_tag(sizeof(constMethodOopDesc)); |
duke@435 | 50 | soc->do_tag(sizeof(methodDataOopDesc)); |
coleenp@548 | 51 | soc->do_tag(arrayOopDesc::base_offset_in_bytes(T_BYTE)); |
duke@435 | 52 | soc->do_tag(sizeof(constantPoolOopDesc)); |
duke@435 | 53 | soc->do_tag(sizeof(constantPoolCacheOopDesc)); |
twisti@1330 | 54 | soc->do_tag(objArrayOopDesc::base_offset_in_bytes()); |
coleenp@548 | 55 | soc->do_tag(typeArrayOopDesc::base_offset_in_bytes(T_BYTE)); |
duke@435 | 56 | soc->do_tag(sizeof(symbolOopDesc)); |
duke@435 | 57 | soc->do_tag(sizeof(klassOopDesc)); |
duke@435 | 58 | soc->do_tag(sizeof(markOopDesc)); |
duke@435 | 59 | soc->do_tag(sizeof(compiledICHolderOopDesc)); |
duke@435 | 60 | |
duke@435 | 61 | // Dump the block offset table entries. |
duke@435 | 62 | GenCollectedHeap* gch = GenCollectedHeap::heap(); |
duke@435 | 63 | CompactingPermGenGen* pg = (CompactingPermGenGen*)gch->perm_gen(); |
duke@435 | 64 | pg->serialize_bts(soc); |
duke@435 | 65 | soc->do_tag(--tag); |
duke@435 | 66 | pg->ro_space()->serialize_block_offset_array_offsets(soc); |
duke@435 | 67 | soc->do_tag(--tag); |
duke@435 | 68 | pg->rw_space()->serialize_block_offset_array_offsets(soc); |
duke@435 | 69 | soc->do_tag(--tag); |
duke@435 | 70 | |
duke@435 | 71 | // Special case - this oop needed in oop->is_oop() assertions. |
duke@435 | 72 | soc->do_ptr((void**)&Universe::_klassKlassObj); |
duke@435 | 73 | soc->do_tag(--tag); |
duke@435 | 74 | |
duke@435 | 75 | // Dump/restore miscellaneous oops. |
duke@435 | 76 | Universe::oops_do(soc, true); |
duke@435 | 77 | soc->do_tag(--tag); |
duke@435 | 78 | |
duke@435 | 79 | vmSymbols::oops_do(soc, true); soc->do_tag(--tag); |
duke@435 | 80 | CodeCache::oops_do(soc); soc->do_tag(--tag); |
duke@435 | 81 | soc->do_tag(666); |
duke@435 | 82 | } |