merge (w/fix) with master

[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 dc70204e82fa1f15072fa96d86004da37a7b59ab..cab389ee692ecd56977a95075c9f541f56145475 100644 (file)
--- a/libs/ardour/ardour/cycle_timer.h
+++ b/libs/ardour/ardour/cycle_timer.h
@@ -22,11 +22,15 @@
 
 #include <string>
 #include <iostream>
+#include <cstdlib>
 
+#include "ardour/libardour_visibility.h"
 #include "ardour/cycles.h"
 #include "ardour/debug.h"
 
-class CycleTimer {
+float get_mhz ();
+
+class LIBARDOUR_API CycleTimer {
   private:
        static float cycles_per_usec;
 #ifndef NDEBUG
@@ -45,6 +49,8 @@ class CycleTimer {
                        }
                        _entry = get_cycles();
                }
+#else
+               (void) name;
 #endif
        }
 
@@ -56,8 +62,34 @@ class CycleTimer {
                }
 #endif
        }
+};
 
-       static float get_mhz ();
+class LIBARDOUR_API StoringTimer
+{
+public:
+       StoringTimer (int);
+       void ref ();
+       void check (int);
+       void dump (std::string const &);
+
+private:
+       cycles_t _current_ref;
+       int* _point;
+       cycles_t* _value;
+       cycles_t* _ref;
+       int _points;
+       int _max_points;
 };
 
+#ifdef PT_TIMING
+extern StoringTimer ST;
+#define PT_TIMING_REF ST.ref();
+#define PT_TIMING_CHECK(x) ST.check(x);
+#endif
+
+#ifndef PT_TIMING
+#define PT_TIMING_REF
+#define PT_TIMING_CHECK(x)
+#endif
+
 #endif /* __ardour_cycle_timer_h__ */