From: <sl...@us...> - 2014-11-22 22:35:15
|
Revision: 5964 http://sourceforge.net/p/navit/code/5964 Author: sleske Date: 2014-11-22 22:35:11 +0000 (Sat, 22 Nov 2014) Log Message: ----------- Refactor:core:Introduce #define DEFAULT_DEBUG_LEVEL|#1269, part 3 Modified Paths: -------------- trunk/navit/navit/debug.c trunk/navit/navit/debug.h Modified: trunk/navit/navit/debug.c =================================================================== --- trunk/navit/navit/debug.c 2014-11-22 22:35:03 UTC (rev 5963) +++ trunk/navit/navit/debug.c 2014-11-22 22:35:11 UTC (rev 5964) @@ -52,7 +52,8 @@ #endif -dbg_level debug_level=lvl_error; +#define DEFAULT_DEBUG_LEVEL lvl_error +dbg_level max_debug_level=DEFAULT_DEBUG_LEVEL; #define GLOBAL_DEBUG_LEVEL_UNSET lvl_unset dbg_level global_debug_level=GLOBAL_DEBUG_LEVEL_UNSET; int segv_level=0; @@ -101,16 +102,16 @@ static void debug_update_level(gpointer key, gpointer value, gpointer user_data) { - if (debug_level < GPOINTER_TO_INT(value)) - debug_level = GPOINTER_TO_INT(value); + if (max_debug_level < GPOINTER_TO_INT(value)) + max_debug_level = GPOINTER_TO_INT(value); } void debug_set_global_level(dbg_level level, int override_old_value ) { if (global_debug_level == GLOBAL_DEBUG_LEVEL_UNSET || override_old_value) { global_debug_level=level; - if (debug_level < global_debug_level){ - debug_level = global_debug_level; + if (max_debug_level < global_debug_level){ + max_debug_level = global_debug_level; } } } @@ -176,8 +177,12 @@ debug_level_get(const char *message_category) { if (!debug_hash) - return lvl_error; - return GPOINTER_TO_INT(g_hash_table_lookup(debug_hash, message_category)); + return DEFAULT_DEBUG_LEVEL; + gpointer level = g_hash_table_lookup(debug_hash, message_category); + if (!level) { + return DEFAULT_DEBUG_LEVEL; + } + return GPOINTER_TO_INT(level); } static void debug_timestamp(char *buffer) Modified: trunk/navit/navit/debug.h =================================================================== --- trunk/navit/navit/debug.h 2014-11-22 22:35:03 UTC (rev 5963) +++ trunk/navit/navit/debug.h 2014-11-22 22:35:11 UTC (rev 5964) @@ -52,11 +52,11 @@ lvl_debug } dbg_level; -extern dbg_level debug_level; +extern dbg_level max_debug_level; #define dbg_str2(x) #x #define dbg_str1(x) dbg_str2(x) #define dbg_module dbg_str1(MODULE) -#define dbg(level,...) { if (debug_level >= level) debug_printf(level,dbg_module,strlen(dbg_module),__PRETTY_FUNCTION__, strlen(__PRETTY_FUNCTION__),1,__VA_ARGS__); } +#define dbg(level,...) { if (max_debug_level >= level) debug_printf(level,dbg_module,strlen(dbg_module),__PRETTY_FUNCTION__, strlen(__PRETTY_FUNCTION__),1,__VA_ARGS__); } #define dbg_assert(expr) ((expr) ? (void) 0 : debug_assert_fail(dbg_module,strlen(dbg_module),__PRETTY_FUNCTION__, strlen(__PRETTY_FUNCTION__),__FILE__,__LINE__,dbg_str1(expr))) #define DEBUG_MODULE_GLOBAL "global" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |