Since we don't need to follow functions usecase,
use trace scope macro instead of begin-end
+
DALI_TRACE_FUNCTION can send tag as NULL
if ENABLE_DEBUG is not defined.
To avoid this case, let we nullcheck for trace tag.
(Note, trace-manager-impl-generic already consider NULL tag)
Change-Id: I55177bbcac344abde42d5afe7cc807114f027a39
Signed-off-by: Eunki Hong <eunkiki.hong@samsung.com>
+ DALI_TRACE_SCOPE(gTraceFilter, "DALI_PROCESS_CORE_EVENTS");
+
if(mPerformanceInterface)
{
mPerformanceInterface->AddMarker(PerformanceInterface::PROCESS_EVENTS_START);
}
if(mPerformanceInterface)
{
mPerformanceInterface->AddMarker(PerformanceInterface::PROCESS_EVENTS_START);
}
- DALI_TRACE_BEGIN(gTraceFilter, "DALI_PROCESS_CORE_EVENTS");
-
- DALI_TRACE_END(gTraceFilter, "DALI_PROCESS_CORE_EVENTS");
-
if(mPerformanceInterface)
{
mPerformanceInterface->AddMarker(PerformanceInterface::PROCESS_EVENTS_END);
if(mPerformanceInterface)
{
mPerformanceInterface->AddMarker(PerformanceInterface::PROCESS_EVENTS_END);
namespace
{
const char* DALI_TRACE_ENABLE_PRINT_LOG_ENV = "DALI_TRACE_ENABLE_PRINT_LOG";
namespace
{
const char* DALI_TRACE_ENABLE_PRINT_LOG_ENV = "DALI_TRACE_ENABLE_PRINT_LOG";
+const char* EMPTY_TAG = "(null)";
static bool gTraceManagerEnablePrintLog = false;
} // namespace
static bool gTraceManagerEnablePrintLog = false;
} // namespace
- traceBegin(TTRACE_TAG_GRAPHICS, tag);
+ traceBegin(TTRACE_TAG_GRAPHICS, tag ? tag : EMPTY_TAG);
if(gTraceManagerEnablePrintLog)
{
if(gTraceManagerEnablePrintLog)
{
- DALI_LOG_DEBUG_INFO("BEGIN: %s\n", tag);
+ DALI_LOG_DEBUG_INFO("BEGIN: %s\n", tag ? tag : EMPTY_TAG);
if(gTraceManagerEnablePrintLog)
{
if(gTraceManagerEnablePrintLog)
{
- DALI_LOG_DEBUG_INFO("END: %s\n", tag);
+ DALI_LOG_DEBUG_INFO("END: %s\n", tag ? tag : EMPTY_TAG);
std::string keyString("");
std::string compose("");
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)
// Ensure key compose string is not NULL as keys like SHIFT or arrow have a null string.
if(keyEvent->compose)
Integration::KeyEvent keyEvent(keyName, logicalKey, keyString, keyCode, modifier, time, Integration::KeyEvent::DOWN, compose, deviceName, deviceClass, deviceSubclass);
mKeyEventSignal.Emit(keyEvent);
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
std::string keyString("");
std::string compose("");
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)
// Ensure key compose string is not NULL as keys like SHIFT or arrow have a null string.
if(keyEvent->compose)
Integration::KeyEvent keyEvent(keyName, logicalKey, keyString, keyCode, modifier, time, Integration::KeyEvent::UP, compose, deviceName, deviceClass, deviceSubclass);
mKeyEventSignal.Emit(keyEvent);
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