[Tizen] Define trace macro with message generate function

Let we make to reduce the number of code lines due to the
trace additional messages generation.

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

diff --git a/dali/integration-api/trace.h b/dali/integration-api/trace.h
index 794d839..4701595 100644 (file)
--- a/dali/integration-api/trace.h
+++ b/dali/integration-api/trace.h
@@ -219,6 +219,14 @@ public:
     filter->BeginTrace(tag, message);                       \
   }
 
+#define DALI_TRACE_BEGIN_WITH_MESSAGE_GENERATOR(filter, tag, messageGenerator) \
+  if(filter && filter->IsTraceEnabled())                                       \
+  {                                                                            \
+    std::ostringstream oss;                                                    \
+    messageGenerator(oss);                                                     \
+    filter->BeginTrace(tag, oss.str().c_str());                                \
+  }
+
 /**
  * End of tracing
  */
@@ -234,6 +242,14 @@ public:
     filter->EndTrace(tag, message);                       \
   }
 
+#define DALI_TRACE_END_WITH_MESSAGE_GENERATOR(filter, tag, messageGenerator) \
+  if(filter && filter->IsTraceEnabled())                                     \
+  {                                                                          \
+    std::ostringstream oss;                                                  \
+    messageGenerator(oss);                                                   \
+    filter->EndTrace(tag, oss.str().c_str());                                \
+  }
+
 /**
  * Used for function tracing. It logs tracing of the fuction from start to end.
  */
@@ -251,8 +267,10 @@ public:
 #define DALI_INIT_TRACE_FILTER(name, tag, enable)
 #define DALI_TRACE_BEGIN(filter, tag)
 #define DALI_TRACE_BEGIN_WITH_MESSAGE(filter, tag, message)
+#define DALI_TRACE_BEGIN_WITH_MESSAGE_GENERATOR(filter, tag, messageGenerator)
 #define DALI_TRACE_END(filter, tag)
 #define DALI_TRACE_END_WITH_MESSAGE(filter, tag, message)
+#define DALI_TRACE_END_WITH_MESSAGE_GENERATOR(filter, tag, messageGenerator)
 #define DALI_TRACE_FUNCTION(filter)
 #define DALI_TRACE_SCOPE(filter, tag)
 

