stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6841742: par compact - remove unused/unsupported options

Browse Source 
Ignore UseParallel{OldGCDensePrefix,OldGCCompacting,DensePrefixUpdate}

Reviewed-by: jwilhelm, brutisso
This commit is contained in:
John Coomes 2011-04-07 17:16:20 -07:00
parent dadf395fbe
commit f9b80cdc1c
10 changed files with 25 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2011, 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
@ -176,10 +176,6 @@ void PSOldGen::compact() {
object_mark_sweep()->compact(ZapUnusedHeapArea);
}
void PSOldGen::move_and_update(ParCompactionManager* cm) {
PSParallelCompact::move_and_update(cm, PSParallelCompact::old_space_id);
}
size_t PSOldGen::contiguous_available() const {
return object_space()->free_in_bytes() + virtual_space()->uncommitted_size();
}

5
hotspot/src/share/vm/gc_implementation/parallelScavenge/psOldGen.hpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2011, 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
@ -143,9 +143,6 @@ class PSOldGen : public CHeapObj {
void adjust_pointers();
void compact();
// Parallel old
virtual void move_and_update(ParCompactionManager* cm);
// Size info
size_t capacity_in_bytes() const { return object_space()->capacity_in_bytes(); }
size_t used_in_bytes() const { return object_space()->used_in_bytes(); }

50
hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
View File

@ -2104,11 +2104,7 @@ void PSParallelCompact::invoke_no_policy(bool maximum_heap_compaction) {
// klasses are used in the update of an object?
compact_perm(vmthread_cm);
if (UseParallelOldGCCompacting) {
compact();
} else {
compact_serial(vmthread_cm);
}
compact();
// Reset the mark bitmap, summary data, and do other bookkeeping. Must be
// done before resizing.
@ -2582,18 +2578,16 @@ void PSParallelCompact::enqueue_dense_prefix_tasks(GCTaskQueue* q,
// each thread?
if (total_dense_prefix_regions > 0) {
uint tasks_for_dense_prefix = 1;
if (UseParallelDensePrefixUpdate) {
if (total_dense_prefix_regions <=
(parallel_gc_threads * PAR_OLD_DENSE_PREFIX_OVER_PARTITIONING)) {
// Don't over partition. This assumes that
// PAR_OLD_DENSE_PREFIX_OVER_PARTITIONING is a small integer value
// so there are not many regions to process.
tasks_for_dense_prefix = parallel_gc_threads;
} else {
// Over partition
tasks_for_dense_prefix = parallel_gc_threads *
PAR_OLD_DENSE_PREFIX_OVER_PARTITIONING;
}
if (total_dense_prefix_regions <=
(parallel_gc_threads * PAR_OLD_DENSE_PREFIX_OVER_PARTITIONING)) {
// Don't over partition. This assumes that
// PAR_OLD_DENSE_PREFIX_OVER_PARTITIONING is a small integer value
// so there are not many regions to process.
tasks_for_dense_prefix = parallel_gc_threads;
} else {
// Over partition
tasks_for_dense_prefix = parallel_gc_threads *
PAR_OLD_DENSE_PREFIX_OVER_PARTITIONING;
}
size_t regions_per_thread = total_dense_prefix_regions /
tasks_for_dense_prefix;
@ -2733,21 +2727,6 @@ void PSParallelCompact::verify_complete(SpaceId space_id) {
}
#endif // #ifdef ASSERT
void PSParallelCompact::compact_serial(ParCompactionManager* cm) {
EventMark m("5 compact serial");
TraceTime tm("compact serial", print_phases(), true, gclog_or_tty);
ParallelScavengeHeap* heap = (ParallelScavengeHeap*)Universe::heap();
assert(heap->kind() == CollectedHeap::ParallelScavengeHeap, "Sanity");
PSYoungGen* young_gen = heap->young_gen();
PSOldGen* old_gen = heap->old_gen();
old_gen->start_array()->reset();
old_gen->move_and_update(cm);
young_gen->move_and_update(cm);
}
void
PSParallelCompact::follow_weak_klass_links() {
// All klasses on the revisit stack are marked at this point.
@ -3530,11 +3509,8 @@ PSParallelCompact::VerifyUpdateClosure::do_addr(HeapWord* addr, size_t words) {
"Object liveness is wrong.");
return ParMarkBitMap::incomplete;
}
assert(UseParallelOldGCDensePrefix ||
(HeapMaximumCompactionInterval > 1) ||
(MarkSweepAlwaysCompactCount > 1) ||
(forwarding_ptr == new_pointer),
"Calculation of new location is incorrect");
assert(HeapMaximumCompactionInterval > 1 || MarkSweepAlwaysCompactCount > 1 ||
forwarding_ptr == new_pointer, "new location is incorrect");
return ParMarkBitMap::incomplete;
}

3
hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp
View File

@ -1027,9 +1027,6 @@ class PSParallelCompact : AllStatic {
ParallelTaskTerminator* terminator_ptr,
uint parallel_gc_threads);
// For debugging only - compacts the old gen serially
static void compact_serial(ParCompactionManager* cm);
// If objects are left in eden after a collection, try to move the boundary
// and absorb them into the old gen. Returns true if eden was emptied.
static bool absorb_live_data_from_eden(PSAdaptiveSizePolicy* size_policy,

8
hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2011, 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
@ -121,12 +121,6 @@ void PSPermGen::compute_new_size(size_t used_before_collection) {
}
}
void PSPermGen::move_and_update(ParCompactionManager* cm) {
PSParallelCompact::move_and_update(cm, PSParallelCompact::perm_space_id);
}
void PSPermGen::precompact() {
// Reset start array first.
_start_array.reset();

5
hotspot/src/share/vm/gc_implementation/parallelScavenge/psPermGen.hpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2011, 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
@ -51,9 +51,6 @@ class PSPermGen : public PSOldGen {
// MarkSweep code
virtual void precompact();
// Parallel old
virtual void move_and_update(ParCompactionManager* cm);
virtual const char* name() const { return "PSPermGen"; }
};

8
hotspot/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2011, 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
@ -792,12 +792,6 @@ void PSYoungGen::compact() {
to_mark_sweep()->compact(false);
}
void PSYoungGen::move_and_update(ParCompactionManager* cm) {
PSParallelCompact::move_and_update(cm, PSParallelCompact::eden_space_id);
PSParallelCompact::move_and_update(cm, PSParallelCompact::from_space_id);
PSParallelCompact::move_and_update(cm, PSParallelCompact::to_space_id);
}
void PSYoungGen::print() const { print_on(tty); }
void PSYoungGen::print_on(outputStream* st) const {
st->print(" %-15s", "PSYoungGen");

5
hotspot/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.hpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 2011, 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
@ -127,9 +127,6 @@ class PSYoungGen : public CHeapObj {
void adjust_pointers();
void compact();
// Parallel Old
void move_and_update(ParCompactionManager* cm);
// Called during/after gc
void swap_spaces();

6
hotspot/src/share/vm/runtime/arguments.cpp
View File

@ -243,6 +243,12 @@ static ObsoleteFlag obsolete_jvm_flags[] = {
{ "MaxLiveObjectEvacuationRatio",
JDK_Version::jdk_update(6,24), JDK_Version::jdk(8) },
{ "ForceSharedSpaces", JDK_Version::jdk_update(6,25), JDK_Version::jdk(8) },
{ "UseParallelOldGCCompacting",
JDK_Version::jdk_update(6,27), JDK_Version::jdk(8) },
{ "UseParallelDensePrefixUpdate",
JDK_Version::jdk_update(6,27), JDK_Version::jdk(8) },
{ "UseParallelOldGCDensePrefix",
JDK_Version::jdk_update(6,27), JDK_Version::jdk(8) },
{ NULL, JDK_Version(0), JDK_Version(0) }
};

10
hotspot/src/share/vm/runtime/globals.hpp
View File

@ -1355,13 +1355,6 @@ class CommandLineFlags {
product(bool, UseParallelOldGC, false, \
"Use the Parallel Old garbage collector") \
\
product(bool, UseParallelOldGCCompacting, true, \
"In the Parallel Old garbage collector use parallel compaction") \
\
product(bool, UseParallelDensePrefixUpdate, true, \
"In the Parallel Old garbage collector use parallel dense" \
" prefix update") \
\
product(uintx, HeapMaximumCompactionInterval, 20, \
"How often should we maximally compact the heap (not allowing " \
"any dead space)") \
@ -1381,9 +1374,6 @@ class CommandLineFlags {
"The standard deviation used by the par compact dead wood" \
"limiter (a number between 0-100).") \
\
product(bool, UseParallelOldGCDensePrefix, true, \
"Use a dense prefix with the Parallel Old garbage collector") \
\
product(uintx, ParallelGCThreads, 0, \
"Number of parallel threads parallel gc will use") \
\