From 2aa3302c6c695c9fb095c19d2ddba73b5985be3f Mon Sep 17 00:00:00 2001
From: Heeyong Song <heeyong.song@samsung.com>
Date: Fri, 12 Jan 2018 15:33:10 +0900
Subject: [PATCH] [4.0] Add logs in Application

Change-Id: Iece1e2ef5facdc737ec53cccfe85f24b83aaa52d
---
 adaptors/common/application-impl.cpp            | 19 +++++++++++++++++--
 adaptors/ecore/wayland/window-impl-ecore-wl.cpp | 10 ++++++++--
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/adaptors/common/application-impl.cpp b/adaptors/common/application-impl.cpp
index ebbbfa0..0a978a6 100644
--- a/adaptors/common/application-impl.cpp
+++ b/adaptors/common/application-impl.cpp
@@ -184,6 +184,7 @@ void Application::Lower()
 void Application::Quit()
 {
   // Actually quit the application.
+  // Force a call to Quit even if adaptor is not running.
   Internal::Adaptor::Adaptor::GetImplementation(*mAdaptor).AddIdle( MakeCallback( this, &Application::QuitFromMainLoop ), true );
 }
 
@@ -264,6 +265,8 @@ void Application::DoLanguageChange()
 
 void Application::OnInit()
 {
+  DALI_LOG_RELEASE_INFO( "Application::OnInit has started.\n" );
+
   mFramework->AddAbortCallback( MakeCallback( this, &Application::QuitFromMainLoop ) );
 
   DoInit();
@@ -283,10 +286,14 @@ void Application::OnInit()
   mInitSignal.Emit( application );
 
   DoStart();
+
+  DALI_LOG_RELEASE_INFO( "Application::OnInit has finished.\n" );
 }
 
 void Application::OnTerminate()
 {
+  DALI_LOG_RELEASE_INFO( "Application::OnTerminate\n" );
+
   // we've been told to quit by AppCore, ecore_x_destroy has been called, need to quit synchronously
   // delete the window as ecore_x has been destroyed by AppCore
 
@@ -298,18 +305,20 @@ void Application::OnTerminate()
 
 void Application::OnPause()
 {
-  DALI_LOG_RELEASE_INFO( "Application::OnPause\n" );
+  DALI_LOG_RELEASE_INFO( "Application::OnPause has started.\n" );
 
   // A DALi app should handle Pause/Resume events.
   // DALi just delivers the framework Pause event to the application, but not actually pause DALi core.
   // Pausing DALi core only occurs on the Window Hidden framework event
   Dali::Application application(this);
   mPauseSignal.Emit( application );
+
+  DALI_LOG_RELEASE_INFO( "Application::OnPause has finished.\n" );
 }
 
 void Application::OnResume()
 {
-  DALI_LOG_RELEASE_INFO( "Application::OnResume\n" );
+  DALI_LOG_RELEASE_INFO( "Application::OnResume has started.\n" );
 
   // Emit the signal first so the application can queue any messages before we do an update/render
   // This ensures we do not just redraw the last frame before pausing if that's not required
@@ -318,6 +327,8 @@ void Application::OnResume()
 
   // DALi just delivers the framework Resume event to the application.
   // Resuming DALi core only occurs on the Window Show framework event
+
+  DALI_LOG_RELEASE_INFO( "Application::OnResume has finished.\n" );
 }
 
 void Application::OnReset()
@@ -332,8 +343,12 @@ void Application::OnReset()
 
 void Application::OnAppControl(void *data)
 {
+  DALI_LOG_RELEASE_INFO( "Application::OnAppControl has started.\n" );
+
   Dali::Application application(this);
   mAppControlSignal.Emit( application , data );
+
+  DALI_LOG_RELEASE_INFO( "Application::OnAppControl has finished.\n" );
 }
 
 void Application::OnLanguageChanged()
diff --git a/adaptors/ecore/wayland/window-impl-ecore-wl.cpp b/adaptors/ecore/wayland/window-impl-ecore-wl.cpp
index 2ca5232..0e01ff2 100644
--- a/adaptors/ecore/wayland/window-impl-ecore-wl.cpp
+++ b/adaptors/ecore/wayland/window-impl-ecore-wl.cpp
@@ -780,16 +780,22 @@ void Window::Raise()
 {
   // Use ecore_wl_window_activate to prevent the window shown without rendering
   ecore_wl_window_activate( mEventHandler->mEcoreWindow );
+
+  DALI_LOG_RELEASE_INFO( "Window::Raise is called.\n" );
 }
 
 void Window::Lower()
 {
   ecore_wl_window_lower( mEventHandler->mEcoreWindow );
+
+  DALI_LOG_RELEASE_INFO( "Window::Lower is called.\n" );
 }
 
 void Window::Activate()
 {
   ecore_wl_window_activate( mEventHandler->mEcoreWindow );
+
+  DALI_LOG_RELEASE_INFO( "Window::Activate is called.\n" );
 }
 
 Dali::DragAndDropDetector Window::GetDragAndDropDetector() const
@@ -926,7 +932,7 @@ void Window::Show()
   mVisible = true;
   ecore_wl_window_show( mEventHandler->mEcoreWindow );
 
-  DALI_LOG_RELEASE_INFO( "Window::Show: mIconified [%d]\n", mIconified );
+  DALI_LOG_RELEASE_INFO( "Window::Show is called : mIconified [%d]\n", mIconified );
 
   if( !mIconified )
   {
@@ -943,7 +949,7 @@ void Window::Hide()
   mVisible = false;
   ecore_wl_window_hide( mEventHandler->mEcoreWindow );
 
-  DALI_LOG_RELEASE_INFO( "Window::Hide: mIconified [%d]\n", mIconified );
+  DALI_LOG_RELEASE_INFO( "Window::Hide is called : mIconified [%d]\n", mIconified );
 
   if( !mIconified )
   {
-- 
2.7.4