diff --git a/dali/internal/common/core-impl.cpp b/dali/internal/common/core-impl.cpp
index ddb622f..3d61851 100644 (file)
--- a/dali/internal/common/core-impl.cpp
+++ b/dali/internal/common/core-impl.cpp
@@ -428,14 +428,9 @@ void Core::RunProcessors()
 {
   if(mProcessors.Count() != 0)
   {
-#ifdef TRACE_ENABLED
-    if(gTraceFilter && gTraceFilter->IsTraceEnabled())
-    {
-      std::ostringstream stream;
-      stream << "[" << mProcessors.Count() << "]";
-      DALI_TRACE_BEGIN_WITH_MESSAGE(gTraceFilter, "DALI_CORE_RUN_PROCESSORS", stream.str().c_str());
-    }
-#endif
+    DALI_TRACE_BEGIN_WITH_MESSAGE_GENERATOR(gTraceFilter, "DALI_CORE_RUN_PROCESSORS", [&](std::ostringstream& oss) {
+      oss << "[" << mProcessors.Count() << "]";
+    });
 
     // Copy processor pointers to prevent changes to vector affecting loop iterator.
     Dali::Vector<Integration::Processor*> processors(mProcessors);
@@ -449,23 +444,13 @@ void Core::RunProcessors()
       {
         if(!mProcessorUnregistered)
         {
-#ifdef TRACE_ENABLED
-          if(gTraceFilter && gTraceFilter->IsTraceEnabled())
-          {
-            std::ostringstream stream;
-            stream << "[" << processor->GetProcessorName() << "]";
-            DALI_TRACE_BEGIN_WITH_MESSAGE(gTraceFilter, "DALI_CORE_RUN_PROCESSOR", stream.str().c_str());
-          }
-#endif
+          DALI_TRACE_BEGIN_WITH_MESSAGE_GENERATOR(gTraceFilter, "DALI_CORE_RUN_PROCESSOR", [&](std::ostringstream& oss) {
+            oss << "[" << processor->GetProcessorName() << "]";
+          });
           processor->Process(false);
-#ifdef TRACE_ENABLED
-          if(gTraceFilter && gTraceFilter->IsTraceEnabled())
-          {
-            std::ostringstream stream;
-            stream << "[" << processor->GetProcessorName() << "]";
-            DALI_TRACE_END_WITH_MESSAGE(gTraceFilter, "DALI_CORE_RUN_PROCESSOR", stream.str().c_str());
-          }
-#endif
+          DALI_TRACE_END_WITH_MESSAGE_GENERATOR(gTraceFilter, "DALI_CORE_RUN_PROCESSOR", [&](std::ostringstream& oss) {
+            oss << "[" << processor->GetProcessorName() << "]";
+          });
         }
         else
         {
@@ -474,40 +459,25 @@ void Core::RunProcessors()
           auto iter = std::find(mProcessors.Begin(), mProcessors.End(), processor);
           if(iter != mProcessors.End())
           {
-#ifdef TRACE_ENABLED
-            if(gTraceFilter && gTraceFilter->IsTraceEnabled())
-            {
-              std::ostringstream stream;
-              stream << "[" << processor->GetProcessorName() << "]";
-              DALI_TRACE_BEGIN_WITH_MESSAGE(gTraceFilter, "DALI_CORE_RUN_PROCESSOR", stream.str().c_str());
-            }
-#endif
+            DALI_TRACE_BEGIN_WITH_MESSAGE_GENERATOR(gTraceFilter, "DALI_CORE_RUN_PROCESSOR", [&](std::ostringstream& oss) {
+              oss << "[" << processor->GetProcessorName() << "]";
+            });
             processor->Process(false);
-#ifdef TRACE_ENABLED
-            if(gTraceFilter && gTraceFilter->IsTraceEnabled())
-            {
-              std::ostringstream stream;
-              stream << "[" << processor->GetProcessorName() << "]";
-              DALI_TRACE_END_WITH_MESSAGE(gTraceFilter, "DALI_CORE_RUN_PROCESSOR", stream.str().c_str());
-            }
-#endif
+            DALI_TRACE_END_WITH_MESSAGE_GENERATOR(gTraceFilter, "DALI_CORE_RUN_PROCESSOR", [&](std::ostringstream& oss) {
+              oss << "[" << processor->GetProcessorName() << "]";
+            });
           }
         }
       }
     }
-#ifdef TRACE_ENABLED
-    if(gTraceFilter && gTraceFilter->IsTraceEnabled())
-    {
-      std::ostringstream stream;
-      stream << "[" << mProcessors.Count();
+    DALI_TRACE_END_WITH_MESSAGE_GENERATOR(gTraceFilter, "DALI_CORE_RUN_PROCESSORS", [&](std::ostringstream& oss) {
+      oss << "[" << mProcessors.Count();
       if(mProcessorUnregistered)
       {
-        stream << ", processor changed";
+        oss << ", processor changed";
       }
-      stream << "]";
-      DALI_TRACE_END_WITH_MESSAGE(gTraceFilter, "DALI_CORE_RUN_PROCESSORS", stream.str().c_str());
-    }
-#endif
+      oss << "]";
+    });
   }
 }
 
