7bf799956d
This is a reland of e58831cd95
Original change's description:
> Add format-specifier warnings to SkDebugf.
>
> This CL fixes up many existing format-specifier violations in Skia.
> Note that GCC has a warning for formatting nothing, so existing calls to
> `SkDebugf("")` have been removed, or replaced with `SkDebugf("%s", "")`.
> These were apparently meant to be used as a place to set a breakpoint.
>
> Some of our clients also use SkDebug with bad format specifiers, so this
> check is currently only enabled when SKIA_IMPLEMENTATION is true.
>
> Change-Id: I8177a1298a624c6936adc24e0d8f481362a356d0
> Bug: skia:12143
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/420902
> Auto-Submit: John Stiles <johnstiles@google.com>
> Commit-Queue: Brian Osman <brianosman@google.com>
> Reviewed-by: Brian Osman <brianosman@google.com>
Bug: skia:12143
Change-Id: Id3c0c21436ebd13899908d5ed5d44c42a0e23921
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/421918
Commit-Queue: John Stiles <johnstiles@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
86 lines
3.4 KiB
C++
86 lines
3.4 KiB
C++
/*
|
|
* Copyright 2017 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "src/core/SkTraceEvent.h"
|
|
#include "tools/trace/SkDebugfTracer.h"
|
|
|
|
SkEventTracer::Handle SkDebugfTracer::addTraceEvent(char phase,
|
|
const uint8_t* categoryEnabledFlag,
|
|
const char* name,
|
|
uint64_t id,
|
|
int numArgs,
|
|
const char** argNames,
|
|
const uint8_t* argTypes,
|
|
const uint64_t* argValues,
|
|
uint8_t flags) {
|
|
SkString args;
|
|
for (int i = 0; i < numArgs; ++i) {
|
|
if (i > 0) {
|
|
args.append(", ");
|
|
} else {
|
|
args.append(" ");
|
|
}
|
|
skia::tracing_internals::TraceValueUnion value;
|
|
value.as_uint = argValues[i];
|
|
switch (argTypes[i]) {
|
|
case TRACE_VALUE_TYPE_BOOL:
|
|
args.appendf("%s=%s", argNames[i], value.as_bool ? "true" : "false");
|
|
break;
|
|
case TRACE_VALUE_TYPE_UINT:
|
|
args.appendf("%s=%u", argNames[i], static_cast<uint32_t>(argValues[i]));
|
|
break;
|
|
case TRACE_VALUE_TYPE_INT:
|
|
args.appendf("%s=%d", argNames[i], static_cast<int32_t>(argValues[i]));
|
|
break;
|
|
case TRACE_VALUE_TYPE_DOUBLE:
|
|
args.appendf("%s=%g", argNames[i], value.as_double);
|
|
break;
|
|
case TRACE_VALUE_TYPE_POINTER:
|
|
args.appendf("%s=0x%p", argNames[i], value.as_pointer);
|
|
break;
|
|
case TRACE_VALUE_TYPE_STRING:
|
|
case TRACE_VALUE_TYPE_COPY_STRING: {
|
|
static constexpr size_t kMaxLen = 20;
|
|
SkString string(value.as_string);
|
|
size_t truncAt = string.size();
|
|
size_t newLineAt = SkStrFind(string.c_str(), "\n");
|
|
if (newLineAt > 0) {
|
|
truncAt = newLineAt;
|
|
}
|
|
truncAt = std::min(truncAt, kMaxLen);
|
|
if (truncAt < string.size()) {
|
|
string.resize(truncAt);
|
|
string.append("...");
|
|
}
|
|
args.appendf("%s=\"%s\"", argNames[i], string.c_str());
|
|
break;
|
|
}
|
|
default:
|
|
args.appendf("%s=<unknown type>", argNames[i]);
|
|
break;
|
|
}
|
|
}
|
|
bool open = (phase == TRACE_EVENT_PHASE_COMPLETE);
|
|
if (open) {
|
|
const char* category = this->getCategoryGroupName(categoryEnabledFlag);
|
|
SkDebugf("[% 2d]%s <%s> %s%s #%d {\n", (int)fIndent.size(), fIndent.c_str(), category, name,
|
|
args.c_str(), fCnt);
|
|
fIndent.append(" ");
|
|
} else {
|
|
SkDebugf("%s%s #%d\n", name, args.c_str(), fCnt);
|
|
}
|
|
++fCnt;
|
|
return 0;
|
|
}
|
|
|
|
void SkDebugfTracer::updateTraceEventDuration(const uint8_t* categoryEnabledFlag,
|
|
const char* name,
|
|
SkEventTracer::Handle handle) {
|
|
fIndent.resize(fIndent.size() - 1);
|
|
SkDebugf("[% 2d]%s } %s\n", (int)fIndent.size(), fIndent.c_str(), name);
|
|
}
|