Add some more trace to async text

Change-Id: I8b070fce151a6e9eb2ef74cc0f6033e3dcfcf43b
Signed-off-by: Bowon Ryu <bowon.ryu@samsung.com>

diff --git a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
index 355061d..2f965cf 100644 (file)
--- a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
@@ -1387,7 +1387,7 @@ void TextLabel::OnRelayout(const Vector2& size, RelayoutContainer& container)
       return;
     }
 
-    DALI_LOG_RELEASE_INFO("Async render request, size : %f, %f\n", contentSize.width, contentSize.height);
+    DALI_LOG_RELEASE_INFO("Request render, size : %f, %f\n", contentSize.width, contentSize.height);
     AsyncTextParameters parameters = GetAsyncTextParameters(Async::RENDER_FIXED_SIZE, contentSize, padding, layoutDirection);
     TextVisual::UpdateAsyncRenderer(mVisual, parameters);
     mTextUpdateNeeded = false;

diff --git a/dali-toolkit/internal/text/async-text/async-text-loader.h b/dali-toolkit/internal/text/async-text/async-text-loader.h
index 4e97240..40facd6 100644 (file)
--- a/dali-toolkit/internal/text/async-text/async-text-loader.h
+++ b/dali-toolkit/internal/text/async-text/async-text-loader.h
@@ -53,6 +53,14 @@ namespace Async
     COMPUTE_NATURAL_SIZE,
     COMPUTE_HEIGHT_FOR_WIDTH,
   };
+  const char* const RequestTypeName[] =
+  {
+    "RENDER_FIXED_SIZE",
+    "RENDER_FIXED_WIDTH",
+    "RENDER_CONSTRAINT",
+    "COMPUTE_NATURAL_SIZE",
+    "COMPUTE_HEIGHT_FOR_WIDTH"
+  };
 } // namespace Async
 
 struct AsyncTextParameters

diff --git a/dali-toolkit/internal/text/async-text/async-text-manager-impl.cpp b/dali-toolkit/internal/text/async-text/async-text-manager-impl.cpp
index 0019d48..dec3cfe 100644 (file)
--- a/dali-toolkit/internal/text/async-text/async-text-manager-impl.cpp
+++ b/dali-toolkit/internal/text/async-text/async-text-manager-impl.cpp
@@ -345,7 +345,7 @@ void AsyncTextManager::ObserverDestroyed(TextLoadObserver* observer)
 #ifdef TRACE_ENABLED
   if(gTraceFilter && gTraceFilter->IsTraceEnabled())
   {
-    DALI_LOG_RELEASE_INFO("-->AsyncTextManager::ObserverDestroyed observer : %p\n", observer);
+    DALI_LOG_RELEASE_INFO("ObserverDestroyed observer : %p\n", observer);
   }
 #endif
   for(auto it = mRunningTasks.begin(); it != mRunningTasks.end();)

diff --git a/dali-toolkit/internal/visuals/text/text-visual.cpp b/dali-toolkit/internal/visuals/text/text-visual.cpp
index dda68c2..74bba8c 100644 (file)
--- a/dali-toolkit/internal/visuals/text/text-visual.cpp
+++ b/dali-toolkit/internal/visuals/text/text-visual.cpp
@@ -65,6 +65,17 @@ const float VERTICAL_ALIGNMENT_TABLE[Text::VerticalAlignment::BOTTOM + 1] =
     1.0f  // VerticalAlignment::BOTTOM
 };
 
+#ifdef TRACE_ENABLED
+const char* GetRequestTypeName(Text::Async::RequestType type)
+{
+  if(type < Text::Async::RENDER_FIXED_SIZE || type > Text::Async::COMPUTE_HEIGHT_FOR_WIDTH)
+  {
+    return "INVALID_REQUEST_TYPE";
+  }
+  return Text::Async::RequestTypeName[type];
+}
+#endif
+
 /**
  * Return Property index for the given string key
  * param[in] stringKey the string index key
@@ -722,7 +733,7 @@ void TextVisual::LoadComplete(bool loadingSuccess, TextInformation textInformati
 #ifdef TRACE_ENABLED
   if(gTraceFilter2 && gTraceFilter2->IsTraceEnabled())
   {
-    DALI_LOG_RELEASE_INFO("LoadComplete, success:%d, type:%d\n", loadingSuccess, parameters.requestType);
+    DALI_LOG_RELEASE_INFO("LoadComplete, success:%d, type:%s\n", loadingSuccess, GetRequestTypeName(parameters.requestType));
   }
 #endif
 
@@ -1024,7 +1035,7 @@ void TextVisual::RequestAsyncSizeComputation(Text::AsyncTextParameters& paramete
 #ifdef TRACE_ENABLED
   if(gTraceFilter2 && gTraceFilter2->IsTraceEnabled())
   {
-    DALI_LOG_RELEASE_INFO("Request size computation, type:%d\n", parameters.requestType);
+    DALI_LOG_RELEASE_INFO("Request size computation, type:%s\n", GetRequestTypeName(parameters.requestType));
   }
 #endif
 
@@ -1104,7 +1115,7 @@ bool TextVisual::UpdateAsyncRenderer(Text::AsyncTextParameters& parameters)
 #ifdef TRACE_ENABLED
   if(gTraceFilter2 && gTraceFilter2->IsTraceEnabled())
   {
-    DALI_LOG_RELEASE_INFO("Request render, type:%d\n", parameters.requestType);
+    DALI_LOG_RELEASE_INFO("Request render, type:%s\n", GetRequestTypeName(parameters.requestType));
   }
 #endif