@@ -515,14 +485,9 @@ void Core::RunPostProcessors()
 {
   if(mPostProcessors.Count() != 0)
   {
-#ifdef TRACE_ENABLED
-    if(gTraceFilter && gTraceFilter->IsTraceEnabled())
-    {
-      std::ostringstream stream;
-      stream << "[" << mPostProcessors.Count() << "]";
-      DALI_TRACE_BEGIN_WITH_MESSAGE(gTraceFilter, "DALI_CORE_RUN_POST_PROCESSORS", stream.str().c_str());
-    }
-#endif
+    DALI_TRACE_BEGIN_WITH_MESSAGE_GENERATOR(gTraceFilter, "DALI_CORE_RUN_POST_PROCESSORS", [&](std::ostringstream& oss) {
+      oss << "[" << mPostProcessors.Count() << "]";
+    });
 
     // Copy processor pointers to prevent changes to vector affecting loop iterator.
     Dali::Vector<Integration::Processor*> processors(mPostProcessors);
@@ -536,23 +501,13 @@ void Core::RunPostProcessors()
       {
         if(!mPostProcessorUnregistered)
         {
-#ifdef TRACE_ENABLED
-          if(gTraceFilter && gTraceFilter->IsTraceEnabled())
-          {
-            std::ostringstream stream;
-            stream << "[" << processor->GetProcessorName() << "]";
-            DALI_TRACE_BEGIN_WITH_MESSAGE(gTraceFilter, "DALI_CORE_RUN_POST_PROCESSOR", stream.str().c_str());
-          }
-#endif
+          DALI_TRACE_BEGIN_WITH_MESSAGE_GENERATOR(gTraceFilter, "DALI_CORE_RUN_POST_PROCESSOR", [&](std::ostringstream& oss) {
+            oss << "[" << processor->GetProcessorName() << "]";
+          });
           processor->Process(true);
-#ifdef TRACE_ENABLED
-          if(gTraceFilter && gTraceFilter->IsTraceEnabled())
-          {
-            std::ostringstream stream;
-            stream << "[" << processor->GetProcessorName() << "]";
-            DALI_TRACE_END_WITH_MESSAGE(gTraceFilter, "DALI_CORE_RUN_POST_PROCESSOR", stream.str().c_str());
-          }
-#endif
+          DALI_TRACE_END_WITH_MESSAGE_GENERATOR(gTraceFilter, "DALI_CORE_RUN_POST_PROCESSOR", [&](std::ostringstream& oss) {
+            oss << "[" << processor->GetProcessorName() << "]";
+          });
         }
         else
         {
@@ -561,41 +516,26 @@ void Core::RunPostProcessors()
           auto iter = std::find(mPostProcessors.Begin(), mPostProcessors.End(), processor);
           if(iter != mPostProcessors.End())
           {
-#ifdef TRACE_ENABLED
-            if(gTraceFilter && gTraceFilter->IsTraceEnabled())
-            {
-              std::ostringstream stream;
-              stream << "[" << processor->GetProcessorName() << "]";
-              DALI_TRACE_BEGIN_WITH_MESSAGE(gTraceFilter, "DALI_CORE_RUN_POST_PROCESSOR", stream.str().c_str());
-            }
-#endif
+            DALI_TRACE_BEGIN_WITH_MESSAGE_GENERATOR(gTraceFilter, "DALI_CORE_RUN_POST_PROCESSOR", [&](std::ostringstream& oss) {
+              oss << "[" << processor->GetProcessorName() << "]";
+            });
             processor->Process(true);
-#ifdef TRACE_ENABLED
-            if(gTraceFilter && gTraceFilter->IsTraceEnabled())
-            {
-              std::ostringstream stream;
-              stream << "[" << processor->GetProcessorName() << "]";
-              DALI_TRACE_END_WITH_MESSAGE(gTraceFilter, "DALI_CORE_RUN_POST_PROCESSOR", stream.str().c_str());
-            }
-#endif
+            DALI_TRACE_END_WITH_MESSAGE_GENERATOR(gTraceFilter, "DALI_CORE_RUN_POST_PROCESSOR", [&](std::ostringstream& oss) {
+              oss << "[" << processor->GetProcessorName() << "]";
+            });
           }
         }
       }
     }
 
-#ifdef TRACE_ENABLED
-    if(gTraceFilter && gTraceFilter->IsTraceEnabled())
-    {
-      std::ostringstream stream;
-      stream << "[" << mPostProcessors.Count();
+    DALI_TRACE_END_WITH_MESSAGE_GENERATOR(gTraceFilter, "DALI_CORE_RUN_POST_PROCESSORS", [&](std::ostringstream& oss) {
+      oss << "[" << mPostProcessors.Count();
       if(mPostProcessorUnregistered)
       {
-        stream << ", post processor changed";
+        oss << ", processor changed";
       }
-      stream << "]";
-      DALI_TRACE_END_WITH_MESSAGE(gTraceFilter, "DALI_CORE_RUN_POST_PROCESSORS", stream.str().c_str());
-    }
-#endif
+      oss << "]";
+    });
   }
 }
 

