mirror of
https://github.com/openjdk/jdk.git
synced 2025-09-20 19:14:38 +02:00
8152711: Create a non-template Log wrapper class
Reviewed-by: kbarrett, rehn
This commit is contained in:
Stefan Karlsson
parent
6c4d96782c
commit
ccf6f713e8
6 changed files with 528 additions and 41 deletions
|
|
@ -30,6 +30,7 @@
|
|||
#include "gc/shared/gcTrace.hpp"
|
||||
#include "gc/shared/gcTraceTime.hpp"
|
||||
#include "logging/log.hpp"
|
||||
#include "logging/logStream.inline.hpp"
|
||||
#include "memory/universe.hpp"
|
||||
#include "prims/jni_md.h"
|
||||
#include "utilities/ticks.hpp"
|
||||
|
|
@ -37,64 +38,52 @@
|
|||
#define LOG_STOP_TIME_FORMAT "(%.3fs, %.3fs) %.3fms"
|
||||
#define LOG_STOP_HEAP_FORMAT SIZE_FORMAT "M->" SIZE_FORMAT "M(" SIZE_FORMAT "M)"
|
||||
|
||||
template <LogLevelType Level, LogTagType T0, LogTagType T1, LogTagType T2, LogTagType T3, LogTagType T4, LogTagType GuardTag >
|
||||
void GCTraceTimeImpl<Level, T0, T1, T2, T3, T4, GuardTag>::log_start(jlong start_counter) {
|
||||
STATIC_ASSERT(T0 != LogTag::__NO_TAG); // Need some tag to log on.
|
||||
STATIC_ASSERT(T4 == LogTag::__NO_TAG); // Need to leave at least the last tag for the "start" tag in log_start()
|
||||
inline void GCTraceTimeImpl::log_start(jlong start_counter) {
|
||||
if (_out_start.is_enabled()) {
|
||||
LogStream out(_out_start);
|
||||
|
||||
// Get log with start tag appended (replace first occurrence of NO_TAG)
|
||||
const LogTagType start_tag = PREFIX_LOG_TAG(start);
|
||||
const LogTagType no_tag = PREFIX_LOG_TAG(_NO_TAG);
|
||||
LogImpl<T0,
|
||||
T1 == no_tag ? start_tag : T1,
|
||||
T1 != no_tag && T2 == no_tag ? start_tag : T2,
|
||||
T2 != no_tag && T3 == no_tag ? start_tag : T3,
|
||||
T3 != no_tag && T4 == no_tag ? start_tag : T4
|
||||
> log;
|
||||
|
||||
if (log.is_level(Level)) {
|
||||
FormatBuffer<> start_msg("%s", _title);
|
||||
out.print("%s", _title);
|
||||
if (_gc_cause != GCCause::_no_gc) {
|
||||
start_msg.append(" (%s)", GCCause::to_string(_gc_cause));
|
||||
out.print(" (%s)", GCCause::to_string(_gc_cause));
|
||||
}
|
||||
start_msg.append(" (%.3fs)", TimeHelper::counter_to_seconds(start_counter));
|
||||
// Make sure to put the "start" tag last in the tag set
|
||||
log.template write<Level>("%s", start_msg.buffer());
|
||||
out.print_cr(" (%.3fs)", TimeHelper::counter_to_seconds(start_counter));
|
||||
}
|
||||
}
|
||||
|
||||
template <LogLevelType Level, LogTagType T0, LogTagType T1, LogTagType T2, LogTagType T3, LogTagType T4, LogTagType GuardTag >
|
||||
void GCTraceTimeImpl<Level, T0, T1, T2, T3, T4, GuardTag>::log_stop(jlong start_counter, jlong stop_counter) {
|
||||
inline void GCTraceTimeImpl::log_stop(jlong start_counter, jlong stop_counter) {
|
||||
double duration_in_ms = TimeHelper::counter_to_millis(stop_counter - start_counter);
|
||||
double start_time_in_secs = TimeHelper::counter_to_seconds(start_counter);
|
||||
double stop_time_in_secs = TimeHelper::counter_to_seconds(stop_counter);
|
||||
FormatBuffer<> stop_msg("%s", _title);
|
||||
|
||||
LogStream out(_out_stop);
|
||||
|
||||
out.print("%s", _title);
|
||||
|
||||
if (_gc_cause != GCCause::_no_gc) {
|
||||
stop_msg.append(" (%s)", GCCause::to_string(_gc_cause));
|
||||
out.print(" (%s)", GCCause::to_string(_gc_cause));
|
||||
}
|
||||
if (_heap_usage_before == SIZE_MAX) {
|
||||
LogImpl<T0, T1, T2, T3, T4>::template write<Level>("%s " LOG_STOP_TIME_FORMAT,
|
||||
stop_msg.buffer(), start_time_in_secs, stop_time_in_secs, duration_in_ms);
|
||||
} else {
|
||||
|
||||
if (_heap_usage_before != SIZE_MAX) {
|
||||
CollectedHeap* heap = Universe::heap();
|
||||
size_t used_before_m = _heap_usage_before / M;
|
||||
size_t used_m = heap->used() / M;
|
||||
size_t capacity_m = heap->capacity() / M;
|
||||
LogImpl<T0, T1, T2, T3, T4>::template write<Level>("%s " LOG_STOP_HEAP_FORMAT " " LOG_STOP_TIME_FORMAT,
|
||||
stop_msg.buffer(), used_before_m, used_m, capacity_m, start_time_in_secs, stop_time_in_secs, duration_in_ms);
|
||||
out.print(" " LOG_STOP_HEAP_FORMAT, used_before_m, used_m, capacity_m);
|
||||
}
|
||||
|
||||
out.print_cr(" " LOG_STOP_TIME_FORMAT, start_time_in_secs, stop_time_in_secs, duration_in_ms);
|
||||
}
|
||||
|
||||
template <LogLevelType Level, LogTagType T0, LogTagType T1, LogTagType T2, LogTagType T3, LogTagType T4, LogTagType GuardTag >
|
||||
void GCTraceTimeImpl<Level, T0, T1, T2, T3, T4, GuardTag>::time_stamp(Ticks& ticks) {
|
||||
inline void GCTraceTimeImpl::time_stamp(Ticks& ticks) {
|
||||
if (_enabled || _timer != NULL) {
|
||||
ticks.stamp();
|
||||
}
|
||||
}
|
||||
|
||||
template <LogLevelType Level, LogTagType T0, LogTagType T1, LogTagType T2, LogTagType T3, LogTagType T4, LogTagType GuardTag >
|
||||
GCTraceTimeImpl<Level, T0, T1, T2, T3, T4, GuardTag>::GCTraceTimeImpl(const char* title, GCTimer* timer, GCCause::Cause gc_cause, bool log_heap_usage) :
|
||||
_enabled(LogImpl<T0, T1, T2, T3, T4, GuardTag>::is_level(Level)),
|
||||
inline GCTraceTimeImpl::GCTraceTimeImpl(LogTargetHandle out_start, LogTargetHandle out_stop, const char* title, GCTimer* timer, GCCause::Cause gc_cause, bool log_heap_usage) :
|
||||
_enabled(out_stop.is_enabled()),
|
||||
_out_start(out_start),
|
||||
_out_stop(out_stop),
|
||||
_start_ticks(),
|
||||
_heap_usage_before(SIZE_MAX),
|
||||
_title(title),
|
||||
|
|
@ -113,8 +102,7 @@ GCTraceTimeImpl<Level, T0, T1, T2, T3, T4, GuardTag>::GCTraceTimeImpl(const char
|
|||
}
|
||||
}
|
||||
|
||||
template <LogLevelType Level, LogTagType T0, LogTagType T1, LogTagType T2, LogTagType T3, LogTagType T4, LogTagType GuardTag >
|
||||
GCTraceTimeImpl<Level, T0, T1, T2, T3, T4, GuardTag>::~GCTraceTimeImpl() {
|
||||
inline GCTraceTimeImpl::~GCTraceTimeImpl() {
|
||||
Ticks stop_ticks;
|
||||
time_stamp(stop_ticks);
|
||||
if (_enabled) {
|
||||
|
|
@ -145,7 +133,34 @@ GCTraceConcTimeImpl<Level, T0, T1, T2, T3, T4, GuardTag>::~GCTraceConcTimeImpl()
|
|||
}
|
||||
}
|
||||
|
||||
#define GCTraceTime(Level, ...) GCTraceTimeImpl<LogLevel::Level, LOG_TAGS(__VA_ARGS__)>
|
||||
// Figure out the first __NO_TAG position and replace it with 'start'.
|
||||
#define INJECT_START_TAG(T1, T2, T3, T4) \
|
||||
(( T1 == LogTag::__NO_TAG) ? PREFIX_LOG_TAG(start) : T1), \
|
||||
((T1 != LogTag::__NO_TAG && T2 == LogTag::__NO_TAG) ? PREFIX_LOG_TAG(start) : T2), \
|
||||
((T2 != LogTag::__NO_TAG && T3 == LogTag::__NO_TAG) ? PREFIX_LOG_TAG(start) : T3), \
|
||||
((T3 != LogTag::__NO_TAG && T4 == LogTag::__NO_TAG) ? PREFIX_LOG_TAG(start) : T4)
|
||||
|
||||
template <LogLevelType level, LogTagType T0, LogTagType T1, LogTagType T2, LogTagType T3, LogTagType T4, LogTagType GuardTag>
|
||||
GCTraceTimeImplWrapper<level, T0, T1, T2, T3, T4, GuardTag>::GCTraceTimeImplWrapper(
|
||||
const char* title, GCTimer* timer, GCCause::Cause gc_cause, bool log_heap_usage)
|
||||
: _impl(
|
||||
LogTargetHandle::create<level, T0, INJECT_START_TAG(T1, T2, T3, T4), GuardTag>(),
|
||||
LogTargetHandle::create<level, T0, T1, T2, T3, T4, GuardTag>(),
|
||||
title,
|
||||
timer,
|
||||
gc_cause,
|
||||
log_heap_usage) {
|
||||
|
||||
STATIC_ASSERT(T0 != LogTag::__NO_TAG); // Need some tag to log on.
|
||||
STATIC_ASSERT(T4 == LogTag::__NO_TAG); // Need to leave at least the last tag for the "start" tag in log_start()
|
||||
}
|
||||
|
||||
#undef INJECT_START_TAG
|
||||
|
||||
template <LogLevelType Level, LogTagType T0, LogTagType T1, LogTagType T2, LogTagType T3, LogTagType T4, LogTagType GuardTag>
|
||||
GCTraceTimeImplWrapper<Level, T0, T1, T2, T3, T4, GuardTag>::~GCTraceTimeImplWrapper() {}
|
||||
|
||||
#define GCTraceTime(Level, ...) GCTraceTimeImplWrapper<LogLevel::Level, LOG_TAGS(__VA_ARGS__)>
|
||||
#define GCTraceConcTime(Level, ...) GCTraceConcTimeImpl<LogLevel::Level, LOG_TAGS(__VA_ARGS__)>
|
||||
|
||||
#endif // SHARE_VM_GC_SHARED_GCTRACETIME_INLINE_HPP
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue