Skip to content

Commit 279086d

Browse files
committedSep 24, 2024
8340408: Shenandoah: Remove redundant task stats printing code in ShenandoahTaskQueue
Reviewed-by: shade, wkemper
1 parent 3c97d24 commit 279086d

File tree

4 files changed

+2
-49
lines changed

4 files changed

+2
-49
lines changed
 

‎src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,7 @@ void ShenandoahConcurrentMark::finish_mark() {
225225
assert(Thread::current()->is_VM_thread(), "Must by VM Thread");
226226
finish_mark_work();
227227
assert(task_queues()->is_empty(), "Should be empty");
228-
TASKQUEUE_STATS_ONLY(task_queues()->print_taskqueue_stats());
229-
TASKQUEUE_STATS_ONLY(task_queues()->reset_taskqueue_stats());
228+
TASKQUEUE_STATS_ONLY(task_queues()->print_and_reset_taskqueue_stats(""));
230229

231230
ShenandoahHeap* const heap = ShenandoahHeap::heap();
232231
heap->set_concurrent_mark_in_progress(false);

‎src/hotspot/share/gc/shenandoah/shenandoahSTWMark.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,7 @@ void ShenandoahSTWMark::mark() {
133133
ShenandoahCodeRoots::disarm_nmethods();
134134

135135
assert(task_queues()->is_empty(), "Should be empty");
136-
TASKQUEUE_STATS_ONLY(task_queues()->print_taskqueue_stats());
137-
TASKQUEUE_STATS_ONLY(task_queues()->reset_taskqueue_stats());
136+
TASKQUEUE_STATS_ONLY(task_queues()->print_and_reset_taskqueue_stats(""));
138137
}
139138

140139
void ShenandoahSTWMark::mark_roots(uint worker_id) {

‎src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.cpp

-39
Original file line numberDiff line numberDiff line change
@@ -51,45 +51,6 @@ bool ShenandoahObjToScanQueueSet::is_empty() {
5151
return true;
5252
}
5353

54-
#if TASKQUEUE_STATS
55-
void ShenandoahObjToScanQueueSet::print_taskqueue_stats_hdr(outputStream* const st) {
56-
st->print_raw_cr("GC Task Stats");
57-
st->print_raw("thr "); TaskQueueStats::print_header(1, st); st->cr();
58-
st->print_raw("--- "); TaskQueueStats::print_header(2, st); st->cr();
59-
}
60-
61-
void ShenandoahObjToScanQueueSet::print_taskqueue_stats() const {
62-
if (!log_develop_is_enabled(Trace, gc, task, stats)) {
63-
return;
64-
}
65-
Log(gc, task, stats) log;
66-
ResourceMark rm;
67-
LogStream ls(log.trace());
68-
outputStream* st = &ls;
69-
print_taskqueue_stats_hdr(st);
70-
71-
ShenandoahObjToScanQueueSet* queues = const_cast<ShenandoahObjToScanQueueSet*>(this);
72-
TaskQueueStats totals;
73-
const uint n = size();
74-
for (uint i = 0; i < n; ++i) {
75-
st->print(UINT32_FORMAT_W(3), i);
76-
queues->queue(i)->stats.print(st);
77-
st->cr();
78-
totals += queues->queue(i)->stats;
79-
}
80-
st->print("tot "); totals.print(st); st->cr();
81-
DEBUG_ONLY(totals.verify());
82-
83-
}
84-
85-
void ShenandoahObjToScanQueueSet::reset_taskqueue_stats() {
86-
const uint n = size();
87-
for (uint i = 0; i < n; ++i) {
88-
queue(i)->stats.reset();
89-
}
90-
}
91-
#endif // TASKQUEUE_STATS
92-
9354
bool ShenandoahTerminatorTerminator::should_exit_termination() {
9455
return _heap->cancelled_gc();
9556
}

‎src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.hpp

-6
Original file line numberDiff line numberDiff line change
@@ -355,12 +355,6 @@ class ShenandoahObjToScanQueueSet: public ParallelClaimableQueueSet<ShenandoahOb
355355

356356
bool is_empty();
357357
void clear();
358-
359-
#if TASKQUEUE_STATS
360-
static void print_taskqueue_stats_hdr(outputStream* const st);
361-
void print_taskqueue_stats() const;
362-
void reset_taskqueue_stats();
363-
#endif // TASKQUEUE_STATS
364358
};
365359

366360
class ShenandoahTerminatorTerminator : public TerminatorTerminator {

0 commit comments

Comments
 (0)
Please sign in to comment.