diff --git a/dali/internal/event/common/notification-manager.cpp b/dali/internal/event/common/notification-manager.cpp
index 8ee18d2..a7a6679 100644 (file)
--- a/dali/internal/event/common/notification-manager.cpp
+++ b/dali/internal/event/common/notification-manager.cpp
@@ -157,26 +157,16 @@ void NotificationManager::ProcessMessages()
   const MessageContainer::Iterator end  = mImpl->eventMessageQueue.End();
   if(iter != end)
   {
-#ifdef TRACE_ENABLED
-    if(gTraceFilter && gTraceFilter->IsTraceEnabled())
-    {
-      std::ostringstream stream;
-      stream << "[" << mImpl->eventMessageQueue.Count() << "]";
-      DALI_TRACE_BEGIN_WITH_MESSAGE(gTraceFilter, "DALI_NOTIFICATION_PROCESS_MESSAGE", stream.str().c_str());
-    }
-#endif
+    DALI_TRACE_BEGIN_WITH_MESSAGE_GENERATOR(gTraceFilter, "DALI_NOTIFICATION_PROCESS_MESSAGE", [&](std::ostringstream& oss) {
+      oss << "[" << mImpl->eventMessageQueue.Count() << "]";
+    });
     for(; iter != end; ++iter)
     {
       (*iter)->Process(0u /*ignored*/);
     }
-#ifdef TRACE_ENABLED
-    if(gTraceFilter && gTraceFilter->IsTraceEnabled())
-    {
-      std::ostringstream stream;
-      stream << "[" << mImpl->eventMessageQueue.Count() << "]";
-      DALI_TRACE_END_WITH_MESSAGE(gTraceFilter, "DALI_NOTIFICATION_PROCESS_MESSAGE", stream.str().c_str());
-    }
-#endif
+    DALI_TRACE_END_WITH_MESSAGE_GENERATOR(gTraceFilter, "DALI_NOTIFICATION_PROCESS_MESSAGE", [&](std::ostringstream& oss) {
+      oss << "[" << mImpl->eventMessageQueue.Count() << "]";
+    });
   }
   // release the processed messages from event side queue
   mImpl->eventMessageQueue.Clear();
@@ -185,14 +175,9 @@ void NotificationManager::ProcessMessages()
   const InterfaceContainer::iterator end2  = mImpl->eventInterfaceQueue.end();
   if(iter2 != end2)
   {
-#ifdef TRACE_ENABLED
-    if(gTraceFilter && gTraceFilter->IsTraceEnabled())
-    {
-      std::ostringstream stream;
-      stream << "[" << mImpl->eventInterfaceQueue.size() << "]";
-      DALI_TRACE_BEGIN_WITH_MESSAGE(gTraceFilter, "DALI_NOTIFICATION_NOTIFY_COMPLETED", stream.str().c_str());
-    }
-#endif
+    DALI_TRACE_BEGIN_WITH_MESSAGE_GENERATOR(gTraceFilter, "DALI_NOTIFICATION_NOTIFY_COMPLETED", [&](std::ostringstream& oss) {
+      oss << "[" << mImpl->eventInterfaceQueue.size() << "]";
+    });
     for(; iter2 != end2; ++iter2)
     {
       CompleteNotificationInterface* interface = iter2->first;
@@ -201,14 +186,9 @@ void NotificationManager::ProcessMessages()
         interface->NotifyCompleted(std::move(iter2->second));
       }
     }
-#ifdef TRACE_ENABLED
-    if(gTraceFilter && gTraceFilter->IsTraceEnabled())
-    {
-      std::ostringstream stream;
-      stream << "[" << mImpl->eventInterfaceQueue.size() << "]";
-      DALI_TRACE_END_WITH_MESSAGE(gTraceFilter, "DALI_NOTIFICATION_NOTIFY_COMPLETED", stream.str().c_str());
-    }
-#endif
+    DALI_TRACE_END_WITH_MESSAGE_GENERATOR(gTraceFilter, "DALI_NOTIFICATION_NOTIFY_COMPLETED", [&](std::ostringstream& oss) {
+      oss << "[" << mImpl->eventInterfaceQueue.size() << "]";
+    });
   }
   // just clear the container, we dont own the objects
   mImpl->eventInterfaceQueue.clear();

