diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2011-11-30 15:24:31 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-11-30 15:24:31 +0000 |
commit | 51138ef75b4c59ea5a0c35c23906a093c1e34b2c (patch) | |
tree | fe6a084218f77a0ddce1a94762f62781f2416345 | |
parent | 6fe7e0dea117988e777131b33e4901894ba51504 (diff) |
update CycleTimer to utilize NDEBUG and PBD::DEBUG so that we can leave them in place and use them at run time
git-svn-id: svn://localhost/ardour2/branches/3.0@10840 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r-- | libs/ardour/ardour/cycle_timer.h | 25 | ||||
-rw-r--r-- | libs/ardour/ardour/debug.h | 1 | ||||
-rw-r--r-- | libs/ardour/debug.cc | 1 |
3 files changed, 21 insertions, 6 deletions
diff --git a/libs/ardour/ardour/cycle_timer.h b/libs/ardour/ardour/cycle_timer.h index 146b393a63..dc70204e82 100644 --- a/libs/ardour/ardour/cycle_timer.h +++ b/libs/ardour/ardour/cycle_timer.h @@ -24,24 +24,37 @@ #include <iostream> #include "ardour/cycles.h" +#include "ardour/debug.h" class CycleTimer { private: static float cycles_per_usec; +#ifndef NDEBUG cycles_t _entry; cycles_t _exit; std::string _name; +#endif public: - CycleTimer(std::string name) : _name (name){ - if (cycles_per_usec == 0) { - cycles_per_usec = get_mhz (); + CycleTimer(const std::string& name) { +#ifndef NDEBUG + if (PBD::debug_bits & PBD::DEBUG::CycleTimers) { + _name = name; + if (cycles_per_usec == 0) { + cycles_per_usec = get_mhz (); + } + _entry = get_cycles(); } - _entry = get_cycles(); +#endif } + ~CycleTimer() { - _exit = get_cycles(); - std::cerr << _name << ": " << (float) (_exit - _entry) / cycles_per_usec << " (" << _entry << ", " << _exit << ')' << std::endl; +#ifndef NDEBUG + if (PBD::debug_bits & PBD::DEBUG::CycleTimers) { + _exit = get_cycles(); + std::cerr << _name << ": " << (float) (_exit - _entry) / cycles_per_usec << " (" << _entry << ", " << _exit << ')' << std::endl; + } +#endif } static float get_mhz (); diff --git a/libs/ardour/ardour/debug.h b/libs/ardour/ardour/debug.h index 0351aace1f..8ab4a4d9fd 100644 --- a/libs/ardour/ardour/debug.h +++ b/libs/ardour/ardour/debug.h @@ -54,6 +54,7 @@ namespace PBD { extern uint64_t PluginManager; extern uint64_t AudioUnits; extern uint64_t ControlProtocols; + extern uint64_t CycleTimers; } } diff --git a/libs/ardour/debug.cc b/libs/ardour/debug.cc index e731113dc2..de29a99b05 100644 --- a/libs/ardour/debug.cc +++ b/libs/ardour/debug.cc @@ -51,4 +51,5 @@ uint64_t PBD::DEBUG::CaptureAlignment = PBD::new_debug_bit ("capturealignment"); uint64_t PBD::DEBUG::PluginManager = PBD::new_debug_bit ("pluginmanager"); uint64_t PBD::DEBUG::AudioUnits = PBD::new_debug_bit ("audiounits"); uint64_t PBD::DEBUG::ControlProtocols = PBD::new_debug_bit ("controlprotocols"); +uint64_t PBD::DEBUG::CycleTimers = PBD::new_debug_bit ("cycletimers"); |