From a5911c9c5f6f265bd4d0b05b99379267e38d4136 Mon Sep 17 00:00:00 2001 From: Eunki Hong Date: Fri, 30 Dec 2022 00:48:07 +0900 Subject: [PATCH] Trace use scope macro instead of begin-end Since we don't need to follow functions usecase, use trace scope macro instead of begin-end Change-Id: Ie3d53f09b979f6dd8644076ad704c182ded2bf8e Signed-off-by: Eunki Hong --- .../controller/text-controller-event-handler.cpp | 3 +-- .../text-controller-impl-model-updater.cpp | 4 +--- .../text/controller/text-controller-relayouter.cpp | 22 +++++----------------- .../internal/text/rendering/text-typesetter.cpp | 4 +--- dali-toolkit/internal/visuals/text/text-visual.cpp | 4 +--- 5 files changed, 9 insertions(+), 28 deletions(-) diff --git a/dali-toolkit/internal/text/controller/text-controller-event-handler.cpp b/dali-toolkit/internal/text/controller/text-controller-event-handler.cpp index 812b38e..136b176 100644 --- a/dali-toolkit/internal/text/controller/text-controller-event-handler.cpp +++ b/dali-toolkit/internal/text/controller/text-controller-event-handler.cpp @@ -607,7 +607,7 @@ void Controller::EventHandler::ProcessModifyEvents(Controller& controller) return; } - DALI_TRACE_BEGIN(gTraceFilter, "DALI_TEXT_MODIFY_EVENTS"); + DALI_TRACE_SCOPE(gTraceFilter, "DALI_TEXT_MODIFY_EVENTS"); for(Vector::ConstIterator it = events.Begin(), endIt = events.End(); @@ -658,7 +658,6 @@ void Controller::EventHandler::ProcessModifyEvents(Controller& controller) // DISCARD temporary text events.Clear(); - DALI_TRACE_END(gTraceFilter, "DALI_TEXT_MODIFY_EVENTS"); } void Controller::EventHandler::TextReplacedEvent(Controller& controller) diff --git a/dali-toolkit/internal/text/controller/text-controller-impl-model-updater.cpp b/dali-toolkit/internal/text/controller/text-controller-impl-model-updater.cpp index 48546c9..587be26 100644 --- a/dali-toolkit/internal/text/controller/text-controller-impl-model-updater.cpp +++ b/dali-toolkit/internal/text/controller/text-controller-impl-model-updater.cpp @@ -70,7 +70,7 @@ bool ControllerImplModelUpdater::Update(Controller::Impl& impl, OperationsMask o // Nothing to do if no operations are pending and required. return false; } - DALI_TRACE_BEGIN(gTraceFilter, "DALI_TEXT_MODEL_UPDATE"); + DALI_TRACE_SCOPE(gTraceFilter, "DALI_TEXT_MODEL_UPDATE"); Vector& srcCharacters = impl.mModel->mLogicalModel->mText; Vector displayCharacters; @@ -606,8 +606,6 @@ bool ControllerImplModelUpdater::Update(Controller::Impl& impl, OperationsMask o // Set the previous number of characters for the next time the text is updated. impl.mTextUpdateInfo.mPreviousNumberOfCharacters = numberOfCharacters; - DALI_TRACE_END(gTraceFilter, "DALI_TEXT_MODEL_UPDATE"); - return updated; } diff --git a/dali-toolkit/internal/text/controller/text-controller-relayouter.cpp b/dali-toolkit/internal/text/controller/text-controller-relayouter.cpp index f792ad5..723e897 100644 --- a/dali-toolkit/internal/text/controller/text-controller-relayouter.cpp +++ b/dali-toolkit/internal/text/controller/text-controller-relayouter.cpp @@ -160,7 +160,7 @@ Size Controller::Relayouter::CalculateLayoutSizeOnRequiredControllerSize(Control Vector3 Controller::Relayouter::GetNaturalSize(Controller& controller) { DALI_LOG_INFO(gLogFilter, Debug::Verbose, "-->Controller::GetNaturalSize\n"); - DALI_TRACE_BEGIN(gTraceFilter, "DALI_TEXT_GET_NATURAL_SIZE"); + DALI_TRACE_SCOPE(gTraceFilter, "DALI_TEXT_GET_NATURAL_SIZE"); Vector3 naturalSizeVec3; // Make sure the model is up-to-date before layouting @@ -199,8 +199,6 @@ Vector3 Controller::Relayouter::GetNaturalSize(Controller& controller) naturalSizeVec3.x = ConvertToEven(naturalSizeVec3.x); naturalSizeVec3.y = ConvertToEven(naturalSizeVec3.y); - DALI_TRACE_END(gTraceFilter, "DALI_TEXT_GET_NATURAL_SIZE"); - return naturalSizeVec3; } @@ -251,7 +249,7 @@ void Controller::Relayouter::FitPointSizeforLayout(Controller& controller, const const OperationsMask operations = impl.mOperationsPending; if(NO_OPERATION != (UPDATE_LAYOUT_SIZE & operations) || impl.mTextFitContentSize != layoutSize) { - DALI_TRACE_BEGIN(gTraceFilter, "DALI_TEXT_FIT_LAYOUT"); + DALI_TRACE_SCOPE(gTraceFilter, "DALI_TEXT_FIT_LAYOUT"); ModelPtr& model = impl.mModel; bool actualellipsis = model->mElideEnabled; @@ -322,15 +320,13 @@ void Controller::Relayouter::FitPointSizeforLayout(Controller& controller, const impl.mFontDefaults->mFitPointSize = bestPointSize; impl.mFontDefaults->sizeDefined = true; impl.ClearFontData(); - - DALI_TRACE_END(gTraceFilter, "DALI_TEXT_FIT_LAYOUT"); } } float Controller::Relayouter::GetHeightForWidth(Controller& controller, float width) { DALI_LOG_INFO(gLogFilter, Debug::Verbose, "-->Controller::GetHeightForWidth %p width %f\n", &controller, width); - DALI_TRACE_BEGIN(gTraceFilter, "DALI_TEXT_GET_HEIGHT_FOR_WIDTH"); + DALI_TRACE_SCOPE(gTraceFilter, "DALI_TEXT_GET_HEIGHT_FOR_WIDTH"); // Make sure the model is up-to-date before layouting EventHandler::ProcessModifyEvents(controller); @@ -360,8 +356,6 @@ float Controller::Relayouter::GetHeightForWidth(Controller& controller, float wi DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::GetHeightForWidth cached %f\n", layoutSize.height); } - DALI_TRACE_END(gTraceFilter, "DALI_TEXT_GET_HEIGHT_FOR_WIDTH"); - return layoutSize.height; } @@ -373,7 +367,7 @@ Controller::UpdateTextType Controller::Relayouter::Relayout(Controller& controll TextUpdateInfo& textUpdateInfo = impl.mTextUpdateInfo; DALI_LOG_INFO(gLogFilter, Debug::Verbose, "-->Controller::Relayout %p size %f,%f, autoScroll[%s]\n", &controller, size.width, size.height, impl.mIsAutoScrollEnabled ? "true" : "false"); - DALI_TRACE_BEGIN(gTraceFilter, "DALI_TEXT_RELAYOUT"); + DALI_TRACE_SCOPE(gTraceFilter, "DALI_TEXT_RELAYOUT"); UpdateTextType updateTextType = NONE_UPDATED; @@ -390,7 +384,6 @@ Controller::UpdateTextType Controller::Relayouter::Relayout(Controller& controll // Not worth to relayout if width or height is equal to zero. DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::Relayout (skipped)\n"); - DALI_TRACE_END(gTraceFilter, "DALI_TEXT_RELAYOUT"); return updateTextType; } @@ -545,7 +538,6 @@ Controller::UpdateTextType Controller::Relayouter::Relayout(Controller& controll // Clear the update info. This info will be set the next time the text is updated. textUpdateInfo.Clear(); DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::Relayout\n"); - DALI_TRACE_END(gTraceFilter, "DALI_TEXT_RELAYOUT"); return updateTextType; } @@ -553,7 +545,7 @@ Controller::UpdateTextType Controller::Relayouter::Relayout(Controller& controll bool Controller::Relayouter::DoRelayout(Controller::Impl& impl, const Size& size, OperationsMask operationsRequired, Size& layoutSize) { DALI_LOG_INFO(gLogFilter, Debug::Verbose, "-->Controller::Relayouter::DoRelayout %p size %f,%f\n", &impl, size.width, size.height); - DALI_TRACE_BEGIN(gTraceFilter, "DALI_TEXT_DORELAYOUT"); + DALI_TRACE_SCOPE(gTraceFilter, "DALI_TEXT_DORELAYOUT"); bool viewUpdated(false); // Calculate the operations to be done. @@ -596,8 +588,6 @@ bool Controller::Relayouter::DoRelayout(Controller::Impl& impl, const Size& size DALI_LOG_ERROR("Current text is: %s\n", currentText.c_str()); DALI_LOG_ERROR("startIndex: %u, lastIndex: %u, requestedNumberOfCharacters: %u, charactersToGlyph.Count = %lu, glyphsPerCharacter.Count = %lu\n", startIndex, lastIndex, requestedNumberOfCharacters, charactersToGlyph.Count(), glyphsPerCharacter.Count()); - DALI_TRACE_END(gTraceFilter, "DALI_TEXT_DORELAYOUT"); - return false; } @@ -613,7 +603,6 @@ bool Controller::Relayouter::DoRelayout(Controller::Impl& impl, const Size& size // Nothing else to do if there is no glyphs. DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::DoRelayout no glyphs, view updated true\n"); - DALI_TRACE_END(gTraceFilter, "DALI_TEXT_DORELAYOUT"); return true; } @@ -712,7 +701,6 @@ bool Controller::Relayouter::DoRelayout(Controller::Impl& impl, const Size& size DALI_LOG_INFO(gLogFilter, Debug::Concise, "Controller::Relayouter::DoRelayout [%p] mImpl->mIsTextDirectionRTL[%s] [%s]\n", &impl, (impl.mIsTextDirectionRTL) ? "true" : "false", currentText.c_str()); #endif DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::Relayouter::DoRelayout, view updated %s\n", (viewUpdated ? "true" : "false")); - DALI_TRACE_END(gTraceFilter, "DALI_TEXT_DORELAYOUT"); return viewUpdated; } diff --git a/dali-toolkit/internal/text/rendering/text-typesetter.cpp b/dali-toolkit/internal/text/rendering/text-typesetter.cpp index 4a3474b..2053d5c 100644 --- a/dali-toolkit/internal/text/rendering/text-typesetter.cpp +++ b/dali-toolkit/internal/text/rendering/text-typesetter.cpp @@ -885,7 +885,7 @@ ViewModel* Typesetter::GetViewModel() PixelData Typesetter::Render(const Vector2& size, Toolkit::DevelText::TextDirection::Type textDirection, RenderBehaviour behaviour, bool ignoreHorizontalAlignment, Pixel::Format pixelFormat) { - DALI_TRACE_BEGIN(gTraceFilter, "DALI_TEXT_RENDERING_TYPESETTER"); + DALI_TRACE_SCOPE(gTraceFilter, "DALI_TEXT_RENDERING_TYPESETTER"); // @todo. This initial implementation for a TextLabel has only one visible page. // Elides the text if needed. @@ -1075,8 +1075,6 @@ PixelData Typesetter::Render(const Vector2& size, Toolkit::DevelText::TextDirect // Create the final PixelData for the combined image buffer PixelData pixelData = Devel::PixelBuffer::Convert(imageBuffer); - DALI_TRACE_END(gTraceFilter, "DALI_TEXT_RENDERING_TYPESETTER"); - return pixelData; } diff --git a/dali-toolkit/internal/visuals/text/text-visual.cpp b/dali-toolkit/internal/visuals/text/text-visual.cpp index 64be4ad..6ca476c 100644 --- a/dali-toolkit/internal/visuals/text/text-visual.cpp +++ b/dali-toolkit/internal/visuals/text/text-visual.cpp @@ -663,7 +663,7 @@ void TextVisual::AddRenderer(Actor& actor, const Vector2& size, bool hasMultiple Shader shader = GetTextShader(mFactoryCache, TextVisualShaderFeature::FeatureBuilder().EnableMultiColor(hasMultipleTextColors).EnableEmoji(containsColorGlyph).EnableStyle(styleEnabled).EnableOverlay(isOverlayStyle)); mImpl->mRenderer.SetShader(shader); - DALI_TRACE_BEGIN(gTraceFilter, "DALI_TEXT_VISUAL_UPDATE_RENDERER"); + DALI_TRACE_SCOPE(gTraceFilter, "DALI_TEXT_VISUAL_UPDATE_RENDERER"); // Get the maximum size. const int maxTextureSize = Dali::GetMaxTextureSize(); @@ -794,8 +794,6 @@ void TextVisual::AddRenderer(Actor& actor, const Vector2& size, bool hasMultiple } } } - - DALI_TRACE_END(gTraceFilter, "DALI_TEXT_VISUAL_UPDATE_RENDERER"); } TextureSet TextVisual::GetTextTexture(const Vector2& size) -- 2.7.4