Reverse parameters to CPPUNIT_ASSERT_EQUAL so its assert

[ardour.git] / libs / ardour / ardour / cycle_timer.h

diff --git a/libs/ardour/ardour/cycle_timer.h b/libs/ardour/ardour/cycle_timer.h
index 4e1a50e6026b09217fa0e86d9b32f5e888e80b90..dc70204e82fa1f15072fa96d86004da37a7b59ab 100644 (file)
--- a/libs/ardour/ardour/cycle_timer.h
+++ b/libs/ardour/ardour/cycle_timer.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2002 Paul Davis 
+    Copyright (C) 2002 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -23,25 +23,38 @@
 #include <string>
 #include <iostream>
 
-#include <ardour/cycles.h>
+#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 << ')' << 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 ();