X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Ftimer.cc;h=caef89e0e98e5c413539c0851216acde96f6f797;hp=2e138aabfcbcee30ee1c9298d4931952c1ec7aec;hb=ac34066d5e448d1984d11a180be74e31b6e13b5c;hpb=b7e546d9685c0a3304faa48e95516915d811ec5c

diff --git a/src/lib/timer.cc b/src/lib/timer.cc
index 2e138aabf..caef89e0e 100644
--- a/src/lib/timer.cc
+++ b/src/lib/timer.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,20 +18,29 @@
 
 */
 
+
 /** @file src/timer.cc
  *  @brief Some timing classes for debugging and profiling.
  */
 
-#include <iostream>
-#include <sys/time.h>
+
+#include "compose.hpp"
 #include "timer.h"
 #include "util.h"
+#include <sys/time.h>
+#include <iostream>
 
 #include "i18n.h"
 
-using namespace std;
+
+using std::cout;
+using std::list;
+using std::max;
+using std::pair;
+using std::string;
 using boost::optional;
 
+
 /** @param n Name to use when giving output */
 PeriodTimer::PeriodTimer (string n)
 	: _name (n)
@@ -39,6 +48,7 @@ PeriodTimer::PeriodTimer (string n)
 	gettimeofday (&_start, 0);
 }
 
+
 /** Destroy PeriodTimer and output the time elapsed since its construction */
 PeriodTimer::~PeriodTimer ()
 {
@@ -47,9 +57,7 @@ PeriodTimer::~PeriodTimer ()
 	cout << N_("T: ") << _name << N_(": ") << (seconds (stop) - seconds (_start)) << N_("\n");
 }
 
-/** @param n Name to use when giving output.
- *  @param s Initial state.
- */
+
 StateTimer::StateTimer (string n, string s)
 	: _name (n)
 {
@@ -59,19 +67,21 @@ 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_internal (optional<string> s)
 {
@@ -91,12 +101,14 @@ StateTimer::set_internal (optional<string> s)
 	_state = s;
 }
 
+
 void
 StateTimer::unset ()
 {
 	set_internal (optional<string>());
 }
 
+
 /** Destroy StateTimer and generate a summary of the state timings on cout */
 StateTimer::~StateTimer ()
 {
@@ -106,8 +118,28 @@ StateTimer::~StateTimer ()
 
 	unset ();
 
+	int longest = 0;
+	for (auto const& i: _counts) {
+		longest = max (longest, int(i.first.length()));
+	}
+
+	list<pair<double, string>> sorted;
+
+	for (auto const& i: _counts) {
+		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 ([](pair<double, string> const& a, pair<double, string> const& b) {
+		return a.first > b.first;
+	});
+
+
 	cout << _name << N_(":\n");
-	for (map<string, Counts>::iterator i = _counts.begin(); i != _counts.end(); ++i) {
-		cout << N_("\t") << i->first << " " << i->second.total_time << " " << i->second.number << " " << (i->second.total_time / i->second.number) << N_("\n");
+	for (auto const& i: sorted) {
+		cout << N_("\t") << i.second << "\n";
 	}
 }