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

8340408: Shenandoah: Remove redundant task stats printing code in ShenandoahTaskQueue

Browse Source 
Reviewed-by: shade, wkemper
This commit is contained in:
Zhengyu Gu 2024-09-24 13:16:43 +00:00
parent 3c97d2437d
commit 279086d4ce
4 changed files with 2 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp
View File

@ -225,8 +225,7 @@ void ShenandoahConcurrentMark::finish_mark() {
assert(Thread::current()->is_VM_thread(), "Must by VM Thread"); assert(Thread::current()->is_VM_thread(), "Must by VM Thread");
finish_mark_work(); finish_mark_work();
assert(task_queues()->is_empty(), "Should be empty"); assert(task_queues()->is_empty(), "Should be empty");
TASKQUEUE_STATS_ONLY(task_queues()->print_taskqueue_stats()); TASKQUEUE_STATS_ONLY(task_queues()->print_and_reset_taskqueue_stats(""));
TASKQUEUE_STATS_ONLY(task_queues()->reset_taskqueue_stats());
ShenandoahHeap* const heap = ShenandoahHeap::heap(); ShenandoahHeap* const heap = ShenandoahHeap::heap();
heap->set_concurrent_mark_in_progress(false); heap->set_concurrent_mark_in_progress(false);

3
src/hotspot/share/gc/shenandoah/shenandoahSTWMark.cpp
View File

@ -133,8 +133,7 @@ void ShenandoahSTWMark::mark() {
ShenandoahCodeRoots::disarm_nmethods(); ShenandoahCodeRoots::disarm_nmethods();
assert(task_queues()->is_empty(), "Should be empty"); assert(task_queues()->is_empty(), "Should be empty");
TASKQUEUE_STATS_ONLY(task_queues()->print_taskqueue_stats()); TASKQUEUE_STATS_ONLY(task_queues()->print_and_reset_taskqueue_stats(""));
TASKQUEUE_STATS_ONLY(task_queues()->reset_taskqueue_stats());
} }
void ShenandoahSTWMark::mark_roots(uint worker_id) { void ShenandoahSTWMark::mark_roots(uint worker_id) {

39
src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.cpp
View File

@ -51,45 +51,6 @@ bool ShenandoahObjToScanQueueSet::is_empty() {
return true; return true;
} }
#if TASKQUEUE_STATS
void ShenandoahObjToScanQueueSet::print_taskqueue_stats_hdr(outputStream* const st) {
st->print_raw_cr("GC Task Stats");
st->print_raw("thr "); TaskQueueStats::print_header(1, st); st->cr();
st->print_raw("--- "); TaskQueueStats::print_header(2, st); st->cr();
}
void ShenandoahObjToScanQueueSet::print_taskqueue_stats() const {
if (!log_develop_is_enabled(Trace, gc, task, stats)) {
return;
}
Log(gc, task, stats) log;
ResourceMark rm;
LogStream ls(log.trace());
outputStream* st = &ls;
print_taskqueue_stats_hdr(st);
ShenandoahObjToScanQueueSet* queues = const_cast<ShenandoahObjToScanQueueSet*>(this);
TaskQueueStats totals;
const uint n = size();
for (uint i = 0; i < n; ++i) {
st->print(UINT32_FORMAT_W(3), i);
queues->queue(i)->stats.print(st);
st->cr();
totals += queues->queue(i)->stats;
}
st->print("tot "); totals.print(st); st->cr();
DEBUG_ONLY(totals.verify());
}
void ShenandoahObjToScanQueueSet::reset_taskqueue_stats() {
const uint n = size();
for (uint i = 0; i < n; ++i) {
queue(i)->stats.reset();
}
}
#endif // TASKQUEUE_STATS
bool ShenandoahTerminatorTerminator::should_exit_termination() { bool ShenandoahTerminatorTerminator::should_exit_termination() {
return _heap->cancelled_gc(); return _heap->cancelled_gc();
} }

6
src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.hpp
View File

@ -355,12 +355,6 @@ public:
bool is_empty(); bool is_empty();
void clear(); void clear();
#if TASKQUEUE_STATS
static void print_taskqueue_stats_hdr(outputStream* const st);
void print_taskqueue_stats() const;
void reset_taskqueue_stats();
#endif // TASKQUEUE_STATS
}; };
class ShenandoahTerminatorTerminator : public TerminatorTerminator { class ShenandoahTerminatorTerminator : public TerminatorTerminator {