X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Fintegration-api%2Fdebug.h;h=309649b0c8d395c1df6622aa23c07fe9dd00d865;hb=0643c768fd100bd7ffb522e3358b88d075bc1d2e;hp=696b611981c1241b281fd116178c5cd468949919;hpb=5c66381841dd4dfd82c5a118d34104a00a2e0e1c;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/integration-api/debug.h b/dali/integration-api/debug.h index 696b611..309649b 100644 --- a/dali/integration-api/debug.h +++ b/dali/integration-api/debug.h @@ -1,25 +1,32 @@ #ifndef __DALI_INTEGRATION_DEBUG_H__ #define __DALI_INTEGRATION_DEBUG_H__ -// -// Copyright (c) 2014 Samsung Electronics Co., Ltd. -// -// Licensed under the Flora License, Version 1.0 (the License); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://floralicense.org/license/ -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an AS IS BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// +/* + * Copyright (c) 2018 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ // EXTERNAL INCLUDES #include +#include +#include #include +#include + +#include +#include // INTERNAL INCLUDES #include @@ -38,17 +45,31 @@ class Matrix3; class Matrix; class Quaternion; +#if defined(DEBUG_ENABLED) + +// Less opaque types for debugger +typedef std::vector DebugPropertyValueArray; +typedef std::pair< Property::Index, Property::Value > DebugIndexValuePair; +typedef std::vector DebugStringValueContainer; +typedef std::vector< DebugIndexValuePair > DebugIndexValueContainer; + +struct DebugPropertyValueMap +{ + DebugStringValueContainer stringValues; + DebugIndexValueContainer intValues; +}; + +// Fake globals for gdb typedefs +extern Dali::DebugPropertyValueArray gValueArray; +extern Dali::DebugPropertyValueMap gValueMap; + +#endif + namespace Integration { namespace Log { -// environment variable for enabling/disabling fps tracking -#define DALI_ENV_FPS_TRACKING "DALI_FPS_TRACKING" - -// environment variable for enabling/disabling fps tracking -#define DALI_ENV_UPDATE_STATUS_INTERVAL "DALI_UPDATE_STATUS_INTERVAL" - enum DebugPriority { DebugInfo, @@ -61,7 +82,7 @@ enum DebugPriority * @param level debug level * @param format string format */ -DALI_IMPORT_API void LogMessage(enum DebugPriority level,const char *format, ...); +DALI_CORE_API void LogMessage(enum DebugPriority level,const char *format, ...); /** * typedef for the logging function. @@ -75,13 +96,13 @@ typedef void (*LogFunction)(DebugPriority priority, std::string& message); * @param logFunction the log function to install * @param logOpts the log options to save in thread */ -DALI_IMPORT_API void InstallLogFunction(const LogFunction& logFunction); +DALI_CORE_API void InstallLogFunction(const LogFunction& logFunction); /** * A log function has to be uninstalled for every thread that wants to use logging. * The log function can be different for each thread. */ -DALI_IMPORT_API void UninstallLogFunction(); +DALI_CORE_API void UninstallLogFunction(); /******************************************************************************** * Error/Warning macros. * @@ -94,6 +115,8 @@ DALI_IMPORT_API void UninstallLogFunction(); #define DALI_LOG_ERROR_NOFN(format, args...) Dali::Integration::Log::LogMessage(Dali::Integration::Log::DebugError, format, ## args) +#define DALI_LOG_WARNING_NOFN(format, args...) Dali::Integration::Log::LogMessage(Dali::Integration::Log::DebugWarning, format, ## args) + /** * Provides unfiltered logging for fps monitor */ @@ -109,6 +132,11 @@ DALI_IMPORT_API void UninstallLogFunction(); */ #define DALI_LOG_RENDER_INFO(format, args...) Dali::Integration::Log::LogMessage(Dali::Integration::Log::DebugInfo, format, ## args) +/** + * Provides unfiltered logging for release + */ +#define DALI_LOG_RELEASE_INFO(format, args...) Dali::Integration::Log::LogMessage(Dali::Integration::Log::DebugInfo, format, ## args) + #ifdef DEBUG_ENABLED /** @@ -152,7 +180,7 @@ enum LogLevel * It provides the ability to turn tracing on or off. * */ -class DALI_IMPORT_API Filter +class DALI_CORE_API Filter { public: typedef std::list FilterList; @@ -255,7 +283,6 @@ public: static Filter *gElement; static Filter *gActor; static Filter *gShader; - static Filter *gDynamics; private: LogLevel mLoggingLevel; @@ -287,9 +314,18 @@ public: #define DALI_LOG_INFO(filter, level, format, args...) \ if(filter && filter->IsEnabledFor(level)) { filter->Log(level, format, ## args); } +#define DALI_LOG_STREAM( filter, level, stream ) \ + if(filter && filter->IsEnabledFor(level)) \ + { \ + std::ostringstream o; \ + o << stream << std::endl; \ + filter->Log(level, "%s", o.str().c_str()); \ + } + #else // DEBUG_ENABLED #define DALI_LOG_INFO(filter, level, format, args...) +#define DALI_LOG_STREAM( filter, level, stream ) #endif // DEBUG_ENABLED @@ -305,7 +341,7 @@ public: #ifdef DEBUG_ENABLED -class DALI_IMPORT_API TraceObj +class DALI_CORE_API TraceObj { public: TraceObj(Filter* filter, const char* fmt, ...); @@ -350,6 +386,19 @@ public: \ std::string mDebugString; /** + * Print all the actor tree names + **/ +#define DALI_LOG_ACTOR_TREE( node ) { \ + std::stringstream branch; \ + Node* tempNode = node; \ + while( tempNode ) { \ + branch << "<" << tempNode->mDebugString << ">::"; \ + tempNode = tempNode->GetParent(); \ + } \ + DALI_LOG_ERROR_NOFN("Actor tree: %s\n", branch.str().c_str()); \ +} + +/** * Allows one object to set another object's debug string */ #define DALI_LOG_SET_OBJECT_STRING(object, string) (object->mDebugString = string) @@ -378,6 +427,7 @@ public: \ #else // DEBUG_ENABLED #define DALI_LOG_OBJECT_STRING_DECLARATION +#define DALI_LOG_ACTOR_TREE(node) #define DALI_LOG_SET_OBJECT_STRING(object, string) #define DALI_LOG_FMT_OBJECT_STRING(object, fmt, args...) #define DALI_LOG_GET_OBJECT_STRING(object) @@ -387,94 +437,32 @@ public: \ #endif /******************************************************************************** - * Helper writers * + * Time instrumentation * ********************************************************************************/ -/** - * Helper method to translate a color to a string. - * @param[in] color - the color to translate - * @return string - the text representation of the color. - */ -DALI_IMPORT_API std::string ColorToString(const Vector4& color); +#if defined(DEBUG_ENABLED) -/** - * Helper method to translate a vector4 to a string. - * @param[in] v - the vector - * @param[in] precision - the precision to write the float data. - * @param[in] indent - the indent level to use. - * @return string - the text representation of the vector. - */ -DALI_IMPORT_API std::string Vector4ToString(const Vector4& v, size_t precision=3, size_t indent=0); +void GetNanoseconds( uint64_t& timeInNanoseconds ); -/** - * Helper method to translate a vector4 to a string. - * @param[in] v - the vector - * @param[in] precision - the precision to write the float data. - * @param[in] indent - the indent level to use. - * @return string - the text representation of the vector. - */ -DALI_IMPORT_API std::string Vector3ToString(const Vector3& v, size_t precision=3, size_t indent=0); - -/** - * Helper method to translate a quaternion to a string. - * @param[in] q the quaternion - * @param[in] precision - the precision to write the float data. - * @param[in] indent - the indent level to use. - * @return string - the text representation of the quaternion. - */ -DALI_IMPORT_API std::string QuaternionToString(const Quaternion& q, size_t precision=3, size_t indent=0); - -/** - * Helper method to translate a 3x3 matrix to a string. - * @param[in] m - the matrix - * @param[in] precision - the precision to write the float data. - * @param[in] indent - the indent level to use. - * @return string - the text representation of the vector. - */ -DALI_IMPORT_API std::string Matrix3ToString(const Matrix3& m, size_t precision=3, size_t indent=0); +#define DALI_LOG_TIMER_START( timeVariable ) \ + uint64_t timeVariable##1; \ + Debug::GetNanoseconds( timeVariable##1 ); -/** - * Helper method to translate a 4x4 matrix to a string. - * @param[in] m - the matrix - * @param[in] precision - the precision to write the float data. - * @param[in] indent - the indent level to use. - * @return string - the text representation of the vector. - */ -DALI_IMPORT_API std::string MatrixToString(const Matrix& m, size_t precision=3, size_t indent=0); +#define DALI_LOG_TIMER_END( timeVariable, filter, level, preString) \ + uint64_t timeVariable##2; \ + Debug::GetNanoseconds( timeVariable##2 ); \ + DALI_LOG_INFO( filter, level, preString " %ld uSec\n", ((timeVariable##2-timeVariable##1)/1000)); -#ifdef DEBUG_ENABLED - - -/** - * Filtered write of a matrix - */ -#define DALI_LOG_MATRIX(filter, matrix) DALI_LOG_INFO(filter, Debug::General, MatrixToString(matrix)) - -/** - * Filtered write of a vector - */ -#define DALI_LOG_VECTOR4(filter, vector) DALI_LOG_INFO(filter, Debug::General, Vector4ToString(vector)) - -/** - * Filtered write of a vector - */ -#define DALI_LOG_VECTOR3(filter, vector) DALI_LOG_INFO(filter, Debug::General, Vector3ToString(vector)) - -/** - * Filtered write of a color - */ -#define DALI_LOG_COLOR(filter, color) DALI_LOG_INFO(filter, Debug::General, ColorToString(color)) - -#else +#else // DEBUG_ENABLED -#define DALI_LOG_MATRIX(filter, matrix) -#define DALI_LOG_VECTOR4(filter,vector) -#define DALI_LOG_VECTOR3(filter,vector) -#define DALI_LOG_COLOR(filter, color) +#define DALI_LOG_TIMER_START( timeVariable ) +#define DALI_LOG_TIMER_END( timeVariable, filter, level, preString) #endif -}}} // Dali/Integration/Debug namespaces +} // Debug +} // Integration +} // Dali #endif // __DALI_INTEGRATION_DEBUG_H__