Tracing macro cleanup continued
- Remove one especially chatty event, and one pointless test
- Use TRACE_FUNC everywhere, rather than manual strings
Bug: skia:
Change-Id: Icb795294009150ca9a260436738d79546a733337
Reviewed-on: https://skia-review.googlesource.com/26701
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Brian Osman <brianosman@google.com>
diff --git a/gn/tests.gni b/gn/tests.gni
index 7b2d25c..16ecb1b 100644
--- a/gn/tests.gni
+++ b/gn/tests.gni
@@ -252,7 +252,6 @@
"$_tests/TLSTest.cpp",
"$_tests/TopoSortTest.cpp",
"$_tests/TraceMemoryDumpTest.cpp",
- "$_tests/TracingTest.cpp",
"$_tests/TransferPixelsTest.cpp",
"$_tests/TypefaceTest.cpp",
"$_tests/UnicodeTest.cpp",
diff --git a/src/core/SkBigPicture.cpp b/src/core/SkBigPicture.cpp
index 1492ecd..8cc8a2a 100644
--- a/src/core/SkBigPicture.cpp
+++ b/src/core/SkBigPicture.cpp
@@ -77,7 +77,7 @@
}
void SkBigPicture::Analysis::init(const SkRecord& record) {
- TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), "SkBigPicture::Analysis::init()");
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), TRACE_FUNC);
SkBitmapHunter bitmap;
SkPathCounter path;
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index 640e05f..8189df0 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -1677,7 +1677,7 @@
void SkCanvas::drawDRRect(const SkRRect& outer, const SkRRect& inner,
const SkPaint& paint) {
- TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), "SkCanvas::drawDRRect()");
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), TRACE_FUNC);
if (outer.isEmpty()) {
return;
}
@@ -1933,7 +1933,7 @@
}
void SkCanvas::onDrawPaint(const SkPaint& paint) {
- TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), "SkCanvas::drawPaint()");
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), TRACE_FUNC);
this->internalDrawPaint(paint);
}
@@ -1949,7 +1949,7 @@
void SkCanvas::onDrawPoints(PointMode mode, size_t count, const SkPoint pts[],
const SkPaint& paint) {
- TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("skia"), "SkCanvas::drawPoints()", "count", static_cast<uint64_t>(count));
+ TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("skia"), TRACE_FUNC, "count", static_cast<uint64_t>(count));
if ((long)count <= 0) {
return;
}
@@ -1990,7 +1990,7 @@
}
void SkCanvas::onDrawRect(const SkRect& r, const SkPaint& paint) {
- TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), "SkCanvas::drawRect()");
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), TRACE_FUNC);
SkASSERT(r.isSorted());
if (paint.canComputeFastBounds()) {
SkRect storage;
@@ -2035,7 +2035,7 @@
}
void SkCanvas::onDrawOval(const SkRect& oval, const SkPaint& paint) {
- TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), "SkCanvas::drawOval()");
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), TRACE_FUNC);
SkASSERT(oval.isSorted());
if (paint.canComputeFastBounds()) {
SkRect storage;
@@ -2056,7 +2056,7 @@
void SkCanvas::onDrawArc(const SkRect& oval, SkScalar startAngle,
SkScalar sweepAngle, bool useCenter,
const SkPaint& paint) {
- TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), "SkCanvas::drawArc()");
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), TRACE_FUNC);
SkASSERT(oval.isSorted());
if (paint.canComputeFastBounds()) {
SkRect storage;
@@ -2076,7 +2076,7 @@
}
void SkCanvas::onDrawRRect(const SkRRect& rrect, const SkPaint& paint) {
- TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), "SkCanvas::drawRRect()");
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), TRACE_FUNC);
if (paint.canComputeFastBounds()) {
SkRect storage;
if (this->quickReject(paint.computeFastBounds(rrect.getBounds(), &storage))) {
@@ -2121,7 +2121,7 @@
}
void SkCanvas::onDrawPath(const SkPath& path, const SkPaint& paint) {
- TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), "SkCanvas::drawPath()");
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), TRACE_FUNC);
if (!path.isFinite()) {
return;
}
@@ -2172,7 +2172,7 @@
}
void SkCanvas::onDrawImage(const SkImage* image, SkScalar x, SkScalar y, const SkPaint* paint) {
- TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), "SkCanvas::drawImage()");
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), TRACE_FUNC);
SkRect bounds = SkRect::MakeXYWH(x, y,
SkIntToScalar(image->width()), SkIntToScalar(image->height()));
if (nullptr == paint || paint->canComputeFastBounds()) {
@@ -2221,7 +2221,7 @@
void SkCanvas::onDrawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst,
const SkPaint* paint, SrcRectConstraint constraint) {
- TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), "SkCanvas::drawImageRect()");
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), TRACE_FUNC);
if (nullptr == paint || paint->canComputeFastBounds()) {
SkRect storage = dst;
if (paint) {
@@ -2247,7 +2247,7 @@
}
void SkCanvas::onDrawBitmap(const SkBitmap& bitmap, SkScalar x, SkScalar y, const SkPaint* paint) {
- TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), "SkCanvas::drawBitmap()");
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), TRACE_FUNC);
SkDEBUGCODE(bitmap.validate();)
if (bitmap.drawsNothing()) {
@@ -2331,14 +2331,14 @@
void SkCanvas::onDrawBitmapRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst,
const SkPaint* paint, SrcRectConstraint constraint) {
- TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), "SkCanvas::drawBitmapRectToRect()");
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), TRACE_FUNC);
SkDEBUGCODE(bitmap.validate();)
this->internalDrawBitmapRect(bitmap, src, dst, paint, constraint);
}
void SkCanvas::onDrawImageNine(const SkImage* image, const SkIRect& center, const SkRect& dst,
const SkPaint* paint) {
- TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), "SkCanvas::drawImageNine()");
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), TRACE_FUNC);
if (nullptr == paint || paint->canComputeFastBounds()) {
SkRect storage;
@@ -2363,7 +2363,7 @@
void SkCanvas::onDrawBitmapNine(const SkBitmap& bitmap, const SkIRect& center, const SkRect& dst,
const SkPaint* paint) {
- TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), "SkCanvas::drawBitmapNine()");
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), TRACE_FUNC);
SkDEBUGCODE(bitmap.validate();)
if (nullptr == paint || paint->canComputeFastBounds()) {
@@ -2561,35 +2561,35 @@
// These will become non-virtual, so they always call the (virtual) onDraw... method
void SkCanvas::drawText(const void* text, size_t byteLength, SkScalar x, SkScalar y,
const SkPaint& paint) {
- TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), "SkCanvas::drawText()");
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), TRACE_FUNC);
if (byteLength) {
this->onDrawText(text, byteLength, x, y, paint);
}
}
void SkCanvas::drawPosText(const void* text, size_t byteLength, const SkPoint pos[],
const SkPaint& paint) {
- TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), "SkCanvas::drawPosText()");
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), TRACE_FUNC);
if (byteLength) {
this->onDrawPosText(text, byteLength, pos, paint);
}
}
void SkCanvas::drawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[],
SkScalar constY, const SkPaint& paint) {
- TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), "SkCanvas::drawPosTextH()");
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), TRACE_FUNC);
if (byteLength) {
this->onDrawPosTextH(text, byteLength, xpos, constY, paint);
}
}
void SkCanvas::drawTextOnPath(const void* text, size_t byteLength, const SkPath& path,
const SkMatrix* matrix, const SkPaint& paint) {
- TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), "SkCanvas::drawTextOnPath()");
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), TRACE_FUNC);
if (byteLength) {
this->onDrawTextOnPath(text, byteLength, path, matrix, paint);
}
}
void SkCanvas::drawTextRSXform(const void* text, size_t byteLength, const SkRSXform xform[],
const SkRect* cullRect, const SkPaint& paint) {
- TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), "SkCanvas::drawTextRSXform()");
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), TRACE_FUNC);
if (byteLength) {
this->onDrawTextRSXform(text, byteLength, xform, cullRect, paint);
}
@@ -2597,13 +2597,13 @@
void SkCanvas::drawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
const SkPaint& paint) {
RETURN_ON_NULL(blob);
- TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), "SkCanvas::drawTextBlob()");
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), TRACE_FUNC);
this->onDrawTextBlob(blob, x, y, paint);
}
void SkCanvas::onDrawVerticesObject(const SkVertices* vertices, SkBlendMode bmode,
const SkPaint& paint) {
- TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), "SkCanvas::drawVertices()");
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), TRACE_FUNC);
LOOPER_BEGIN(paint, SkDrawFilter::kPath_Type, nullptr)
while (iter.next()) {
@@ -2617,7 +2617,7 @@
void SkCanvas::drawPatch(const SkPoint cubics[12], const SkColor colors[4],
const SkPoint texCoords[4], SkBlendMode bmode,
const SkPaint& paint) {
- TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), "SkCanvas::drawPatch()");
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), TRACE_FUNC);
if (nullptr == cubics) {
return;
}
@@ -2707,7 +2707,7 @@
//////////////////////////////////////////////////////////////////////////////
void SkCanvas::drawColor(SkColor c, SkBlendMode mode) {
- TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), "SkCanvas::drawColor()");
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), TRACE_FUNC);
SkPaint paint;
paint.setColor(c);
@@ -2716,13 +2716,13 @@
}
void SkCanvas::drawPoint(SkScalar x, SkScalar y, const SkPaint& paint) {
- TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), "SkCanvas::drawPoint(SkPaint)");
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), TRACE_FUNC);
const SkPoint pt = { x, y };
this->drawPoints(kPoints_PointMode, 1, &pt, paint);
}
void SkCanvas::drawLine(SkScalar x0, SkScalar y0, SkScalar x1, SkScalar y1, const SkPaint& paint) {
- TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), "SkCanvas::drawLine()");
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), TRACE_FUNC);
SkPoint pts[2];
pts[0].set(x0, y0);
@@ -2731,7 +2731,7 @@
}
void SkCanvas::drawCircle(SkScalar cx, SkScalar cy, SkScalar radius, const SkPaint& paint) {
- TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), "SkCanvas::drawCircle()");
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), TRACE_FUNC);
if (radius < 0) {
radius = 0;
}
@@ -2743,7 +2743,7 @@
void SkCanvas::drawRoundRect(const SkRect& r, SkScalar rx, SkScalar ry,
const SkPaint& paint) {
- TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), "SkCanvas::drawRoundRect()");
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), TRACE_FUNC);
if (rx > 0 && ry > 0) {
SkRRect rrect;
rrect.setRectXY(r, rx, ry);
@@ -2756,7 +2756,7 @@
void SkCanvas::drawArc(const SkRect& oval, SkScalar startAngle,
SkScalar sweepAngle, bool useCenter,
const SkPaint& paint) {
- TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), "SkCanvas::drawArc()");
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), TRACE_FUNC);
if (oval.isEmpty() || !sweepAngle) {
return;
}
@@ -2766,7 +2766,7 @@
void SkCanvas::drawTextOnPathHV(const void* text, size_t byteLength,
const SkPath& path, SkScalar hOffset,
SkScalar vOffset, const SkPaint& paint) {
- TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), "SkCanvas::drawTextOnPathHV()");
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), TRACE_FUNC);
SkMatrix matrix;
matrix.setTranslate(hOffset, vOffset);
@@ -2787,7 +2787,7 @@
void SkCanvas::drawPicture(const SkPicture* picture, const SkMatrix* matrix, const SkPaint* paint) {
RETURN_ON_NULL(picture);
- TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), "SkCanvas::drawPicture()");
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), TRACE_FUNC);
if (matrix && matrix->isIdentity()) {
matrix = nullptr;
}
diff --git a/src/core/SkStream.cpp b/src/core/SkStream.cpp
index 32462de..7bb2079 100644
--- a/src/core/SkStream.cpp
+++ b/src/core/SkStream.cpp
@@ -13,7 +13,6 @@
#include "SkMakeUnique.h"
#include "SkString.h"
#include "SkOSFile.h"
-#include "SkTraceEvent.h"
#include "SkTypes.h"
///////////////////////////////////////////////////////////////////////////////
@@ -663,7 +662,6 @@
, fSize(size) , fOffset(0), fCurrentOffset(0) { }
size_t read(void* buffer, size_t rawCount) override {
- TRACE_EVENT0("skia-dynamic-memory-stream", "SkBlockMemoryStream::read");
size_t count = rawCount;
if (fOffset + count > fSize) {
count = fSize - fOffset;
diff --git a/src/gpu/GrDrawOpAtlas.cpp b/src/gpu/GrDrawOpAtlas.cpp
index f4f0883..4904e24 100644
--- a/src/gpu/GrDrawOpAtlas.cpp
+++ b/src/gpu/GrDrawOpAtlas.cpp
@@ -131,7 +131,7 @@
GrTexture* texture) {
// We should only be issuing uploads if we are in fact dirty
SkASSERT(fDirty && fData && texture);
- TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia.gpu"), "GrDrawOpAtlas::Plot::uploadToTexture");
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia.gpu"), TRACE_FUNC);
size_t rowBytes = fBytesPerPixel * fWidth;
const unsigned char* dataPtr = fData;
dataPtr += rowBytes * fDirtyRect.fTop;
diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp
index 0bab551..5c39d08 100644
--- a/src/gpu/gl/GrGLGpu.cpp
+++ b/src/gpu/gl/GrGLGpu.cpp
@@ -3459,7 +3459,7 @@
}
bool GrGLGpu::createCopyProgram(GrTexture* srcTex) {
- TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), "GrGLGpu::createCopyProgram()");
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), TRACE_FUNC);
int progIdx = TextureToCopyProgramIdx(srcTex);
const GrShaderCaps* shaderCaps = this->caps()->shaderCaps();
@@ -3738,7 +3738,7 @@
}
bool GrGLGpu::createStencilClipClearProgram() {
- TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), "GrGLGpu::createStencilClipClearProgram()");
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), TRACE_FUNC);
if (!fStencilClipClearArrayBuffer) {
static const GrGLfloat vdata[] = {-1, -1, 1, -1, -1, 1, 1, 1};
diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.cpp b/src/gpu/gl/builders/GrGLProgramBuilder.cpp
index 55557a5..6326550 100644
--- a/src/gpu/gl/builders/GrGLProgramBuilder.cpp
+++ b/src/gpu/gl/builders/GrGLProgramBuilder.cpp
@@ -98,7 +98,7 @@
}
GrGLProgram* GrGLProgramBuilder::finalize() {
- TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), "GrGLProgramBuilder::finalize()");
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), TRACE_FUNC);
// verify we can get a program id
GrGLuint programID;
diff --git a/src/gpu/vk/GrVkCopyManager.cpp b/src/gpu/vk/GrVkCopyManager.cpp
index f0dc602..08eb4f0 100644
--- a/src/gpu/vk/GrVkCopyManager.cpp
+++ b/src/gpu/vk/GrVkCopyManager.cpp
@@ -34,7 +34,7 @@
GrVkCopyManager::~GrVkCopyManager() {}
bool GrVkCopyManager::createCopyProgram(GrVkGpu* gpu) {
- TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), "GrVkCopyManager::createCopyProgram()");
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), TRACE_FUNC);
const GrShaderCaps* shaderCaps = gpu->caps()->shaderCaps();
const char* version = shaderCaps->versionDeclString();
diff --git a/src/pdf/SkDeflate.cpp b/src/pdf/SkDeflate.cpp
index 9533921..98ebed3 100644
--- a/src/pdf/SkDeflate.cpp
+++ b/src/pdf/SkDeflate.cpp
@@ -85,7 +85,7 @@
SkDeflateWStream::~SkDeflateWStream() { this->finalize(); }
void SkDeflateWStream::finalize() {
- TRACE_EVENT0("skia-pdf-deflate", "SkDeflateWStream::finalize");
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), TRACE_FUNC);
if (!fImpl->fOut) {
return;
}
@@ -96,7 +96,7 @@
}
bool SkDeflateWStream::write(const void* void_buffer, size_t len) {
- TRACE_EVENT0("skia-pdf-deflate", "SkDeflateWStream::write");
+ TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("skia"), TRACE_FUNC);
if (!fImpl->fOut) {
return false;
}
diff --git a/tests/TracingTest.cpp b/tests/TracingTest.cpp
deleted file mode 100644
index 730a46c..0000000
--- a/tests/TracingTest.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright 2014 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkTraceEvent.h"
-#include "Test.h"
-
-DEF_TEST(Tracing, reporter) {
- TRACE_EVENT0("skia.testing", "just a test");
-}
