[dali_1.2.60] Merge branch 'devel/master'

[platform/core/uifw/dali-core.git] / dali / integration-api / debug.cpp

diff --git a/dali/integration-api/debug.cpp b/dali/integration-api/debug.cpp
index e67b165..11b5c35 100644 (file)
--- a/dali/integration-api/debug.cpp
+++ b/dali/integration-api/debug.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
 #include <cstdlib>
 #include <sstream>
 #include <iomanip>
+#include <ctime>
 
 // INTERNAL INCLUDES
 #include <dali/public-api/common/constants.h>
@@ -38,9 +39,20 @@
 namespace Dali
 {
 
+#ifdef DEBUG_ENABLED
+
+// Fake globals for gdb typedefs
+Dali::DebugPropertyValueArray gValueArray;
+Dali::DebugPropertyValueMap   gValueMap;
+
+#endif
+
+
 namespace // unnamed namespace
 {
 
+const uint64_t NANOSECONDS_PER_SECOND = 1e+9;
+
 /**
  * Generic function to print out any 2-Dimensional array
  * @param[in] data pointer to the source data stored as float[rows][cols]
@@ -82,7 +94,7 @@ namespace Integration
 namespace Log
 {
 
-__thread LogFunction gthreadLocalLogFunction = NULL;
+thread_local LogFunction gthreadLocalLogFunction = NULL;
 
 /* Forward declarations */
 std::string FormatToString(const char *format, ...);
@@ -325,6 +337,15 @@ std::string MatrixToString(const Matrix& m, size_t precision, size_t indent)
   return Array2DToString(m.AsFloat(), 4, 4, precision, indent);
 }
 
+void GetNanoseconds( uint64_t& timeInNanoseconds )
+{
+  timespec timeSpec;
+  clock_gettime( CLOCK_MONOTONIC, &timeSpec );
+
+  // Convert all values to uint64_t to match our return type
+  timeInNanoseconds = ( static_cast< uint64_t >( timeSpec.tv_sec ) * NANOSECONDS_PER_SECOND ) + static_cast< uint64_t >( timeSpec.tv_nsec );
+}
+
 } // namespace Log
 
 } // namespace Integration