X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftimer.h;h=be3706607811d4c7c668430bf652162d7d434562;hb=HEAD;hp=a7d4c8d019e8c3f3677ef570cbd2dbcfd6866d36;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/lib/timer.h b/src/lib/timer.h
index a7d4c8d01..be3706607 100644
--- a/src/lib/timer.h
+++ b/src/lib/timer.h
@@ -1,6 +1,6 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
-    Copyright (C) 2000-2007 Paul Davis
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
+
     This file is part of DCP-o-matic.
 
     DCP-o-matic is free software; you can redistribute it and/or modify
@@ -18,17 +18,22 @@
 
 */
 
+
 /** @file src/timer.h
  *  @brief Some timing classes for debugging and profiling.
  */
 
+
 #ifndef DCPOMATIC_TIMER_H
 #define DCPOMATIC_TIMER_H
 
+
 #include <sys/time.h>
+#include <boost/optional.hpp>
 #include <string>
 #include <map>
 
+
 /** @class PeriodTimer
  *  @brief A class to allow timing of a period within the caller.
  *
@@ -37,7 +42,7 @@
 class PeriodTimer
 {
 public:
-	PeriodTimer (std::string n);
+	explicit PeriodTimer (std::string n);
 	~PeriodTimer ();
 
 private:
@@ -48,6 +53,7 @@ private:
 	struct timeval _start;
 };
 
+
 /** @class StateTimer
  *  @brief A class to allow measurement of the amount of time a program
  *  spends in one of a set of states.
@@ -59,20 +65,44 @@ private:
 class StateTimer
 {
 public:
+	explicit StateTimer (std::string n);
+	/** @param n Name to use when giving output.
+	 *  @param s Initial state.
+	 */
 	StateTimer (std::string n, std::string s);
 	~StateTimer ();
 
-	void set_state (std::string s);
+	/** @param s New state that the caller is in */
+	void set (std::string s);
+	void unset ();
+
+	std::string name () const {
+		return _name;
+	}
+
+	class Counts
+	{
+	public:
+		double total_time = 0;
+		int number = 0;
+	};
+
+	std::map<std::string, Counts> counts () const {
+		return _counts;
+	}
 
 private:
+	void set_internal (boost::optional<std::string> s);
+
 	/** name to add to the output */
 	std::string _name;
 	/** current state */
-	std::string _state;
+	boost::optional<std::string> _state;
 	/** time that _state was entered */
-	double _time;
-	/** time that has been spent in each state so far */
-	std::map<std::string, double> _totals;
+	double _time = 0;
+	/** total time and number of entries for each state */
+	std::map<std::string, Counts> _counts;
 };
 
+
 #endif