X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Ftimer.cc;h=e4e7bdfdc391a412f4ef0d4c25f5c1ada4e7404c;hp=a45e80dcb0bdb46e9fe03b58459b0bd485c8cc5e;hb=5eb8b5c3a1566aef638e9d9df03b88d320735092;hpb=bb767c7e338414beee132af3e96829c1448e214b

diff --git a/src/lib/timer.cc b/src/lib/timer.cc
index a45e80dcb..e4e7bdfdc 100644
--- a/src/lib/timer.cc
+++ b/src/lib/timer.cc
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -21,12 +22,16 @@
  *  @brief Some timing classes for debugging and profiling.
  */
 
-#include <iostream>
-#include <sys/time.h>
 #include "timer.h"
 #include "util.h"
+#include "compose.hpp"
+#include <iostream>
+#include <sys/time.h>
+
+#include "i18n.h"
 
 using namespace std;
+using boost::optional;
 
 /** @param n Name to use when giving output */
 PeriodTimer::PeriodTimer (string n)
@@ -40,7 +45,7 @@ PeriodTimer::~PeriodTimer ()
 {
 	struct timeval stop;
 	gettimeofday (&stop, 0);
-	cout << "T: " << _name << ": " << (seconds (stop) - seconds (_start)) << "\n";
+	cout << N_("T: ") << _name << N_(": ") << (seconds (stop) - seconds (_start)) << N_("\n");
 }
 
 /** @param n Name to use when giving output.
@@ -55,35 +60,77 @@ StateTimer::StateTimer (string n, string s)
 	_state = s;
 }
 
+StateTimer::StateTimer (string n)
+	: _name (n)
+{
+
+}
+
+void
+StateTimer::set (string s)
+{
+	set_internal (s);
+}
+
 /** @param s New state that the caller is in */
 void
-StateTimer::set_state (string s)
+StateTimer::set_internal (optional<string> s)
 {
 	double const last = _time;
 	struct timeval t;
 	gettimeofday (&t, 0);
 	_time = seconds (t);
 
-	if (_totals.find (s) == _totals.end ()) {
-		_totals[s] = 0;
+	if (s && _counts.find(*s) == _counts.end()) {
+		_counts[*s] = Counts();
 	}
 
-	_totals[_state] += _time - last;
+	if (_state) {
+		_counts[*_state].total_time += _time - last;
+		_counts[*_state].number++;
+	}
 	_state = s;
 }
 
+void
+StateTimer::unset ()
+{
+	set_internal (optional<string>());
+}
+
+bool compare (pair<double, string> a, pair<double, string> b)
+{
+	return a.first > b.first;
+}
+
 /** Destroy StateTimer and generate a summary of the state timings on cout */
 StateTimer::~StateTimer ()
 {
-	if (_state.empty ()) {
+	if (!_state) {
 		return;
 	}
 
-	
-	set_state ("");
+	unset ();
+
+	int longest = 0;
+	for (map<string, Counts>::iterator i = _counts.begin(); i != _counts.end(); ++i) {
+		longest = max (longest, int(i->first.length()));
+	}
+
+	list<pair<double, string> > sorted;
+
+	for (map<string, Counts>::iterator i = _counts.begin(); i != _counts.end(); ++i) {
+		string name = i->first + string(longest + 1 - i->first.size(), ' ');
+		char buffer[64];
+		snprintf (buffer, 64, "%.4f", i->second.total_time);
+		string total_time (buffer);
+		sorted.push_back (make_pair(i->second.total_time, String::compose("\t%1%2 %3 %4", name, total_time, i->second.number, (i->second.total_time / i->second.number))));
+	}
+
+	sorted.sort (compare);
 
-	cout << _name << ":\n";
-	for (map<string, double>::iterator i = _totals.begin(); i != _totals.end(); ++i) {
-		cout << "\t" << i->first << " " << i->second << "\n";
+	cout << _name << N_(":\n");
+	for (list<pair<double, string> >::iterator i = sorted.begin(); i != sorted.end(); ++i) {
+		cout << N_("\t") << i->second << "\n";
 	}
 }