projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add some very basic timing of the player.
[dcpomatic.git]
/
src
/
lib
/
timer.h
diff --git
a/src/lib/timer.h
b/src/lib/timer.h
index 173d0d961f44daed81d3145d4c5a24d3edfe8c75..bd4e652f811cfe04d254e252f680973e5c2ed2c7 100644
(file)
--- a/
src/lib/timer.h
+++ b/
src/lib/timer.h
@@
-1,20
+1,20
@@
/*
/*
- Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
- Copyright (C) 2000-2007 Paul Davis
+ 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.
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
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/>.
*/
*/
@@
-25,9
+25,10
@@
#ifndef DCPOMATIC_TIMER_H
#define DCPOMATIC_TIMER_H
#ifndef DCPOMATIC_TIMER_H
#define DCPOMATIC_TIMER_H
+#include <sys/time.h>
+#include <boost/optional.hpp>
#include <string>
#include <map>
#include <string>
#include <map>
-#include <sys/time.h>
/** @class PeriodTimer
* @brief A class to allow timing of a period within the caller.
/** @class PeriodTimer
* @brief A class to allow timing of a period within the caller.
@@
-37,9
+38,9
@@
class PeriodTimer
{
public:
class PeriodTimer
{
public:
- PeriodTimer (std::string n);
+
explicit
PeriodTimer (std::string n);
~PeriodTimer ();
~PeriodTimer ();
-
+
private:
/** name to use when giving output */
private:
/** name to use when giving output */
@@
-53,26
+54,50
@@
private:
* spends in one of a set of states.
*
* Once constructed, the caller can call set_state() whenever
* spends in one of a set of states.
*
* Once constructed, the caller can call set_state() whenever
- * its state changes.
When StateTimer is destroyed, it will
+ * its state changes. When StateTimer is destroyed, it will
* output (to cout) a summary of the time spent in each state.
*/
class StateTimer
{
public:
* output (to cout) a summary of the time spent in each state.
*/
class StateTimer
{
public:
+ explicit StateTimer (std::string n);
StateTimer (std::string n, std::string s);
~StateTimer ();
StateTimer (std::string n, std::string s);
~StateTimer ();
- void set_state (std::string s);
+ void set (std::string s);
+ void unset ();
+
+ std::string name () const {
+ return _name;
+ }
+
+ class Counts
+ {
+ public:
+ Counts ()
+ : total_time (0)
+ , number (0)
+ {}
+
+ double total_time;
+ int number;
+ };
+
+ std::map<std::string, Counts> counts () const {
+ return _counts;
+ }
private:
private:
+ void set_internal (boost::optional<std::string> s);
+
/** name to add to the output */
std::string _name;
/** current state */
/** 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 _state was entered */
double _time;
- /** t
ime that has been spent in each state so far
*/
- std::map<std::string,
double> _total
s;
+ /** t
otal time and number of entries for each state
*/
+ std::map<std::string,
Counts> _count
s;
};
#endif
};
#endif