mirror of
https://github.com/openjdk/jdk.git
synced 2025-08-26 22:34:27 +02:00
6964458: Reimplement class meta-data storage to use native memory
Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com> Co-authored-by: Mikael Gerdin <mikael.gerdin@oracle.com> Co-authored-by: Tom Rodriguez <tom.rodriguez@oracle.com> Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland
This commit is contained in:
parent
36eee7c8c8
commit
5c58d27aac
853 changed files with 26124 additions and 82956 deletions
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2003, 2012, 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
|
||||
|
@ -134,7 +134,7 @@ void ClassLoadingService::init() {
|
|||
}
|
||||
}
|
||||
|
||||
void ClassLoadingService::notify_class_unloaded(instanceKlass* k) {
|
||||
void ClassLoadingService::notify_class_unloaded(InstanceKlass* k) {
|
||||
DTRACE_CLASSLOAD_PROBE(unloaded, k, false);
|
||||
// Classes that can be unloaded must be non-shared
|
||||
_classes_unloaded_count->inc();
|
||||
|
@ -146,20 +146,20 @@ void ClassLoadingService::notify_class_unloaded(instanceKlass* k) {
|
|||
|
||||
// Compute method size & subtract from running total.
|
||||
// We are called during phase 1 of mark sweep, so it's
|
||||
// still ok to iterate through methodOops here.
|
||||
objArrayOop methods = k->methods();
|
||||
// still ok to iterate through Method*s here.
|
||||
Array<Method*>* methods = k->methods();
|
||||
for (int i = 0; i < methods->length(); i++) {
|
||||
_class_methods_size->inc(-methods->obj_at(i)->size());
|
||||
_class_methods_size->inc(-methods->at(i)->size());
|
||||
}
|
||||
}
|
||||
|
||||
if (TraceClassUnloading) {
|
||||
ResourceMark rm;
|
||||
tty->print_cr("[Unloading class %s]", k->external_name());
|
||||
tty->print_cr("[Unloading class %s " INTPTR_FORMAT "]", k->external_name(), k);
|
||||
}
|
||||
}
|
||||
|
||||
void ClassLoadingService::notify_class_loaded(instanceKlass* k, bool shared_class) {
|
||||
void ClassLoadingService::notify_class_loaded(InstanceKlass* k, bool shared_class) {
|
||||
DTRACE_CLASSLOAD_PROBE(loaded, k, shared_class);
|
||||
PerfCounter* classes_counter = (shared_class ? _shared_classes_loaded_count
|
||||
: _classes_loaded_count);
|
||||
|
@ -175,20 +175,22 @@ void ClassLoadingService::notify_class_loaded(instanceKlass* k, bool shared_clas
|
|||
}
|
||||
}
|
||||
|
||||
size_t ClassLoadingService::compute_class_size(instanceKlass* k) {
|
||||
// lifted from ClassStatistics.do_class(klassOop k)
|
||||
size_t ClassLoadingService::compute_class_size(InstanceKlass* k) {
|
||||
// lifted from ClassStatistics.do_class(Klass* k)
|
||||
|
||||
size_t class_size = 0;
|
||||
|
||||
class_size += k->as_klassOop()->size();
|
||||
class_size += k->size();
|
||||
|
||||
if (k->oop_is_instance()) {
|
||||
class_size += k->methods()->size();
|
||||
// FIXME: Need to count the contents of methods
|
||||
class_size += k->constants()->size();
|
||||
class_size += k->local_interfaces()->size();
|
||||
class_size += k->transitive_interfaces()->size();
|
||||
// We do not have to count implementors, since we only store one!
|
||||
class_size += k->fields()->size();
|
||||
// FIXME: How should these be accounted for, now when they have moved.
|
||||
//class_size += k->fields()->size();
|
||||
}
|
||||
return class_size * oopSize;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue