Print some logs for initialize UpdateRenderThread + Revert TV profile trace block

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

diff --git a/dali/internal/adaptor/common/combined-update-render-controller.cpp b/dali/internal/adaptor/common/combined-update-render-controller.cpp
index 682948c8aef878e5ec74db24cf10468b2ae01f67..47bebf36286ab04e0193c937d47443964e28f9f0 100644 (file)
--- a/dali/internal/adaptor/common/combined-update-render-controller.cpp
+++ b/dali/internal/adaptor/common/combined-update-render-controller.cpp
@@ -212,7 +212,9 @@ void CombinedUpdateRenderController::Start()
   // Wait until all threads created in Initialise are up and running
   for(unsigned int i = 0; i < CREATED_THREAD_COUNT; ++i)
   {
+    DALI_LOG_RELEASE_INFO("Wait thread context [%u/%u] initialized\n", i, CREATED_THREAD_COUNT);
     mEventThreadSemaphore.Acquire();
+    DALI_LOG_RELEASE_INFO("Thread context [%u] initialized done\n", i);
   }
 
   mRunning = TRUE;
@@ -355,7 +357,9 @@ void CombinedUpdateRenderController::ReplaceSurface(Dali::Integration::RenderSur
     }
 
     // Wait until the surface has been replaced
+    DALI_LOG_RELEASE_INFO("Wait surface semaphore\n");
     mSurfaceSemaphore.Acquire();
+    DALI_LOG_RELEASE_INFO("Surface semaphore done.\n");
 
     LOG_EVENT("Surface replaced, event-thread continuing");
   }
@@ -379,7 +383,9 @@ void CombinedUpdateRenderController::DeleteSurface(Dali::Integration::RenderSurf
     }
 
     // Wait until the surface has been deleted
+    DALI_LOG_RELEASE_INFO("Wait surface semaphore\n");
     mSurfaceSemaphore.Acquire();
+    DALI_LOG_RELEASE_INFO("Surface semaphore done.\n");
 
     LOG_EVENT("Surface deleted, event-thread continuing");
   }
@@ -555,7 +561,7 @@ void CombinedUpdateRenderController::UpdateRenderThread()
   // Install a function for tracing
   mEnvironmentOptions.InstallTraceFunction();
 
-  TRACE_UPDATE_RENDER_BEGIN("DALI_RENDER_THREAD_INIT");
+  DALI_LOG_RELEASE_INFO("BEGIN: DALI_RENDER_THREAD_INIT\n");
 
   LOG_UPDATE_RENDER("THREAD CREATED");
 
@@ -610,7 +616,7 @@ void CombinedUpdateRenderController::UpdateRenderThread()
   const bool         renderToFboEnabled  = 0u != renderToFboInterval;
   unsigned int       frameCount          = 0u;
 
