diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2015-06-12 18:14:09 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-06-12 18:14:09 -0400 |
commit | cc543280d9869d4a7b800d547c53e38b13d02cea (patch) | |
tree | aa26b29a02fa43ff24e5c9c777cb5294bf67e8e9 /libs/pbd | |
parent | 10643779b6f039a7458bd0c970ef40ac80ea0568 (diff) |
We were 2 more debug "bits" away from overflow, so recast PBD::DEBUG mechanism away from a 64bit integer and toward std::bitset.
Clean up a few minor related PBD::DEBUG issues along the way
Diffstat (limited to 'libs/pbd')
-rw-r--r-- | libs/pbd/debug.cc | 53 | ||||
-rw-r--r-- | libs/pbd/pbd/debug.h | 35 |
2 files changed, 44 insertions, 44 deletions
diff --git a/libs/pbd/debug.cc b/libs/pbd/debug.cc index dfa189002f..25ebb64850 100644 --- a/libs/pbd/debug.cc +++ b/libs/pbd/debug.cc @@ -31,9 +31,11 @@ #include "i18n.h" using namespace std; -static uint64_t _debug_bit = 1; +using PBD::DebugBits; -typedef std::map<const char*,uint64_t> DebugMap; +static uint64_t _debug_bit = 0; + +typedef std::map<const char*,DebugBits> DebugMap; namespace PBD { DebugMap & _debug_bit_map() @@ -43,24 +45,23 @@ namespace PBD { } } -uint64_t PBD::DEBUG::Stateful = PBD::new_debug_bit ("stateful"); -uint64_t PBD::DEBUG::Properties = PBD::new_debug_bit ("properties"); -uint64_t PBD::DEBUG::FileManager = PBD::new_debug_bit ("filemanager"); -uint64_t PBD::DEBUG::Pool = PBD::new_debug_bit ("pool"); -uint64_t PBD::DEBUG::EventLoop = PBD::new_debug_bit ("eventloop"); -uint64_t PBD::DEBUG::AbstractUI = PBD::new_debug_bit ("abstractui"); -uint64_t PBD::DEBUG::FileUtils = PBD::new_debug_bit ("fileutils"); -uint64_t PBD::DEBUG::Configuration = PBD::new_debug_bit ("configuration"); +DebugBits PBD::DEBUG::Stateful = PBD::new_debug_bit ("stateful"); +DebugBits PBD::DEBUG::Properties = PBD::new_debug_bit ("properties"); +DebugBits PBD::DEBUG::FileManager = PBD::new_debug_bit ("filemanager"); +DebugBits PBD::DEBUG::Pool = PBD::new_debug_bit ("pool"); +DebugBits PBD::DEBUG::EventLoop = PBD::new_debug_bit ("eventloop"); +DebugBits PBD::DEBUG::AbstractUI = PBD::new_debug_bit ("abstractui"); +DebugBits PBD::DEBUG::FileUtils = PBD::new_debug_bit ("fileutils"); +DebugBits PBD::DEBUG::Configuration = PBD::new_debug_bit ("configuration"); -uint64_t PBD::debug_bits = 0x0; +DebugBits PBD::debug_bits; -uint64_t +DebugBits PBD::new_debug_bit (const char* name) { - uint64_t ret; - _debug_bit_map().insert (make_pair (name, _debug_bit)); - ret = _debug_bit; - _debug_bit <<= 1; + DebugBits ret; + ret.set (_debug_bit++, 1); + _debug_bit_map().insert (make_pair (name, ret)); return ret; } @@ -70,12 +71,6 @@ PBD::debug_print (const char* prefix, string str) cerr << prefix << ": " << str; } -void -PBD::set_debug_bits (uint64_t bits) -{ - debug_bits = bits; -} - int PBD::parse_debug_options (const char* str) { @@ -83,7 +78,7 @@ PBD::parse_debug_options (const char* str) typedef boost::tokenizer<boost::char_separator<char> > tokenizer; boost::char_separator<char> sep (","); tokenizer tokens (in_str, sep); - uint64_t bits = 0; + DebugBits bits; for (tokenizer::iterator tok_iter = tokens.begin(); tok_iter != tokens.end(); ++tok_iter) { if (*tok_iter == "list") { @@ -92,20 +87,22 @@ PBD::parse_debug_options (const char* str) } if (*tok_iter == "all") { - PBD::set_debug_bits (~0ULL); + debug_bits.set (); /* sets all bits */ return 0; } - for (map<const char*,uint64_t>::iterator i = _debug_bit_map().begin(); i != _debug_bit_map().end(); ++i) { + for (map<const char*,DebugBits>::iterator i = _debug_bit_map().begin(); i != _debug_bit_map().end(); ++i) { const char* cstr = (*tok_iter).c_str(); if (strncasecmp (cstr, i->first, strlen (cstr)) == 0) { - bits |= i->second; + bits |= i->second; + cerr << i->first << " set ... debug bits now set to " << bits << " using " << i->second << endl; } } } - PBD::set_debug_bits (bits); + debug_bits = bits; + return 0; } @@ -117,7 +114,7 @@ PBD::list_debug_options () vector<string> options; - for (map<const char*,uint64_t>::iterator i = _debug_bit_map().begin(); i != _debug_bit_map().end(); ++i) { + for (map<const char*,DebugBits>::iterator i = _debug_bit_map().begin(); i != _debug_bit_map().end(); ++i) { options.push_back (i->first); } diff --git a/libs/pbd/pbd/debug.h b/libs/pbd/pbd/debug.h index f1776a254c..e4fa525481 100644 --- a/libs/pbd/pbd/debug.h +++ b/libs/pbd/pbd/debug.h @@ -20,6 +20,7 @@ #ifndef __libpbd_debug_h__ #define __libpbd_debug_h__ +#include <bitset> #include <stdint.h> #include <sstream> @@ -29,10 +30,12 @@ namespace PBD { - LIBPBD_API extern uint64_t debug_bits; - LIBPBD_API uint64_t new_debug_bit (const char* name); + typedef std::bitset<64> DebugBits; + + LIBPBD_API extern DebugBits debug_bits; + LIBPBD_API DebugBits new_debug_bit (const char* name); LIBPBD_API void debug_print (const char* prefix, std::string str); - LIBPBD_API void set_debug_bits (uint64_t bits); + LIBPBD_API void set_debug_bits (DebugBits bits); LIBPBD_API int parse_debug_options (const char* str); LIBPBD_API void list_debug_options (); @@ -40,32 +43,32 @@ namespace PBD { /* this namespace is so that we can write DEBUG::bit_name */ - LIBPBD_API extern uint64_t Stateful; - LIBPBD_API extern uint64_t Properties; - LIBPBD_API extern uint64_t FileManager; - LIBPBD_API extern uint64_t Pool; - LIBPBD_API extern uint64_t EventLoop; - LIBPBD_API extern uint64_t AbstractUI; - LIBPBD_API extern uint64_t Configuration; - extern uint64_t FileUtils; + LIBPBD_API extern DebugBits Stateful; + LIBPBD_API extern DebugBits Properties; + LIBPBD_API extern DebugBits FileManager; + LIBPBD_API extern DebugBits Pool; + LIBPBD_API extern DebugBits EventLoop; + LIBPBD_API extern DebugBits AbstractUI; + LIBPBD_API extern DebugBits Configuration; + LIBPBD_API extern DebugBits FileUtils; } } #ifndef NDEBUG -#define DEBUG_TRACE(bits,str) if ((bits) & PBD::debug_bits) { PBD::debug_print (# bits, str); } +#define DEBUG_TRACE(bits,str) if (((bits) & PBD::debug_bits).any()) { PBD::debug_print (# bits, str); } #define DEBUG_STR_DECL(id) std::stringstream __debug_str ## id; #define DEBUG_STR(id) __debug_str ## id #define DEBUG_STR_APPEND(id,s) __debug_str ## id << s; -#define DEBUG_ENABLED(bits) ((bits) & PBD::debug_bits) +#define DEBUG_ENABLED(bits) (((bits) & PBD::debug_bits).any()) #ifdef PTW32_VERSION #define DEBUG_THREAD_SELF pthread_self().p #else #define DEBUG_THREAD_SELF pthread_self() #endif -#define DEBUG_TIMING_START(bits,td) if ((bits) & PBD::debug_bits) { td.start_timing (); } -#define DEBUG_TIMING_ADD_ELAPSED(bits,td) if ((bits) & PBD::debug_bits) { td.add_elapsed (); } -#define DEBUG_TIMING_RESET(bits,td) if ((bits) & PBD::debug_bits) { td.reset (); } +#define DEBUG_TIMING_START(bits,td) if (DEBUG_ENABLED (bits)) { td.start_timing (); } +#define DEBUG_TIMING_ADD_ELAPSED(bits,td) if (DEBUG_ENABLED (bits)) { td.add_elapsed (); } +#define DEBUG_TIMING_RESET(bits,td) if (DEBUG_ENABLED (bits)) { td.reset (); } #else #define DEBUG_TRACE(bits,fmt,...) /*empty*/ |