Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-26 22:39:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Utils: use const, document dbg. Less default debug

Browse Source
This commit is contained in:
rfree2monero 2015-04-02 13:58:38 +02:00
parent 44f423477a
commit 391c7f9612
2 changed files with 53 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
contrib/otshell_utils/utils.cpp
View File

@ -46,6 +46,21 @@ namespace nUtils {
INJECT_OT_COMMON_USING_NAMESPACE_COMMON_1 // <=== namespaces INJECT_OT_COMMON_USING_NAMESPACE_COMMON_1 // <=== namespaces
// ====================================================================
// Numerical values of the debug levels - see hpp
const int _debug_level_nr_dbg3=20;
const int _debug_level_nr_dbg2=30;
const int _debug_level_nr_dbg1=40;
const int _debug_level_nr_info=50;
const int _debug_level_nr_note=60;
const int _debug_level_nr_fact=75;
const int _debug_level_nr_mark=80;
const int _debug_level_nr_warn=90;
const int _debug_level_nr_erro=100;
// ====================================================================
myexception::myexception(const char * what) myexception::myexception(const char * what)
: std::runtime_error(what) : std::runtime_error(what)
{ } { }
@ -277,7 +292,7 @@ cLogger::cLogger() :
mStream(NULL), mStream(NULL),
mStreamBrokenDebug(NULL), mStreamBrokenDebug(NULL),
mIsBroken(true), // before constructor finishes mIsBroken(true), // before constructor finishes
mLevel(70), mLevel(_debug_level_nr_warn),
mThread2Number_Biggest(0), // the CURRENT biggest value (no thread yet in map) mThread2Number_Biggest(0), // the CURRENT biggest value (no thread yet in map)
mPid2Number_Biggest(0) mPid2Number_Biggest(0)
{ {

64
contrib/otshell_utils/utils.hpp
View File

@ -132,26 +132,36 @@ std::atomic<int> & gLoggerGuardDepth_Get(); // getter for the global singleton o
} catch(...) { if (part<8) gCurrentLogger.write_stream(100,CHANNEL)<<"DEBUG-ERROR: problem in debug mechanism e.g. in locking." <<gCurrentLogger.endline(); throw ; } \ } catch(...) { if (part<8) gCurrentLogger.write_stream(100,CHANNEL)<<"DEBUG-ERROR: problem in debug mechanism e.g. in locking." <<gCurrentLogger.endline(); throw ; } \
} } while(0) } } while(0)
#define _dbg3(VAR) _debug_level( 20,VAR) // Numerical values of the debug levels - are defined here as const ints. Full name (with namespace) given for clarity.
#define _dbg2(VAR) _debug_level( 30,VAR) extern const int _debug_level_nr_dbg3;
#define _dbg1(VAR) _debug_level( 40,VAR) // details extern const int _debug_level_nr_dbg2;
#define _info(VAR) _debug_level( 50,VAR) // more boring info extern const int _debug_level_nr_dbg1;
#define _note(VAR) _debug_level( 70,VAR) // info extern const int _debug_level_nr_info;
#define _fact(VAR) _debug_level( 75,VAR) // interesting event extern const int _debug_level_nr_note;
#define _mark(VAR) _debug_level( 80,VAR) // marked action extern const int _debug_level_nr_fact;
#define _warn(VAR) _debug_level( 90,VAR) // some problem extern const int _debug_level_nr_mark;
#define _erro(VAR) _debug_level(100,VAR) // error - report extern const int _debug_level_nr_warn;
extern const int _debug_level_nr_erro;
#define _dbg3(VAR) _debug_level( nOT::nUtils::_debug_level_nr_dbg3,VAR) // details - most detailed
#define _dbg2(VAR) _debug_level( nOT::nUtils::_debug_level_nr_dbg2,VAR) // details - a bit more important
#define _dbg1(VAR) _debug_level( nOT::nUtils::_debug_level_nr_dbg1,VAR) // details - more important
#define _info(VAR) _debug_level( nOT::nUtils::_debug_level_nr_info,VAR) // information
#define _note(VAR) _debug_level( nOT::nUtils::_debug_level_nr_note,VAR) // more interesting information
#define _fact(VAR) _debug_level( nOT::nUtils::_debug_level_nr_fact,VAR) // interesting events that could be interesting even for user, for logical/business things
#define _mark(VAR) _debug_level( nOT::nUtils::_debug_level_nr_mark,VAR) // marked actions
#define _warn(VAR) _debug_level( nOT::nUtils::_debug_level_nr_warn,VAR) // some problems
#define _erro(VAR) _debug_level( nOT::nUtils::_debug_level_nr_erro,VAR) // errors
#define _dbg3_c(C,VAR) _debug_level_c(C, 20,VAR) #define _dbg3_c(C,VAR) _debug_level_c(C, nOT::nUtils::_debug_level_nr_dbg3, VAR) // details - most detailed
#define _dbg2_c(C,VAR) _debug_level_c(C, 30,VAR) #define _dbg2_c(C,VAR) _debug_level_c(C, nOT::nUtils::_debug_level_nr_dbg2, VAR) // details - a bit more important
#define _dbg1_c(C,VAR) _debug_level_c(C, 40,VAR) // details #define _dbg1_c(C,VAR) _debug_level_c(C, nOT::nUtils::_debug_level_nr_dbg1, VAR) // details - more important
#define _info_c(C,VAR) _debug_level_c(C, 50,VAR) // more boring info #define _info_c(C,VAR) _debug_level_c(C, nOT::nUtils::_debug_level_nr_info, VAR) // information
#define _note_c(C,VAR) _debug_level_c(C, 70,VAR) // info #define _note_c(C,VAR) _debug_level_c(C, nOT::nUtils::_debug_level_nr_note, VAR) // more interesting information
#define _fact_c(C,VAR) _debug_level_c(C, 75,VAR) // interesting event #define _fact_c(C,VAR) _debug_level_c(C, nOT::nUtils::_debug_level_nr_fact, VAR) // interesting events that could be interesting even for user, for logical/business things
#define _mark_c(C,VAR) _debug_level_c(C, 80,VAR) // marked action #define _mark_c(C,VAR) _debug_level_c(C, nOT::nUtils::_debug_level_nr_mark, VAR) // marked actions
#define _warn_c(C,VAR) _debug_level_c(C, 90,VAR) // some problem #define _warn_c(C,VAR) _debug_level_c(C, nOT::nUtils::_debug_level_nr_warn, VAR) // some problems
#define _erro_c(C,VAR) _debug_level_c(C,100,VAR) // error - report #define _erro_c(C,VAR) _debug_level_c(C, nOT::nUtils::_debug_level_nr_erro, VAR) // errors
// lock // because of VAR // lock // because of VAR
#define _scope_debug_level_c(CHANNEL,LEVEL,VAR) \ #define _scope_debug_level_c(CHANNEL,LEVEL,VAR) \
@ -164,15 +174,15 @@ std::atomic<int> & gLoggerGuardDepth_Get(); // getter for the global singleton o
nOT::nUtils::gLoggerGuard.unlock(); nOT::nUtils::gLoggerGuard.unlock();
#define _scope_debug_level(LEVEL,VAR) _scope_debug_level_c("",LEVEL,VAR) #define _scope_debug_level(LEVEL,VAR) _scope_debug_level_c("",LEVEL,VAR)
#define _scope_dbg1(VAR) _scope_debug_level( 20,VAR) #define _scope_dbg1(VAR) _scope_debug_level( _debug_level_nr_dbg3, VAR)
#define _scope_dbg2(VAR) _scope_debug_level( 30,VAR) #define _scope_dbg2(VAR) _scope_debug_level( _debug_level_nr_dbg2, VAR)
#define _scope_dbg3(VAR) _scope_debug_level( 40,VAR) // details #define _scope_dbg3(VAR) _scope_debug_level( _debug_level_nr_dbg1, VAR)
#define _scope_info(VAR) _scope_debug_level( 50,VAR) // more boring info #define _scope_info(VAR) _scope_debug_level( _debug_level_nr_info, VAR)
#define _scope_note(VAR) _scope_debug_level( 70,VAR) // info #define _scope_note(VAR) _scope_debug_level( _debug_level_nr_note, VAR)
#define _scope_fact(VAR) _scope_debug_level( 75,VAR) // interesting event #define _scope_fact(VAR) _scope_debug_level( _debug_level_nr_fact, VAR)
#define _scope_mark(VAR) _scope_debug_level( 80,VAR) // marked action #define _scope_mark(VAR) _scope_debug_level( _debug_level_nr_mark, VAR)
#define _scope_warn(VAR) _scope_debug_level( 90,VAR) // some problem #define _scope_warn(VAR) _scope_debug_level( _debug_level_nr_warn, VAR)
#define _scope_erro(VAR) _scope_debug_level( 100,VAR) // error - report #define _scope_erro(VAR) _scope_debug_level( _debug_level_nr_erro, VAR)
/*** /***
@brief do not use this namespace directly, it is implementation detail. @brief do not use this namespace directly, it is implementation detail.