From ce9762b57feccb32088328933937a10771cb9c53 Mon Sep 17 00:00:00 2001 From: rnlee Date: Fri, 21 May 2021 15:40:53 -0700 Subject: [PATCH] Use TraceUtils.h from gui shared library. Test: It makes Bug: 183120308 Change-Id: I331262dd2da59817031f0c708f4c102041dcb5e0 --- libs/hwui/HardwareBitmapUploader.cpp | 2 +- libs/hwui/Readback.cpp | 2 +- libs/hwui/RenderNode.cpp | 2 +- libs/hwui/VectorDrawable.cpp | 2 +- libs/hwui/hwui/AnimatedImageDrawable.cpp | 2 +- libs/hwui/jni/Typeface.cpp | 17 +++--- .../jni/android_graphics_HardwareRenderer.cpp | 2 +- libs/hwui/jni/android_graphics_RenderNode.cpp | 2 +- .../hwui/pipeline/skia/RenderNodeDrawable.cpp | 4 +- libs/hwui/pipeline/skia/ShaderCache.cpp | 2 +- .../hwui/pipeline/skia/SkiaOpenGLPipeline.cpp | 2 +- libs/hwui/pipeline/skia/SkiaPipeline.cpp | 2 +- .../hwui/pipeline/skia/SkiaVulkanPipeline.cpp | 2 +- libs/hwui/pipeline/skia/VkFunctorDrawable.cpp | 2 +- .../skia/VkInteropFunctorDrawable.cpp | 2 +- libs/hwui/renderthread/CanvasContext.cpp | 2 +- libs/hwui/renderthread/DrawFrameTask.cpp | 2 +- libs/hwui/renderthread/RenderProxy.cpp | 2 +- libs/hwui/renderthread/RenderThread.cpp | 2 +- libs/hwui/renderthread/VulkanManager.cpp | 2 +- libs/hwui/renderthread/VulkanSurface.cpp | 2 +- .../hwui/tests/macrobench/TestSceneRunner.cpp | 2 +- libs/hwui/utils/TraceUtils.h | 57 ------------------- 23 files changed, 30 insertions(+), 88 deletions(-) delete mode 100644 libs/hwui/utils/TraceUtils.h diff --git a/libs/hwui/HardwareBitmapUploader.cpp b/libs/hwui/HardwareBitmapUploader.cpp index 859a5556323df..db3a1081e32ca 100644 --- a/libs/hwui/HardwareBitmapUploader.cpp +++ b/libs/hwui/HardwareBitmapUploader.cpp @@ -24,10 +24,10 @@ #include #include #include +#include #include #include #include -#include #include diff --git a/libs/hwui/Readback.cpp b/libs/hwui/Readback.cpp index a9b129fd6530c..8a8b4181bd942 100644 --- a/libs/hwui/Readback.cpp +++ b/libs/hwui/Readback.cpp @@ -19,6 +19,7 @@ #include #include +#include #include "DeferredLayerUpdater.h" #include "Properties.h" #include "hwui/Bitmap.h" @@ -28,7 +29,6 @@ #include "utils/Color.h" #include "utils/MathUtils.h" #include "utils/NdkUtils.h" -#include "utils/TraceUtils.h" using namespace android::uirenderer::renderthread; diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp index ded79940c934e..9a9e6d4b77bda 100644 --- a/libs/hwui/RenderNode.cpp +++ b/libs/hwui/RenderNode.cpp @@ -27,9 +27,9 @@ #include "DamageAccumulator.h" #include "pipeline/skia/SkiaDisplayList.h" #endif +#include #include "utils/MathUtils.h" #include "utils/StringUtils.h" -#include "utils/TraceUtils.h" #include #include diff --git a/libs/hwui/VectorDrawable.cpp b/libs/hwui/VectorDrawable.cpp index 4a21ad6ab9456..55f434f49bbda 100644 --- a/libs/hwui/VectorDrawable.cpp +++ b/libs/hwui/VectorDrawable.cpp @@ -30,8 +30,8 @@ #include "renderthread/RenderThread.h" #endif +#include #include "utils/Macros.h" -#include "utils/TraceUtils.h" #include "utils/VectorDrawableUtils.h" namespace android { diff --git a/libs/hwui/hwui/AnimatedImageDrawable.cpp b/libs/hwui/hwui/AnimatedImageDrawable.cpp index 0d3d3e3f38fdf..876f5c895c600 100644 --- a/libs/hwui/hwui/AnimatedImageDrawable.cpp +++ b/libs/hwui/hwui/AnimatedImageDrawable.cpp @@ -19,7 +19,7 @@ #include "AnimatedImageThread.h" #endif -#include "utils/TraceUtils.h" +#include #include "pipeline/skia/SkiaUtils.h" #include diff --git a/libs/hwui/jni/Typeface.cpp b/libs/hwui/jni/Typeface.cpp index f928baa27863b..ee7b260589521 100644 --- a/libs/hwui/jni/Typeface.cpp +++ b/libs/hwui/jni/Typeface.cpp @@ -15,19 +15,19 @@ */ #define ATRACE_TAG ATRACE_TAG_VIEW -#include "FontUtils.h" -#include "GraphicsJNI.h" -#include "fonts/Font.h" -#include -#include -#include "SkData.h" -#include "SkTypeface.h" +#include #include #include #include #include #include -#include +#include +#include +#include "FontUtils.h" +#include "GraphicsJNI.h" +#include "SkData.h" +#include "SkTypeface.h" +#include "fonts/Font.h" #include #include @@ -37,7 +37,6 @@ #endif using namespace android; -using android::uirenderer::TraceUtils; static inline Typeface* toTypeface(jlong ptr) { return reinterpret_cast(ptr); diff --git a/libs/hwui/jni/android_graphics_HardwareRenderer.cpp b/libs/hwui/jni/android_graphics_HardwareRenderer.cpp index 82bc5a1193e4d..4289c455453e7 100644 --- a/libs/hwui/jni/android_graphics_HardwareRenderer.cpp +++ b/libs/hwui/jni/android_graphics_HardwareRenderer.cpp @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -39,7 +40,6 @@ #include #include #include -#include #include diff --git a/libs/hwui/jni/android_graphics_RenderNode.cpp b/libs/hwui/jni/android_graphics_RenderNode.cpp index 002bd83cf6e6d..e1da1690518ac 100644 --- a/libs/hwui/jni/android_graphics_RenderNode.cpp +++ b/libs/hwui/jni/android_graphics_RenderNode.cpp @@ -26,8 +26,8 @@ #endif #include #include +#include #include -#include namespace android { diff --git a/libs/hwui/pipeline/skia/RenderNodeDrawable.cpp b/libs/hwui/pipeline/skia/RenderNodeDrawable.cpp index c8247e76d288e..d7546d86e4f45 100644 --- a/libs/hwui/pipeline/skia/RenderNodeDrawable.cpp +++ b/libs/hwui/pipeline/skia/RenderNodeDrawable.cpp @@ -16,11 +16,11 @@ #include "RenderNodeDrawable.h" #include -#include "StretchMask.h" +#include #include "RenderNode.h" #include "SkiaDisplayList.h" +#include "StretchMask.h" #include "TransformCanvas.h" -#include "utils/TraceUtils.h" #include diff --git a/libs/hwui/pipeline/skia/ShaderCache.cpp b/libs/hwui/pipeline/skia/ShaderCache.cpp index 3baff7ea8f90f..c482fc156e8b4 100644 --- a/libs/hwui/pipeline/skia/ShaderCache.cpp +++ b/libs/hwui/pipeline/skia/ShaderCache.cpp @@ -16,6 +16,7 @@ #include "ShaderCache.h" #include +#include #include #include #include @@ -23,7 +24,6 @@ #include #include "FileBlobCache.h" #include "Properties.h" -#include "utils/TraceUtils.h" namespace android { namespace uirenderer { diff --git a/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp b/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp index 50eea31f984f7..a78cd8316624c 100644 --- a/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp +++ b/libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp @@ -16,6 +16,7 @@ #include "SkiaOpenGLPipeline.h" +#include #include "DeferredLayerUpdater.h" #include "LayerDrawable.h" #include "LightingInfo.h" @@ -27,7 +28,6 @@ #include "renderthread/EglManager.h" #include "renderthread/Frame.h" #include "utils/GLUtils.h" -#include "utils/TraceUtils.h" #include diff --git a/libs/hwui/pipeline/skia/SkiaPipeline.cpp b/libs/hwui/pipeline/skia/SkiaPipeline.cpp index 1f73ac919a471..039b0f9a6e9a6 100644 --- a/libs/hwui/pipeline/skia/SkiaPipeline.cpp +++ b/libs/hwui/pipeline/skia/SkiaPipeline.cpp @@ -31,13 +31,13 @@ #include +#include #include "LightingInfo.h" #include "VectorDrawable.h" #include "thread/CommonPool.h" #include "tools/SkSharingProc.h" #include "utils/Color.h" #include "utils/String8.h" -#include "utils/TraceUtils.h" using namespace android::uirenderer::renderthread; diff --git a/libs/hwui/pipeline/skia/SkiaVulkanPipeline.cpp b/libs/hwui/pipeline/skia/SkiaVulkanPipeline.cpp index 30a3fc5ac93fa..0e4a1f945b856 100644 --- a/libs/hwui/pipeline/skia/SkiaVulkanPipeline.cpp +++ b/libs/hwui/pipeline/skia/SkiaVulkanPipeline.cpp @@ -16,6 +16,7 @@ #include "SkiaVulkanPipeline.h" +#include #include "DeferredLayerUpdater.h" #include "LightingInfo.h" #include "Readback.h" @@ -25,7 +26,6 @@ #include "VkInteropFunctorDrawable.h" #include "renderstate/RenderState.h" #include "renderthread/Frame.h" -#include "utils/TraceUtils.h" #include #include diff --git a/libs/hwui/pipeline/skia/VkFunctorDrawable.cpp b/libs/hwui/pipeline/skia/VkFunctorDrawable.cpp index 6efe1762976b5..8abf4534a04c1 100644 --- a/libs/hwui/pipeline/skia/VkFunctorDrawable.cpp +++ b/libs/hwui/pipeline/skia/VkFunctorDrawable.cpp @@ -21,9 +21,9 @@ #include #include #include +#include #include #include -#include #include #include #include "renderthread/RenderThread.h" diff --git a/libs/hwui/pipeline/skia/VkInteropFunctorDrawable.cpp b/libs/hwui/pipeline/skia/VkInteropFunctorDrawable.cpp index bae11f7d074c1..ddfb66f84f28f 100644 --- a/libs/hwui/pipeline/skia/VkInteropFunctorDrawable.cpp +++ b/libs/hwui/pipeline/skia/VkInteropFunctorDrawable.cpp @@ -21,11 +21,11 @@ #include #include #include +#include #include #include #include #include -#include #include diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp index c1f61e08e38cb..d3173056065c9 100644 --- a/libs/hwui/renderthread/CanvasContext.cpp +++ b/libs/hwui/renderthread/CanvasContext.cpp @@ -26,6 +26,7 @@ #include #include +#include #include "../Properties.h" #include "AnimationContext.h" #include "Frame.h" @@ -39,7 +40,6 @@ #include "thread/CommonPool.h" #include "utils/GLUtils.h" #include "utils/TimeUtils.h" -#include "utils/TraceUtils.h" #define TRIM_MEMORY_COMPLETE 80 #define TRIM_MEMORY_UI_HIDDEN 20 diff --git a/libs/hwui/renderthread/DrawFrameTask.cpp b/libs/hwui/renderthread/DrawFrameTask.cpp index 8448b87b5948c..5c4b9019b0ad2 100644 --- a/libs/hwui/renderthread/DrawFrameTask.cpp +++ b/libs/hwui/renderthread/DrawFrameTask.cpp @@ -16,8 +16,8 @@ #include "DrawFrameTask.h" +#include #include -#include #include #include "../DeferredLayerUpdater.h" diff --git a/libs/hwui/renderthread/RenderProxy.cpp b/libs/hwui/renderthread/RenderProxy.cpp index 95aa29d9eb133..ac19a153b6fbc 100644 --- a/libs/hwui/renderthread/RenderProxy.cpp +++ b/libs/hwui/renderthread/RenderProxy.cpp @@ -16,6 +16,7 @@ #include "RenderProxy.h" +#include #include "DeferredLayerUpdater.h" #include "DisplayList.h" #include "Properties.h" @@ -27,7 +28,6 @@ #include "renderthread/RenderThread.h" #include "utils/Macros.h" #include "utils/TimeUtils.h" -#include "utils/TraceUtils.h" namespace android { namespace uirenderer { diff --git a/libs/hwui/renderthread/RenderThread.cpp b/libs/hwui/renderthread/RenderThread.cpp index a648f986f3d2a..4ba774801bba6 100644 --- a/libs/hwui/renderthread/RenderThread.cpp +++ b/libs/hwui/renderthread/RenderThread.cpp @@ -16,6 +16,7 @@ #include "RenderThread.h" +#include #include "../HardwareBitmapUploader.h" #include "CanvasContext.h" #include "DeviceInfo.h" @@ -29,7 +30,6 @@ #include "pipeline/skia/SkiaVulkanPipeline.h" #include "renderstate/RenderState.h" #include "utils/TimeUtils.h" -#include "utils/TraceUtils.h" #include #include diff --git a/libs/hwui/renderthread/VulkanManager.cpp b/libs/hwui/renderthread/VulkanManager.cpp index 07146e845714f..5a718330d68f1 100644 --- a/libs/hwui/renderthread/VulkanManager.cpp +++ b/libs/hwui/renderthread/VulkanManager.cpp @@ -29,11 +29,11 @@ #include +#include #include "Properties.h" #include "RenderThread.h" #include "pipeline/skia/ShaderCache.h" #include "renderstate/RenderState.h" -#include "utils/TraceUtils.h" namespace android { namespace uirenderer { diff --git a/libs/hwui/renderthread/VulkanSurface.cpp b/libs/hwui/renderthread/VulkanSurface.cpp index c55942596e604..01a2ec5116df7 100644 --- a/libs/hwui/renderthread/VulkanSurface.cpp +++ b/libs/hwui/renderthread/VulkanSurface.cpp @@ -20,9 +20,9 @@ #include #include +#include #include "VulkanManager.h" #include "utils/Color.h" -#include "utils/TraceUtils.h" namespace android { namespace uirenderer { diff --git a/libs/hwui/tests/macrobench/TestSceneRunner.cpp b/libs/hwui/tests/macrobench/TestSceneRunner.cpp index b640b90ecd5e1..de2c6214088db 100644 --- a/libs/hwui/tests/macrobench/TestSceneRunner.cpp +++ b/libs/hwui/tests/macrobench/TestSceneRunner.cpp @@ -14,6 +14,7 @@ * limitations under the License. */ +#include #include "AnimationContext.h" #include "RenderNode.h" #include "renderthread/RenderProxy.h" @@ -21,7 +22,6 @@ #include "tests/common/TestContext.h" #include "tests/common/TestScene.h" #include "tests/common/scenes/TestSceneBase.h" -#include "utils/TraceUtils.h" #include #include diff --git a/libs/hwui/utils/TraceUtils.h b/libs/hwui/utils/TraceUtils.h deleted file mode 100644 index e61b4be1784e4..0000000000000 --- a/libs/hwui/utils/TraceUtils.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (C) 2014 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#ifndef TRACE_UTILS_H -#define TRACE_UTILS_H - -#include -#include - -#define ATRACE_FORMAT(fmt, ...) \ - TraceUtils::TraceEnder __traceEnder = \ - (TraceUtils::atraceFormatBegin(fmt, ##__VA_ARGS__), TraceUtils::TraceEnder()) - -#define ATRACE_FORMAT_BEGIN(fmt, ...) TraceUtils::atraceFormatBegin(fmt, ##__VA_ARGS__) - -namespace android { -namespace uirenderer { - -class TraceUtils { -public: - class TraceEnder { - public: - ~TraceEnder() { ATRACE_END(); } - }; - - static void atraceFormatBegin(const char* fmt, ...) { - if (CC_LIKELY(!ATRACE_ENABLED())) return; - - const int BUFFER_SIZE = 256; - va_list ap; - char buf[BUFFER_SIZE]; - - va_start(ap, fmt); - vsnprintf(buf, BUFFER_SIZE, fmt, ap); - va_end(ap); - - ATRACE_BEGIN(buf); - } - -}; // class TraceUtils - -} /* namespace uirenderer */ -} /* namespace android */ - -#endif /* TRACE_UTILS_H */