-  TRACE_UPDATE_RENDER_END("DALI_RENDER_THREAD_INIT");
+  DALI_LOG_RELEASE_INFO("END: DALI_RENDER_THREAD_INIT\n");
   if(!mDestroyUpdateRenderThread)
   {
     ShaderPreCompiler::Get().Wait();
@@ -1066,6 +1072,7 @@ Dali::Integration::RenderSurfaceInterface* CombinedUpdateRenderController::Shoul
 
 void CombinedUpdateRenderController::SurfaceReplaced()
 {
+  DALI_LOG_RELEASE_INFO("SurfaceReplaced\n");
   // Just increment the semaphore
   mSurfaceSemaphore.Release(1);
 }
@@ -1082,6 +1089,7 @@ Dali::Integration::RenderSurfaceInterface* CombinedUpdateRenderController::Shoul
 
 void CombinedUpdateRenderController::SurfaceDeleted()
 {
+  DALI_LOG_RELEASE_INFO("SurfaceDeleted\n");
   // Just increment the semaphore
   mSurfaceSemaphore.Release(1);
 }
@@ -1162,12 +1170,14 @@ void CombinedUpdateRenderController::CancelPreCompile()
 
 void CombinedUpdateRenderController::NotifyThreadInitialised()
 {
+  DALI_LOG_RELEASE_INFO("NotifyThreadInitialised\n");
   // Just increment the semaphore
   mEventThreadSemaphore.Release(1);
 }
 
 void CombinedUpdateRenderController::NotifyGraphicsInitialised()
 {
+  DALI_LOG_RELEASE_INFO("NotifyGraphicsInitialised\n");
   mGraphicsInitializeWait.Notify();
 }
 

diff --git a/dali/internal/graphics/gles/egl-implementation.cpp b/dali/internal/graphics/gles/egl-implementation.cpp
index 8133376fa520c5f5d2a333ca2681c504474f9905..61a260852deaff23dd9ef77ee296cd4400d7e6e8 100644 (file)
--- a/dali/internal/graphics/gles/egl-implementation.cpp
+++ b/dali/internal/graphics/gles/egl-implementation.cpp
@@ -51,11 +51,7 @@ const char*    EGL_KHR_CREATE_CONTEXT                  = "EGL_KHR_create_context
 const char*    EGL_KHR_PARTIAL_UPDATE                  = "EGL_KHR_partial_update";
 const char*    EGL_KHR_SWAP_BUFFERS_WITH_DAMAGE        = "EGL_KHR_swap_buffers_with_damage";
 
-#ifndef DALI_PROFILE_TV // Avoid HWC log printing in TV
 DALI_INIT_TRACE_FILTER(gTraceFilter, DALI_TRACE_EGL, true);
-#else
-DALI_INIT_TRACE_FILTER(gTraceFilter, DALI_TRACE_EGL, false);
-#endif
 
 static uint32_t GetPerformanceLogThresholdTime()
 {
@@ -564,14 +560,18 @@ void EglImplementation::SwapBuffers(EGLSurface& eglSurface)
     {
       DALI_LOG_RELEASE_INFO("EglImplementation::eglSwapBuffers started. eglSurface(%p)\n", eglSurface);
     }
+#ifndef DALI_PROFILE_TV // Avoid HWC log printing in TV
     DALI_TRACE_BEGIN(gTraceFilter, "DALI_EGL_SWAP_BUFFERS");
+#endif
 #endif //DALI_PROFILE_UBUNTU
 
     // DALI_LOG_ERROR("EglImplementation::SwapBuffers()\n");
     eglSwapBuffers(mEglDisplay, eglSurface);
 
 #ifndef DALI_PROFILE_UBUNTU
+#ifndef DALI_PROFILE_TV // Avoid HWC log printing in TV
     DALI_TRACE_END(gTraceFilter, "DALI_EGL_SWAP_BUFFERS");
+#endif
     if(mSwapBufferCountAfterResume < THRESHOLD_SWAPBUFFER_COUNT)
     {
       DALI_LOG_RELEASE_INFO("EglImplementation::eglSwapBuffers finished.\n");
@@ -636,7 +636,9 @@ void EglImplementation::SwapBuffers(EGLSurface& eglSurface, const std::vector<Re
     {
       DALI_LOG_RELEASE_INFO("EglImplementation::eglSwapBuffersWithDamageKHR started. eglSurface(%p)\n", eglSurface);
     }
+#ifndef DALI_PROFILE_TV // Avoid HWC log printing in TV
     DALI_TRACE_BEGIN(gTraceFilter, "DALI_EGL_SWAP_BUFFERS_KHR");
+#endif
 #endif //DALI_PROFILE_UBUNTU
 
     EGLBoolean result = mEglSwapBuffersWithDamageKHR(mEglDisplay, eglSurface, reinterpret_cast<int*>(const_cast<std::vector<Rect<int>>&>(damagedRects).data()), damagedRects.size());
@@ -646,7 +648,9 @@ void EglImplementation::SwapBuffers(EGLSurface& eglSurface, const std::vector<Re
     }
 
 #ifndef DALI_PROFILE_UBUNTU
+#ifndef DALI_PROFILE_TV // Avoid HWC log printing in TV
     DALI_TRACE_END(gTraceFilter, "DALI_EGL_SWAP_BUFFERS_KHR");
+#endif
     if(mSwapBufferCountAfterResume < THRESHOLD_SWAPBUFFER_COUNT)
     {
       DALI_LOG_RELEASE_INFO("EglImplementation::eglSwapBuffersWithDamageKHR finished.\n");