Reduce the length of log during image trace

Change-Id: Id5ec87c10021a3d391295d88fbef2a88e1750150
Signed-off-by: Eunki, Hong <eunkiki.hong@samsung.com>

diff --git a/dali-toolkit/internal/image-loader/fast-track-loading-task.cpp b/dali-toolkit/internal/image-loader/fast-track-loading-task.cpp
index d2faacd..e65ca57 100644 (file)
--- a/dali-toolkit/internal/image-loader/fast-track-loading-task.cpp
+++ b/dali-toolkit/internal/image-loader/fast-track-loading-task.cpp
@@ -149,7 +149,7 @@ void FastTrackLoadingTask::Load()
   if(gTraceFilter && gTraceFilter->IsTraceEnabled())
   {
     std::ostringstream oss;
-    oss << "[url:" << mUrl.GetEllipsedUrl() << "]";
+    oss << "[u:" << mUrl.GetEllipsedUrl() << "]";
     // DALI_TRACE_BEGIN(gTraceFilter, "DALI_IMAGE_FAST_TRACK_UPLOADING_TASK"); ///< TODO : Open it if we can control trace log level
     DALI_LOG_RELEASE_INFO("BEGIN: DALI_IMAGE_FAST_TRACK_UPLOADING_TASK %s", oss.str().c_str());
   }
@@ -221,13 +221,13 @@ void FastTrackLoadingTask::Load()
   {
     std::ostringstream oss;
     oss << "[";
-    oss << "pixelBuffers:" << pixelBuffers.size() << " ";
+    oss << "b:" << pixelBuffers.size() << " ";
     if(!mPixelData.empty())
     {
-      oss << "size:" << mPixelData[0].GetWidth() << "x" << mPixelData[0].GetHeight() << " ";
-      oss << "premult:" << mPremultiplied << " ";
+      oss << "s:" << mPixelData[0].GetWidth() << "x" << mPixelData[0].GetHeight() << " ";
+      oss << "p:" << mPremultiplied << " ";
     }
-    oss << "url:" << mUrl.GetEllipsedUrl() << "]";
+    oss << "u:" << mUrl.GetEllipsedUrl() << "]";
     // DALI_TRACE_END(gTraceFilter, "DALI_IMAGE_FAST_TRACK_UPLOADING_TASK"); ///< TODO : Open it if we can control trace log level
     DALI_LOG_RELEASE_INFO("END: DALI_IMAGE_FAST_TRACK_UPLOADING_TASK %s", oss.str().c_str());
   }

diff --git a/dali-toolkit/internal/image-loader/loading-task.cpp b/dali-toolkit/internal/image-loader/loading-task.cpp
index 43a994d..4471344 100644 (file)
--- a/dali-toolkit/internal/image-loader/loading-task.cpp
+++ b/dali-toolkit/internal/image-loader/loading-task.cpp
@@ -162,7 +162,7 @@ void LoadingTask::Process()
   if(gTraceFilter && gTraceFilter->IsTraceEnabled())
   {
     std::ostringstream oss;
-    oss << "[url:" << (!!(animatedImageLoading) ? animatedImageLoading.GetUrl() : url.GetEllipsedUrl()) << "]";
+    oss << "[u:" << (!!(animatedImageLoading) ? animatedImageLoading.GetUrl() : url.GetEllipsedUrl()) << "]";
     // DALI_TRACE_BEGIN(gTraceFilter, "DALI_IMAGE_LOADING_TASK"); ///< TODO : Open it if we can control trace log level
     DALI_LOG_RELEASE_INFO("BEGIN: DALI_IMAGE_LOADING_TASK %s", oss.str().c_str());
   }
