Merge "Trace use scope macro instead of begin-end" into devel/master

diff --git a/dali/internal/adaptor/common/adaptor-impl.cpp b/dali/internal/adaptor/common/adaptor-impl.cpp
index d68a312..42b9309 100644 (file)
--- a/dali/internal/adaptor/common/adaptor-impl.cpp
+++ b/dali/internal/adaptor/common/adaptor-impl.cpp
@@ -917,17 +917,15 @@ void Adaptor::ProcessCoreEvents()
 {
   if(mCore)
   {
+    DALI_TRACE_SCOPE(gTraceFilter, "DALI_PROCESS_CORE_EVENTS");
+
     if(mPerformanceInterface)
     {
       mPerformanceInterface->AddMarker(PerformanceInterface::PROCESS_EVENTS_START);
     }
 
-    DALI_TRACE_BEGIN(gTraceFilter, "DALI_PROCESS_CORE_EVENTS");
-
     mCore->ProcessEvents();
 
-    DALI_TRACE_END(gTraceFilter, "DALI_PROCESS_CORE_EVENTS");
-
     if(mPerformanceInterface)
     {
       mPerformanceInterface->AddMarker(PerformanceInterface::PROCESS_EVENTS_END);

diff --git a/dali/internal/trace/tizen/trace-manager-impl-tizen.cpp b/dali/internal/trace/tizen/trace-manager-impl-tizen.cpp
index 956653f..3c8ea30 100644 (file)
--- a/dali/internal/trace/tizen/trace-manager-impl-tizen.cpp
+++ b/dali/internal/trace/tizen/trace-manager-impl-tizen.cpp
@@ -34,6 +34,7 @@ namespace Adaptor
 namespace
 {
 const char* DALI_TRACE_ENABLE_PRINT_LOG_ENV = "DALI_TRACE_ENABLE_PRINT_LOG";
+const char* EMPTY_TAG                       = "(null)";
 static bool gTraceManagerEnablePrintLog     = false;
 
 } // namespace
@@ -57,11 +58,11 @@ void TraceManagerTizen::LogContext(bool start, const char* tag)
 {
   if(start)
   {
-    traceBegin(TTRACE_TAG_GRAPHICS, tag);
+    traceBegin(TTRACE_TAG_GRAPHICS, tag ? tag : EMPTY_TAG);
 
     if(gTraceManagerEnablePrintLog)
     {
-      DALI_LOG_DEBUG_INFO("BEGIN: %s\n", tag);
+      DALI_LOG_DEBUG_INFO("BEGIN: %s\n", tag ? tag : EMPTY_TAG);
     }
   }
   else
@@ -70,7 +71,7 @@ void TraceManagerTizen::LogContext(bool start, const char* tag)
 
     if(gTraceManagerEnablePrintLog)
     {
-      DALI_LOG_DEBUG_INFO("END: %s\n", tag);
+      DALI_LOG_DEBUG_INFO("END: %s\n", tag ? tag : EMPTY_TAG);
     }
   }
 }

diff --git a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp
index 162af6c..84e9381 100644 (file)
--- a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp
+++ b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp
@@ -1283,14 +1283,7 @@ void WindowBaseEcoreWl2::OnKeyDown(void* data, int type, void* event)
     std::string keyString("");
     std::string compose("");
 
-#ifdef TRACE_ENABLED
-    std::ostringstream stream;
-    if(gTraceFilter->IsTraceEnabled())
-    {
-      stream << "DALI_ON_KEY_DOWN [" << keyName << "]";
-      DALI_TRACE_BEGIN(gTraceFilter, stream.str().c_str());
-    }
-#endif
+    DALI_TRACE_SCOPE(gTraceFilter, "DALI_ON_KEY_DOWN");
 
     // Ensure key compose string is not NULL as keys like SHIFT or arrow have a null string.
     if(keyEvent->compose)
@@ -1338,13 +1331,6 @@ void WindowBaseEcoreWl2::OnKeyDown(void* data, int type, void* event)
     Integration::KeyEvent keyEvent(keyName, logicalKey, keyString, keyCode, modifier, time, Integration::KeyEvent::DOWN, compose, deviceName, deviceClass, deviceSubclass);
 
     mKeyEventSignal.Emit(keyEvent);
-
-#ifdef TRACE_ENABLED
-    if(gTraceFilter->IsTraceEnabled())
-    {
-      DALI_TRACE_END(gTraceFilter, stream.str().c_str());
-    }
-#endif
   }
 }
 
@@ -1368,14 +1354,7 @@ void WindowBaseEcoreWl2::OnKeyUp(void* data, int type, void* event)
     std::string keyString("");
     std::string compose("");
 
-#ifdef TRACE_ENABLED
-    std::ostringstream stream;
-    if(gTraceFilter->IsTraceEnabled())
-    {
-      stream << "DALI_ON_KEY_UP [" << keyName << "]";
-      DALI_TRACE_BEGIN(gTraceFilter, stream.str().c_str());
-    }
-#endif
+    DALI_TRACE_SCOPE(gTraceFilter, "DALI_ON_KEY_UP");
 
     // Ensure key compose string is not NULL as keys like SHIFT or arrow have a null string.
     if(keyEvent->compose)
@@ -1423,13 +1402,6 @@ void WindowBaseEcoreWl2::OnKeyUp(void* data, int type, void* event)
     Integration::KeyEvent keyEvent(keyName, logicalKey, keyString, keyCode, modifier, time, Integration::KeyEvent::UP, compose, deviceName, deviceClass, deviceSubclass);
 
     mKeyEventSignal.Emit(keyEvent);
-
-#ifdef TRACE_ENABLED
-    if(gTraceFilter->IsTraceEnabled())
-    {
-      DALI_TRACE_END(gTraceFilter, stream.str().c_str());
-    }
-#endif
   }
 }