From a9f25d7a780039fc928c0bd0e999285a9072f632 Mon Sep 17 00:00:00 2001 From: Heeyong Song Date: Mon, 25 Feb 2019 16:10:20 +0900 Subject: [PATCH] Add logs - Window, Adaptor and CombinedUpdateRenderController Change-Id: I17bf9af011d52dc7e8f15d6265a5139bbd95939b --- dali/internal/adaptor/common/adaptor-impl.cpp | 24 ++++++++++++++++++++++ .../common/combined-update-render-controller.cpp | 8 ++++++++ dali/internal/window-system/common/window-impl.cpp | 12 +++++++---- 3 files changed, 40 insertions(+), 4 deletions(-) diff --git a/dali/internal/adaptor/common/adaptor-impl.cpp b/dali/internal/adaptor/common/adaptor-impl.cpp index daeb943..7c85786 100755 --- a/dali/internal/adaptor/common/adaptor-impl.cpp +++ b/dali/internal/adaptor/common/adaptor-impl.cpp @@ -391,6 +391,12 @@ void Adaptor::Pause() // Ensure any messages queued during pause callbacks are processed by doing another update. RequestUpdateOnce(); + + DALI_LOG_RELEASE_INFO( "Adaptor::Pause: Paused\n" ); + } + else + { + DALI_LOG_RELEASE_INFO( "Adaptor::Pause: Not paused [%d]\n", mState ); } } @@ -419,6 +425,12 @@ void Adaptor::Resume() // Do at end to ensure our first update/render after resumption includes the processed messages as well mThreadController->Resume(); + + DALI_LOG_RELEASE_INFO( "Adaptor::Resume: Resumed\n"); + } + else + { + DALI_LOG_RELEASE_INFO( "Adaptor::Resume: Not resumed [%d]\n", mState ); } } @@ -459,6 +471,8 @@ void Adaptor::Stop() mCallbackManager->Stop(); mState = STOPPED; + + DALI_LOG_RELEASE_INFO( "Adaptor::Stop\n" ); } } @@ -891,6 +905,10 @@ void Adaptor::OnWindowShown() // Force a render task RequestUpdateOnce(); } + else + { + DALI_LOG_RELEASE_INFO( "Adaptor::OnWindowShown: Not shown [%d]\n", mState ); + } } void Adaptor::OnWindowHidden() @@ -902,6 +920,10 @@ void Adaptor::OnWindowHidden() // Adaptor cannot be resumed until the window is shown mState = PAUSED_WHILE_HIDDEN; } + else + { + DALI_LOG_RELEASE_INFO( "Adaptor::OnWindowHidden: Not hidden [%d]\n", mState ); + } } // Dali::Internal::Adaptor::Adaptor::OnDamaged @@ -939,6 +961,8 @@ void Adaptor::NotifySceneCreated() SurfaceInitialized(); mState = RUNNING; + + DALI_LOG_RELEASE_INFO( "Adaptor::NotifySceneCreated\n" ); } void Adaptor::NotifyLanguageChanged() diff --git a/dali/internal/adaptor/common/combined-update-render-controller.cpp b/dali/internal/adaptor/common/combined-update-render-controller.cpp index 25555a5..ace0a18 100644 --- a/dali/internal/adaptor/common/combined-update-render-controller.cpp +++ b/dali/internal/adaptor/common/combined-update-render-controller.cpp @@ -183,6 +183,8 @@ void CombinedUpdateRenderController::Start() LOG_EVENT( "Startup Complete, starting Update/Render Thread" ); RunUpdateRenderThread( CONTINUOUS, false /* No animation progression */ ); + + DALI_LOG_RELEASE_INFO( "CombinedUpdateRenderController::Start\n" ); } void CombinedUpdateRenderController::Pause() @@ -194,6 +196,8 @@ void CombinedUpdateRenderController::Pause() PauseUpdateRenderThread(); AddPerformanceMarker( PerformanceInterface::PAUSED ); + + DALI_LOG_RELEASE_INFO( "CombinedUpdateRenderController::Pause\n" ); } void CombinedUpdateRenderController::Resume() @@ -211,6 +215,8 @@ void CombinedUpdateRenderController::Resume() mRunning = TRUE; mForceClear = TRUE; } + + DALI_LOG_RELEASE_INFO( "CombinedUpdateRenderController::Resume\n" ); } void CombinedUpdateRenderController::Stop() @@ -238,6 +244,8 @@ void CombinedUpdateRenderController::Stop() } mRunning = FALSE; + + DALI_LOG_RELEASE_INFO( "CombinedUpdateRenderController::Stop\n" ); } void CombinedUpdateRenderController::RequestUpdate() diff --git a/dali/internal/window-system/common/window-impl.cpp b/dali/internal/window-system/common/window-impl.cpp index ef6454e..c57b275 100644 --- a/dali/internal/window-system/common/window-impl.cpp +++ b/dali/internal/window-system/common/window-impl.cpp @@ -332,8 +332,9 @@ void Window::Show() { WindowVisibilityObserver* observer( mAdaptor ); observer->OnWindowShown(); - DALI_LOG_RELEASE_INFO( "Window (%p) ::Show()\n", this ); } + + DALI_LOG_RELEASE_INFO( "Window (%p) Show(): iconified = %d\n", this, mIconified ); } void Window::Hide() @@ -346,8 +347,9 @@ void Window::Hide() { WindowVisibilityObserver* observer( mAdaptor ); observer->OnWindowHidden(); - DALI_LOG_RELEASE_INFO( "Window (%p) ::Hide() \n", this ); } + + DALI_LOG_RELEASE_INFO( "Window (%p) Hide(): iconified = %d\n", this, mIconified ); } bool Window::IsVisible() const @@ -602,8 +604,9 @@ void Window::OnIconifyChanged( bool iconified ) { WindowVisibilityObserver* observer( mAdaptor ); observer->OnWindowHidden(); - DALI_LOG_RELEASE_INFO( "Window (%p) Iconified\n", this ); } + + DALI_LOG_RELEASE_INFO( "Window (%p) Iconified: visible = %d\n", this, mVisible ); } else { @@ -613,8 +616,9 @@ void Window::OnIconifyChanged( bool iconified ) { WindowVisibilityObserver* observer( mAdaptor ); observer->OnWindowShown(); - DALI_LOG_RELEASE_INFO( "Window (%p) Deiconified\n", this ); } + + DALI_LOG_RELEASE_INFO( "Window (%p) Deiconified: visible = %d\n", this, mVisible ); } } -- 2.7.4