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

diff --combined dali/internal/adaptor/common/adaptor-impl.cpp
index d68a312,1ab6e70..42b9309
--- 1/dali/internal/adaptor/common/adaptor-impl.cpp
--- 2/dali/internal/adaptor/common/adaptor-impl.cpp
+++ b/dali/internal/adaptor/common/adaptor-impl.cpp
@@@ -917,17 -917,15 +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);
@@@ -1142,15 -1140,6 +1140,15 @@@ bool Adaptor::IsMultipleWindowSupported
    return mConfigurationManager->IsMultipleWindowSupported();
  }
  
 +int32_t Adaptor::GetRenderThreadId() const
 +{
 +  if(mThreadController)
 +  {
 +    return mThreadController->GetThreadId();
 +  }
 +  return 0;
 +}
 +
  void Adaptor::RequestUpdateOnce()
  {
    if(mThreadController)