@@ -185,15 +185,15 @@ void LoadingTask::Process()
   {
     std::ostringstream oss;
     oss << "[";
-    oss << "masking:" << isMaskTask << " ";
-    oss << "index:" << frameIndex << " ";
-    oss << "pixelBuffers:" << pixelBuffers.size() << " ";
+    oss << "m:" << isMaskTask << " ";
+    oss << "i:" << frameIndex << " ";
+    oss << "b:" << pixelBuffers.size() << " ";
     if(!pixelBuffers.empty())
     {
-      oss << "size:" << pixelBuffers[0].GetWidth() << "x" << pixelBuffers[0].GetHeight() << " ";
-      oss << "premult:" << pixelBuffers[0].IsAlphaPreMultiplied() << " ";
+      oss << "s:" << pixelBuffers[0].GetWidth() << "x" << pixelBuffers[0].GetHeight() << " ";
+      oss << "p:" << pixelBuffers[0].IsAlphaPreMultiplied() << " ";
     }
-    oss << "url:" << (!!(animatedImageLoading) ? animatedImageLoading.GetUrl() : url.GetEllipsedUrl()) << "]";
+    oss << "u:" << (!!(animatedImageLoading) ? animatedImageLoading.GetUrl() : url.GetEllipsedUrl()) << "]";
     // DALI_TRACE_END(gTraceFilter, "DALI_IMAGE_LOADING_TASK"); ///< TODO : Open it if we can control trace log level
     DALI_LOG_RELEASE_INFO("END: DALI_IMAGE_LOADING_TASK %s", oss.str().c_str());
   }

diff --git a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.cpp b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.cpp
index bb16e62..a746ba2 100644 (file)
--- a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.cpp
+++ b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.cpp
@@ -155,7 +155,7 @@ bool VectorAnimationTask::Load(bool synchronousLoading)
   if(gTraceFilter && gTraceFilter->IsTraceEnabled())
   {
     std::ostringstream oss;
-    oss << "[url:" << mImageUrl.GetEllipsedUrl() << "]";
+    oss << "[u:" << mImageUrl.GetEllipsedUrl() << "]";
     // DALI_TRACE_BEGIN(gTraceFilter, "DALI_LOTTIE_LOADING_TASK"); ///< TODO : Open it if we can control trace log level
     DALI_LOG_RELEASE_INFO("BEGIN: DALI_LOTTIE_LOADING_TASK %s", oss.str().c_str());
   }
@@ -203,7 +203,7 @@ bool VectorAnimationTask::Load(bool synchronousLoading)
     if(gTraceFilter && gTraceFilter->IsTraceEnabled())
     {
       std::ostringstream oss;
-      oss << "[url:" << mImageUrl.GetEllipsedUrl() << "]";
+      oss << "[u:" << mImageUrl.GetEllipsedUrl() << "]";
       // DALI_TRACE_END(gTraceFilter, "DALI_LOTTIE_LOADING_TASK"); ///< TODO : Open it if we can control trace log level
       DALI_LOG_RELEASE_INFO("END: DALI_LOTTIE_LOADING_TASK %s", oss.str().c_str());
     }
@@ -233,7 +233,7 @@ bool VectorAnimationTask::Load(bool synchronousLoading)
   if(gTraceFilter && gTraceFilter->IsTraceEnabled())
   {
     std::ostringstream oss;
-    oss << "[url:" << mImageUrl.GetEllipsedUrl() << "]";
+    oss << "[u:" << mImageUrl.GetEllipsedUrl() << "]";
     // DALI_TRACE_END(gTraceFilter, "DALI_LOTTIE_LOADING_TASK"); ///< TODO : Open it if we can control trace log level
     DALI_LOG_RELEASE_INFO("END: DALI_LOTTIE_LOADING_TASK %s", oss.str().c_str());
   }
@@ -575,8 +575,8 @@ bool VectorAnimationTask::Rasterize()
   }
 
   DALI_TRACE_BEGIN_WITH_MESSAGE_GENERATOR(gTraceFilter, "DALI_LOTTIE_RASTERIZE_TASK", [&](std::ostringstream& oss) {
-    oss << "[size:" << mWidth << "x" << mHeight << " ";
-    oss << "url:" << mImageUrl.GetEllipsedUrl() << "]";
+    oss << "[s:" << mWidth << "x" << mHeight << " ";
+    oss << "u:" << mImageUrl.GetEllipsedUrl() << "]";
   });
 
   ApplyAnimationData();
@@ -687,11 +687,11 @@ bool VectorAnimationTask::Rasterize()
   }
 
   DALI_TRACE_END_WITH_MESSAGE_GENERATOR(gTraceFilter, "DALI_LOTTIE_RASTERIZE_TASK", [&](std::ostringstream& oss) {
-    oss << "[size:" << mWidth << "x" << mHeight << " ";
-    oss << "frame:" << mCurrentFrame << " ";
-    oss << "loop:" << mCurrentLoop << " ";
-    oss << "state:" << mPlayState << " ";
-    oss << "url:" << mImageUrl.GetEllipsedUrl() << "]";
+    oss << "[s:" << mWidth << "x" << mHeight << " ";
+    oss << "f:" << mCurrentFrame << " ";
+    oss << "l:" << mCurrentLoop << " ";
+    oss << "p:" << mPlayState << " ";
+    oss << "u:" << mImageUrl.GetEllipsedUrl() << "]";
   });
 
   return true;

