From ee0c27c688d8c6ea11ec8329ef9120261bda9bb3 Mon Sep 17 00:00:00 2001 From: Thulinma Date: Mon, 2 Jun 2014 15:08:17 +0200 Subject: [PATCH] DEBUG_MSG edits. --- lib/defines.h | 52 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/lib/defines.h b/lib/defines.h index 50afdae9..1e30ef9c 100644 --- a/lib/defines.h +++ b/lib/defines.h @@ -1,24 +1,34 @@ // Defines to print debug messages. #ifndef MIST_DEBUG -#define MIST_DEBUG 1 -#define DLVL_NONE 0 // All debugging disabled. -#define DLVL_FAIL 1 // Only messages about failed operations. -#define DLVL_ERROR 2 // Only messages about errors and failed operations. -#define DLVL_WARN 3 // Warnings, errors, and fail messages. -#define DLVL_DEVEL 4 // All of the above, plus status messages handy during development. -#define DLVL_MEDIUM 5 // Slightly more than just development-level messages. -#define DLVL_HIGH 6 // Verbose debugging messages. -#define DLVL_VERYHIGH 7 // Very verbose debugging messages. -#define DLVL_EXTREME 8 // Everything is reported in extreme detail. -#define DLVL_INSANE 9 // Everything is reported in insane detail. -#define DLVL_DONTEVEN 10 // All messages enabled, even pointless ones. -#if DEBUG > -1 -#include -#include -#include "config.h" -static const char* DBG_LVL_LIST[] = {"NONE","FAIL","ERROR","WARN","DEVEL","MEDIUM","HIGH","VERYHIGH","EXTREME","INSANE","DONTEVEN"}; -#define DEBUG_MSG(lvl, msg, ...) if (Util::Config::printDebugLevel >= lvl){fprintf(stderr, "%s [%d][%s:%d] " msg "\n", DBG_LVL_LIST[lvl],getpid(), __FILE__, __LINE__, ##__VA_ARGS__);} -#else -#define DEBUG_MSG(lvl, msg, ...) // Debugging disabled. + #define MIST_DEBUG 1 + #define DLVL_NONE 0 // All debugging disabled. + #define DLVL_FAIL 1 // Only messages about failed operations. + #define DLVL_ERROR 2 // Only messages about errors and failed operations. + #define DLVL_WARN 3 // Warnings, errors, and fail messages. + #define DLVL_DEVEL 4 // All of the above, plus status messages handy during development. + #define DLVL_MEDIUM 5 // Slightly more than just development-level messages. + #define DLVL_HIGH 6 // Verbose debugging messages. + #define DLVL_VERYHIGH 7 // Very verbose debugging messages. + #define DLVL_EXTREME 8 // Everything is reported in extreme detail. + #define DLVL_INSANE 9 // Everything is reported in insane detail. + #define DLVL_DONTEVEN 10 // All messages enabled, even pointless ones. + #if DEBUG > -1 + + #include + #include + #include + #include "config.h" + extern char * program_invocation_short_name; + static const char* DBG_LVL_LIST[] = {"NONE","FAIL","ERROR","WARN","DEVEL","MEDIUM","HIGH","VERYHIGH","EXTREME","INSANE","DONTEVEN"}; + #define DEBUG_MSG(lvl, msg, ...) if (Util::Config::printDebugLevel >= lvl){fprintf(stderr, "%s|%s|%d|%s:%d|" msg "\n", DBG_LVL_LIST[lvl], program_invocation_short_name, getpid(), __FILE__, __LINE__, ##__VA_ARGS__);} + + #else + + #define DEBUG_MSG(lvl, msg, ...) // Debugging disabled. + + #endif #endif -#endif \ No newline at end of file + + +//include errno.h +//program_invocation_short_name