diff --git a/dali/internal/event/events/key-event-processor.cpp b/dali/internal/event/events/key-event-processor.cpp
index 51aed87..f7f7a58 100644 (file)
--- a/dali/internal/event/events/key-event-processor.cpp
+++ b/dali/internal/event/events/key-event-processor.cpp
@@ -61,14 +61,9 @@ void KeyEventProcessor::ProcessKeyEvent(const Integration::KeyEvent& event)
   keyEvent->SetWindowId(event.windowId);
   Dali::KeyEvent keyEventHandle(keyEvent.Get());
 
-#ifdef TRACE_ENABLED
-  if(gTraceFilter && gTraceFilter->IsTraceEnabled())
-  {
-    std::ostringstream stream;
-    stream << "[name:" << event.keyName << ", code:" << event.keyCode << ", state:" << KEY_EVENT_STATES[event.state] << ", time:" << event.time << "]";
-    DALI_TRACE_BEGIN_WITH_MESSAGE(gTraceFilter, "DALI_PROCESS_KEY_EVENT", stream.str().c_str());
-  }
-#endif
+  DALI_TRACE_BEGIN_WITH_MESSAGE_GENERATOR(gTraceFilter, "DALI_PROCESS_KEY_EVENT", [&](std::ostringstream& oss) {
+    oss << "[name:" << event.keyName << ", code:" << event.keyCode << ", state:" << KEY_EVENT_STATES[event.state] << ", time:" << event.time << "]";
+  });
 
   // Emit the key event signal from the scene.
   bool consumed = mScene.EmitInterceptKeyEventSignal(keyEventHandle);
@@ -80,12 +75,7 @@ void KeyEventProcessor::ProcessKeyEvent(const Integration::KeyEvent& event)
   {
     mScene.EmitKeyEventSignal(keyEventHandle);
   }
-#ifdef TRACE_ENABLED
-  if(gTraceFilter && gTraceFilter->IsTraceEnabled())
-  {
-    DALI_TRACE_END(gTraceFilter, "DALI_PROCESS_KEY_EVENT");
-  }
-#endif
+  DALI_TRACE_END(gTraceFilter, "DALI_PROCESS_KEY_EVENT");
 }
 
 } // namespace Internal