diff --git a/dali-toolkit/internal/visuals/svg/svg-task.cpp b/dali-toolkit/internal/visuals/svg/svg-task.cpp
index 1305936..35c0028 100644 (file)
--- a/dali-toolkit/internal/visuals/svg/svg-task.cpp
+++ b/dali-toolkit/internal/visuals/svg/svg-task.cpp
@@ -89,7 +89,7 @@ void SvgLoadingTask::Process()
   if(gTraceFilter && gTraceFilter->IsTraceEnabled())
   {
     std::ostringstream oss;
-    oss << "[url:" << mImageUrl.GetEllipsedUrl() << "]";
+    oss << "[u:" << mImageUrl.GetEllipsedUrl() << "]";
     // DALI_TRACE_BEGIN(gTraceFilter, "DALI_SVG_LOADING_TASK"); ///< TODO : Open it if we can control trace log level
     DALI_LOG_RELEASE_INFO("BEGIN: DALI_SVG_LOADING_TASK %s", oss.str().c_str());
   }
@@ -142,8 +142,8 @@ void SvgLoadingTask::Process()
   if(gTraceFilter && gTraceFilter->IsTraceEnabled())
   {
     std::ostringstream oss;
-    oss << "[success:" << mHasSucceeded << " ";
-    oss << "url:" << mImageUrl.GetEllipsedUrl() << "]";
+    oss << "[s:" << mHasSucceeded << " ";
+    oss << "u:" << mImageUrl.GetEllipsedUrl() << "]";
     // DALI_TRACE_END(gTraceFilter, "DALI_SVG_LOADING_TASK"); ///< TODO : Open it if we can control trace log level
     DALI_LOG_RELEASE_INFO("END: DALI_SVG_LOADING_TASK %s", oss.str().c_str());
   }
@@ -175,8 +175,8 @@ void SvgRasterizingTask::Process()
   }
 
   DALI_TRACE_BEGIN_WITH_MESSAGE_GENERATOR(gTraceFilter, "DALI_SVG_RASTERIZE_TASK", [&](std::ostringstream& oss) {
-    oss << "[size:" << mWidth << "x" << mHeight << " ";
-    oss << "url:" << mImageUrl.GetEllipsedUrl() << "]";
+    oss << "[s:" << mWidth << "x" << mHeight << " ";
+    oss << "u:" << mImageUrl.GetEllipsedUrl() << "]";
   });
 
   Devel::PixelBuffer pixelBuffer = mVectorRenderer.Rasterize(mWidth, mHeight);
@@ -184,8 +184,8 @@ void SvgRasterizingTask::Process()
   {
     DALI_LOG_ERROR("Rasterize is failed!\n");
     DALI_TRACE_END_WITH_MESSAGE_GENERATOR(gTraceFilter, "DALI_SVG_RASTERIZE_TASK", [&](std::ostringstream& oss) {
-      oss << "[size:" << mWidth << "x" << mHeight << " ";
-      oss << "url:" << mImageUrl.GetEllipsedUrl() << "]";
+      oss << "[s:" << mWidth << "x" << mHeight << " ";
+      oss << "u:" << mImageUrl.GetEllipsedUrl() << "]";
     });
     return;
   }
@@ -194,8 +194,8 @@ void SvgRasterizingTask::Process()
   mHasSucceeded = true;
 
   DALI_TRACE_END_WITH_MESSAGE_GENERATOR(gTraceFilter, "DALI_SVG_RASTERIZE_TASK", [&](std::ostringstream& oss) {
-    oss << "[size:" << mWidth << "x" << mHeight << " ";
-    oss << "url:" << mImageUrl.GetEllipsedUrl() << "]";
+    oss << "[s:" << mWidth << "x" << mHeight << " ";
+    oss << "u:" << mImageUrl.GetEllipsedUrl() << "]";
   });
 }