author | kbarrett |
Thu, 23 Apr 2015 11:26:32 -0400 | |
changeset 30558 | baec90a2699f |
parent 30150 | d9c940aa42ef |
child 30764 | fec48bf5a827 |
permissions | -rw-r--r-- |
8725
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
1 |
/* |
29792
8c6fa07f0869
8075957: Reduce calls to the GC specific object visitors in oopDesc
stefank
parents:
29688
diff
changeset
|
2 |
* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. |
8725
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
4 |
* |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
8 |
* |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
13 |
* accompanied this code). |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
14 |
* |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
18 |
* |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
21 |
* questions. |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
22 |
* |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
23 |
*/ |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
24 |
|
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
25 |
#include "precompiled.hpp" |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
26 |
#include "classfile/javaClasses.hpp" |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
27 |
#include "classfile/systemDictionary.hpp" |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
28 |
#include "gc_interface/collectedHeap.inline.hpp" |
25356
4a4a482298a6
8046670: Make CMS metadata aware closures applicable for other collectors
stefank
parents:
23872
diff
changeset
|
29 |
#include "memory/iterator.inline.hpp" |
8725
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
30 |
#include "memory/oopFactory.hpp" |
29688 | 31 |
#include "memory/specialized_oop_closures.hpp" |
8725
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
32 |
#include "oops/instanceKlass.hpp" |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
33 |
#include "oops/instanceMirrorKlass.hpp" |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
34 |
#include "oops/instanceOop.hpp" |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
35 |
#include "oops/oop.inline.hpp" |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
36 |
#include "oops/symbol.hpp" |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
37 |
#include "runtime/handles.inline.hpp" |
15482
470d0b0c09f1
8005915: Unify SERIALGC and INCLUDE_ALTERNATE_GCS
jprovino
parents:
13738
diff
changeset
|
38 |
#include "utilities/macros.hpp" |
8725
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
39 |
|
13738
d67be49a5beb
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
13728
diff
changeset
|
40 |
int InstanceMirrorKlass::_offset_of_static_fields = 0; |
8725
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
41 |
|
13738
d67be49a5beb
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
13728
diff
changeset
|
42 |
int InstanceMirrorKlass::instance_size(KlassHandle k) { |
8725
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
43 |
if (k() != NULL && k->oop_is_instance()) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
10742
diff
changeset
|
44 |
return align_object_size(size_helper() + InstanceKlass::cast(k())->static_field_size()); |
8725
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
45 |
} |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
46 |
return size_helper(); |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
47 |
} |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
48 |
|
13738
d67be49a5beb
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
13728
diff
changeset
|
49 |
instanceOop InstanceMirrorKlass::allocate_instance(KlassHandle k, TRAPS) { |
8725
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
50 |
// Query before forming handle. |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
51 |
int size = instance_size(k); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
10742
diff
changeset
|
52 |
KlassHandle h_k(THREAD, this); |
23872
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
22234
diff
changeset
|
53 |
instanceOop i = (instanceOop)CollectedHeap::obj_allocate(h_k, size, CHECK_NULL); |
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
22234
diff
changeset
|
54 |
|
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
22234
diff
changeset
|
55 |
// Since mirrors can be variable sized because of the static fields, store |
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
22234
diff
changeset
|
56 |
// the size in the mirror itself. |
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
22234
diff
changeset
|
57 |
java_lang_Class::set_oop_size(i, size); |
536c66fc43d3
8028497: SIGSEGV at ClassLoaderData::oops_do(OopClosure*, KlassClosure*, bool)
coleenp
parents:
22234
diff
changeset
|
58 |
|
8725
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
59 |
return i; |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
60 |
} |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
61 |
|
13738
d67be49a5beb
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
13728
diff
changeset
|
62 |
int InstanceMirrorKlass::oop_size(oop obj) const { |
8725
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
63 |
return java_lang_Class::oop_size(obj); |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
64 |
} |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
65 |
|
13738
d67be49a5beb
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
13728
diff
changeset
|
66 |
int InstanceMirrorKlass::compute_static_oop_field_count(oop obj) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
10742
diff
changeset
|
67 |
Klass* k = java_lang_Class::as_Klass(obj); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
10742
diff
changeset
|
68 |
if (k != NULL && k->oop_is_instance()) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
10742
diff
changeset
|
69 |
return InstanceKlass::cast(k)->static_oop_field_count(); |
8725
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
70 |
} |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
71 |
return 0; |
8c1e3dd5fe1b
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
diff
changeset
|
72 |
} |