diff --git a/dali/internal/event/events/long-press-gesture/long-press-gesture-processor.cpp b/dali/internal/event/events/long-press-gesture/long-press-gesture-processor.cpp
index 1f3b27c..6b680ae 100644 (file)
--- a/dali/internal/event/events/long-press-gesture/long-press-gesture-processor.cpp
+++ b/dali/internal/event/events/long-press-gesture/long-press-gesture-processor.cpp
@@ -64,14 +64,9 @@ void EmitLongPressSignal(
   longPress->SetSourceType(longPressEvent.sourceType);
   longPress->SetSourceData(longPressEvent.sourceData);
 
-#ifdef TRACE_ENABLED
-  if(gTraceFilter && gTraceFilter->IsTraceEnabled())
-  {
-    std::ostringstream stream;
-    stream << "[" << gestureDetectors.size() << "]";
-    DALI_TRACE_BEGIN_WITH_MESSAGE(gTraceFilter, "DALI_EMIT_LONG_PRESS_GESTURE_SIGNAL", stream.str().c_str());
-  }
-#endif
+  DALI_TRACE_BEGIN_WITH_MESSAGE_GENERATOR(gTraceFilter, "DALI_EMIT_LONG_PRESS_GESTURE_SIGNAL", [&](std::ostringstream& oss) {
+    oss << "[" << gestureDetectors.size() << "]";
+  });
 
   Dali::Actor                                    actorHandle(actor);
   const GestureDetectorContainer::const_iterator endIter = gestureDetectors.end();
@@ -80,14 +75,9 @@ void EmitLongPressSignal(
     static_cast<LongPressGestureDetector*>(*iter)->EmitLongPressGestureSignal(actorHandle, Dali::LongPressGesture(longPress.Get()));
   }
 
-#ifdef TRACE_ENABLED
-  if(gTraceFilter && gTraceFilter->IsTraceEnabled())
-  {
-    std::ostringstream stream;
-    stream << "[" << gestureDetectors.size() << "]";
-    DALI_TRACE_END_WITH_MESSAGE(gTraceFilter, "DALI_EMIT_LONG_PRESS_GESTURE_SIGNAL", stream.str().c_str());
-  }
-#endif
+  DALI_TRACE_END_WITH_MESSAGE_GENERATOR(gTraceFilter, "DALI_EMIT_LONG_PRESS_GESTURE_SIGNAL", [&](std::ostringstream& oss) {
+    oss << "[" << gestureDetectors.size() << "]";
+  });
 }
 
 /**

diff --git a/dali/internal/event/events/pan-gesture/pan-gesture-processor.cpp b/dali/internal/event/events/pan-gesture/pan-gesture-processor.cpp
index 69fe61a..eaaff7a 100644 (file)
--- a/dali/internal/event/events/pan-gesture/pan-gesture-processor.cpp
+++ b/dali/internal/event/events/pan-gesture/pan-gesture-processor.cpp
@@ -571,14 +571,9 @@ void PanGestureProcessor::EmitPanSignal(Actor*                          actor,
       mSceneObject->AddGesture(*pan.Get());
     }
 
-#ifdef TRACE_ENABLED
-    if(gTraceFilter && gTraceFilter->IsTraceEnabled())
-    {
-      std::ostringstream stream;
-      stream << "[" << gestureDetectors.size() << "]";
-      DALI_TRACE_BEGIN_WITH_MESSAGE(gTraceFilter, "DALI_EMIT_PAN_GESTURE_SIGNAL", stream.str().c_str());
-    }
-#endif
+    DALI_TRACE_BEGIN_WITH_MESSAGE_GENERATOR(gTraceFilter, "DALI_EMIT_PAN_GESTURE_SIGNAL", [&](std::ostringstream& oss) {
+      oss << "[" << gestureDetectors.size() << "]";
+    });
 
     Dali::Actor actorHandle(actor);
 
@@ -588,14 +583,9 @@ void PanGestureProcessor::EmitPanSignal(Actor*                          actor,
       static_cast<PanGestureDetector*>(*iter)->EmitPanGestureSignal(actorHandle, Dali::PanGesture(pan.Get()));
     }
 
-#ifdef TRACE_ENABLED
-    if(gTraceFilter && gTraceFilter->IsTraceEnabled())
-    {
-      std::ostringstream stream;
-      stream << "[" << gestureDetectors.size() << "]";
-      DALI_TRACE_END_WITH_MESSAGE(gTraceFilter, "DALI_EMIT_PAN_GESTURE_SIGNAL", stream.str().c_str());
-    }
-#endif
+    DALI_TRACE_END_WITH_MESSAGE_GENERATOR(gTraceFilter, "DALI_EMIT_PAN_GESTURE_SIGNAL", [&](std::ostringstream& oss) {
+      oss << "[" << gestureDetectors.size() << "]";
+    });
   }
 }
 

diff --git a/dali/internal/event/events/pinch-gesture/pinch-gesture-processor.cpp b/dali/internal/event/events/pinch-gesture/pinch-gesture-processor.cpp
index 327ddfe..73e8dcd 100644 (file)
--- a/dali/internal/event/events/pinch-gesture/pinch-gesture-processor.cpp
+++ b/dali/internal/event/events/pinch-gesture/pinch-gesture-processor.cpp
@@ -68,14 +68,9 @@ void EmitPinchSignal(
   pinch->SetSourceType(pinchEvent.sourceType);
   pinch->SetSourceData(pinchEvent.sourceData);
 
-#ifdef TRACE_ENABLED
-  if(gTraceFilter && gTraceFilter->IsTraceEnabled())
-  {
-    std::ostringstream stream;
-    stream << "[" << gestureDetectors.size() << "]";
-    DALI_TRACE_BEGIN_WITH_MESSAGE(gTraceFilter, "DALI_EMIT_PINCH_GESTURE_SIGNAL", stream.str().c_str());
-  }
-#endif
+  DALI_TRACE_BEGIN_WITH_MESSAGE_GENERATOR(gTraceFilter, "DALI_EMIT_PINCH_GESTURE_SIGNAL", [&](std::ostringstream& oss) {
+    oss << "[" << gestureDetectors.size() << "]";
+  });
 
   Dali::Actor                                    actorHandle(actor);
   const GestureDetectorContainer::const_iterator endIter = gestureDetectors.end();
@@ -84,14 +79,9 @@ void EmitPinchSignal(
     static_cast<PinchGestureDetector*>(*iter)->EmitPinchGestureSignal(actorHandle, Dali::PinchGesture(pinch.Get()));
   }
 
-#ifdef TRACE_ENABLED
-  if(gTraceFilter && gTraceFilter->IsTraceEnabled())
-  {
-    std::ostringstream stream;
-    stream << "[" << gestureDetectors.size() << "]";
-    DALI_TRACE_END_WITH_MESSAGE(gTraceFilter, "DALI_EMIT_PINCH_GESTURE_SIGNAL", stream.str().c_str());
-  }
-#endif
+  DALI_TRACE_END_WITH_MESSAGE_GENERATOR(gTraceFilter, "DALI_EMIT_PINCH_GESTURE_SIGNAL", [&](std::ostringstream& oss) {
+    oss << "[" << gestureDetectors.size() << "]";
+  });
 }
 
 /**

diff --git a/dali/internal/event/events/rotation-gesture/rotation-gesture-processor.cpp b/dali/internal/event/events/rotation-gesture/rotation-gesture-processor.cpp
index 9171296..a83b1b2 100644 (file)
--- a/dali/internal/event/events/rotation-gesture/rotation-gesture-processor.cpp
+++ b/dali/internal/event/events/rotation-gesture/rotation-gesture-processor.cpp
@@ -65,14 +65,9 @@ void EmitRotationSignal(
   rotation->SetSourceType(rotationEvent.sourceType);
   rotation->SetSourceData(rotationEvent.sourceData);
 
-#ifdef TRACE_ENABLED
-  if(gTraceFilter && gTraceFilter->IsTraceEnabled())
-  {
-    std::ostringstream stream;
-    stream << "[" << gestureDetectors.size() << "]";
-    DALI_TRACE_BEGIN_WITH_MESSAGE(gTraceFilter, "DALI_EMIT_ROTATION_GESTURE_SIGNAL", stream.str().c_str());
-  }
-#endif
+  DALI_TRACE_BEGIN_WITH_MESSAGE_GENERATOR(gTraceFilter, "DALI_EMIT_ROTATION_GESTURE_SIGNAL", [&](std::ostringstream& oss) {
+    oss << "[" << gestureDetectors.size() << "]";
+  });
 
   Dali::Actor                                    actorHandle(actor);
   const GestureDetectorContainer::const_iterator endIter = gestureDetectors.end();
@@ -81,14 +76,9 @@ void EmitRotationSignal(
     static_cast<RotationGestureDetector*>(*iter)->EmitRotationGestureSignal(actorHandle, Dali::RotationGesture(rotation.Get()));
   }
 
-#ifdef TRACE_ENABLED
-  if(gTraceFilter && gTraceFilter->IsTraceEnabled())
-  {
-    std::ostringstream stream;
-    stream << "[" << gestureDetectors.size() << "]";
-    DALI_TRACE_END_WITH_MESSAGE(gTraceFilter, "DALI_EMIT_ROTATION_GESTURE_SIGNAL", stream.str().c_str());
-  }
-#endif
+  DALI_TRACE_END_WITH_MESSAGE_GENERATOR(gTraceFilter, "DALI_EMIT_ROTATION_GESTURE_SIGNAL", [&](std::ostringstream& oss) {
+    oss << "[" << gestureDetectors.size() << "]";
+  });
 }
 
 /**

diff --git a/dali/internal/event/events/tap-gesture/tap-gesture-processor.cpp b/dali/internal/event/events/tap-gesture/tap-gesture-processor.cpp
index e942503..bb4cfa7 100644 (file)
--- a/dali/internal/event/events/tap-gesture/tap-gesture-processor.cpp
+++ b/dali/internal/event/events/tap-gesture/tap-gesture-processor.cpp
@@ -68,14 +68,9 @@ void EmitTapSignal(
   tap->SetSourceType(tapEvent.sourceType);
   tap->SetSourceData(tapEvent.sourceData);
 
-#ifdef TRACE_ENABLED
-  if(gTraceFilter && gTraceFilter->IsTraceEnabled())
-  {
-    std::ostringstream stream;
-    stream << "[" << gestureDetectors.size() << "]";
-    DALI_TRACE_BEGIN_WITH_MESSAGE(gTraceFilter, "DALI_EMIT_TAP_GESTURE_SIGNAL", stream.str().c_str());
-  }
-#endif
+  DALI_TRACE_BEGIN_WITH_MESSAGE_GENERATOR(gTraceFilter, "DALI_EMIT_TAP_GESTURE_SIGNAL", [&](std::ostringstream& oss) {
+    oss << "[" << gestureDetectors.size() << "]";
+  });
 
   Dali::Actor                                    actorHandle(actor);
   const GestureDetectorContainer::const_iterator endIter = gestureDetectors.end();
@@ -84,14 +79,9 @@ void EmitTapSignal(
     static_cast<TapGestureDetector*>(*iter)->EmitTapGestureSignal(actorHandle, Dali::TapGesture(tap.Get()));
   }
 
-#ifdef TRACE_ENABLED
-  if(gTraceFilter && gTraceFilter->IsTraceEnabled())
-  {
-    std::ostringstream stream;
-    stream << "[" << gestureDetectors.size() << "]";
-    DALI_TRACE_END_WITH_MESSAGE(gTraceFilter, "DALI_EMIT_TAP_GESTURE_SIGNAL", stream.str().c_str());
-  }
-#endif
+  DALI_TRACE_END_WITH_MESSAGE_GENERATOR(gTraceFilter, "DALI_EMIT_TAP_GESTURE_SIGNAL", [&](std::ostringstream& oss) {
+    oss << "[" << gestureDetectors.size() << "]";
+  });
 }
 
 } // unnamed namespace

diff --git a/dali/internal/update/manager/frame-callback-processor.cpp b/dali/internal/update/manager/frame-callback-processor.cpp
index b4adc0e..e6d2617 100644 (file)
--- a/dali/internal/update/manager/frame-callback-processor.cpp
+++ b/dali/internal/update/manager/frame-callback-processor.cpp
@@ -106,14 +106,9 @@ bool FrameCallbackProcessor::Update(BufferIndex bufferIndex, float elapsedSecond
 
   if(!mFrameCallbacks.empty())
   {
-#ifdef TRACE_ENABLED
-    if(gTraceFilter && gTraceFilter->IsTraceEnabled())
-    {
-      std::ostringstream stream;
-      stream << "[" << mFrameCallbacks.size() << "]";
-      DALI_TRACE_BEGIN_WITH_MESSAGE(gTraceFilter, "DALI_FRAME_CALLBACK_UPDATE", stream.str().c_str());
-    }
-#endif
+    DALI_TRACE_BEGIN_WITH_MESSAGE_GENERATOR(gTraceFilter, "DALI_FRAME_CALLBACK_UPDATE", [&](std::ostringstream& oss) {
+      oss << "[" << mFrameCallbacks.size() << "]";
+    });
 
     // If any of the FrameCallback::Update calls returns false, then they are no longer required & can be removed.
     auto iter = std::remove_if(
@@ -124,14 +119,9 @@ bool FrameCallbackProcessor::Update(BufferIndex bufferIndex, float elapsedSecond
       });
     mFrameCallbacks.erase(iter, mFrameCallbacks.end());
 
-#ifdef TRACE_ENABLED
-    if(gTraceFilter && gTraceFilter->IsTraceEnabled())
-    {
-      std::ostringstream stream;
-      stream << "[" << mFrameCallbacks.size() << "]";
-      DALI_TRACE_END_WITH_MESSAGE(gTraceFilter, "DALI_FRAME_CALLBACK_UPDATE", stream.str().c_str());
-    }
-#endif
+    DALI_TRACE_END_WITH_MESSAGE_GENERATOR(gTraceFilter, "DALI_FRAME_CALLBACK_UPDATE", [&](std::ostringstream& oss) {
+      oss << "[" << mFrameCallbacks.size() << "]";
+    });
   }
 
   mNodeHierarchyChanged = false;