archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8027423: Parallel compact GC class unloading measurement includes symbol and string table time

Browse source 
Reviewed-by: mgerdin, jmasa
This commit is contained in:
Stefan Karlsson 2016-03-17 21:01:59 +01:00
parent 7c87080ac1
commit 35058d4038
5 changed files with 83 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

6
hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp
View file

@ -4098,14 +4098,10 @@ void G1CollectedHeap::parallel_cleaning(BoolObjectClosure* is_alive,
void G1CollectedHeap::unlink_string_and_symbol_table(BoolObjectClosure* is_alive,
bool process_strings, bool process_symbols) {
{
{ // Timing scope
G1StringSymbolTableUnlinkTask g1_unlink_task(is_alive, process_strings, process_symbols);
workers()->run_task(&g1_unlink_task);
}
if (G1StringDedup::is_enabled()) {
G1StringDedup::unlink(is_alive);
}
}
class G1RedirtyLoggedCardsTask : public AbstractGangTask {

12
hotspot/src/share/vm/gc/g1/g1MarkSweep.cpp
View file

@ -154,6 +154,9 @@ void G1MarkSweep::mark_sweep_phase1(bool& marked_for_unloading,
// This is the point where the entire marking should have completed.
assert(GenMarkSweep::_marking_stack.is_empty(), "Marking should have completed");
{
GCTraceTime(Debug, gc) trace("Class Unloading", gc_timer());
// Unload classes and purge the SystemDictionary.
bool purged_class = SystemDictionary::do_unloading(&GenMarkSweep::is_alive);
@ -162,9 +165,18 @@ void G1MarkSweep::mark_sweep_phase1(bool& marked_for_unloading,
// Prune dead klasses from subklass/sibling/implementor lists.
Klass::clean_weak_klass_links(&GenMarkSweep::is_alive);
}
{
GCTraceTime(Debug, gc) trace("Scrub String and Symbol Tables", gc_timer());
// Delete entries for dead interned string and clean up unreferenced symbols in symbol table.
g1h->unlink_string_and_symbol_table(&GenMarkSweep::is_alive);
}
if (G1StringDedup::is_enabled()) {
GCTraceTime(Debug, gc) trace("String Deduplication Unlink", gc_timer());
G1StringDedup::unlink(&GenMarkSweep::is_alive);
}
if (VerifyDuringGC) {
HandleMark hm; // handle scope

11
hotspot/src/share/vm/gc/parallel/psMarkSweep.cpp
View file

@ -533,6 +533,9 @@ void PSMarkSweep::mark_sweep_phase1(bool clear_all_softrefs) {
// This is the point where the entire marking should have completed.
assert(_marking_stack.is_empty(), "Marking should have completed");
{
GCTraceTime(Debug, gc) t("Class Unloading", _gc_timer);
// Unload classes and purge the SystemDictionary.
bool purged_class = SystemDictionary::do_unloading(is_alive_closure());
@ -541,12 +544,20 @@ void PSMarkSweep::mark_sweep_phase1(bool clear_all_softrefs) {
// Prune dead klasses from subklass/sibling/implementor lists.
Klass::clean_weak_klass_links(is_alive_closure());
}
{
GCTraceTime(Debug, gc) t("Scrub String Table", _gc_timer);
// Delete entries for dead interned strings.
StringTable::unlink(is_alive_closure());
}
{
GCTraceTime(Debug, gc) t("Scrub Symbol Table", _gc_timer);
// Clean up unreferenced symbols in symbol table.
SymbolTable::unlink();
}
_gc_tracer->report_object_count_after_gc(is_alive_closure());
}

13
hotspot/src/share/vm/gc/parallel/psParallelCompact.cpp
View file

@ -2103,11 +2103,12 @@ void PSParallelCompact::marking_phase(ParCompactionManager* cm,
gc_tracer->report_gc_reference_stats(stats);
}
GCTraceTime(Trace, gc) tm_m("Class Unloading", &_gc_timer);
// This is the point where the entire marking should have completed.
assert(cm->marking_stacks_empty(), "Marking should have completed");
{
GCTraceTime(Debug, gc) tm_m("Class Unloading", &_gc_timer);
// Follow system dictionary roots and unload classes.
bool purged_class = SystemDictionary::do_unloading(is_alive_closure());
@ -2116,12 +2117,20 @@ void PSParallelCompact::marking_phase(ParCompactionManager* cm,
// Prune dead klasses from subklass/sibling/implementor lists.
Klass::clean_weak_klass_links(is_alive_closure());
}
{
GCTraceTime(Debug, gc) t("Scrub String Table", &_gc_timer);
// Delete entries for dead interned strings.
StringTable::unlink(is_alive_closure());
}
{
GCTraceTime(Debug, gc) t("Scrub Symbol Table", &_gc_timer);
// Clean up unreferenced symbols in symbol table.
SymbolTable::unlink();
}
_gc_tracer.report_object_count_after_gc(is_alive_closure());
}

10
hotspot/src/share/vm/gc/serial/genMarkSweep.cpp
View file

@ -218,6 +218,9 @@ void GenMarkSweep::mark_sweep_phase1(bool clear_all_softrefs) {
// This is the point where the entire marking should have completed.
assert(_marking_stack.is_empty(), "Marking should have completed");
{
GCTraceTime(Debug, gc) tm_m("Class Unloading", gc_timer());
// Unload classes and purge the SystemDictionary.
bool purged_class = SystemDictionary::do_unloading(&is_alive);
@ -226,12 +229,19 @@ void GenMarkSweep::mark_sweep_phase1(bool clear_all_softrefs) {
// Prune dead klasses from subklass/sibling/implementor lists.
Klass::clean_weak_klass_links(&is_alive);
}
{
GCTraceTime(Debug, gc) t("Scrub String Table", gc_timer());
// Delete entries for dead interned strings.
StringTable::unlink(&is_alive);
}
{
GCTraceTime(Debug, gc) t("Scrub Symbol Table", gc_timer());
// Clean up unreferenced symbols in symbol table.
SymbolTable::unlink();
}
gc_tracer()->report_object_count_after_gc(&is_alive);
}