projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename SafeStringStream -> locked_stringstream. Bump deps for removal of stringstream.
[dcpomatic.git]
/
src
/
lib
/
timer.cc
diff --git
a/src/lib/timer.cc
b/src/lib/timer.cc
index a20a08b072de8b0a0d7aca9f9a6c3aaf79bc018c..7afdc394df3cfc370e824a47a218a5f34ffcabde 100644
(file)
--- 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 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/>.
*/
*/
@@
-31,14
+32,14
@@
using namespace std;
/** @param n Name to use when giving output */
using namespace std;
/** @param n Name to use when giving output */
-Period
DCPTimer::PeriodDCP
Timer (string n)
+Period
Timer::Period
Timer (string n)
: _name (n)
{
gettimeofday (&_start, 0);
}
: _name (n)
{
gettimeofday (&_start, 0);
}
-/** Destroy Period
DCP
Timer and output the time elapsed since its construction */
-Period
DCPTimer::~PeriodDCP
Timer ()
+/** Destroy PeriodTimer and output the time elapsed since its construction */
+Period
Timer::~Period
Timer ()
{
struct timeval stop;
gettimeofday (&stop, 0);
{
struct timeval stop;
gettimeofday (&stop, 0);
@@
-48,7
+49,7
@@
PeriodDCPTimer::~PeriodDCPTimer ()
/** @param n Name to use when giving output.
* @param s Initial state.
*/
/** @param n Name to use when giving output.
* @param s Initial state.
*/
-State
DCPTimer::StateDCP
Timer (string n, string s)
+State
Timer::State
Timer (string n, string s)
: _name (n)
{
struct timeval t;
: _name (n)
{
struct timeval t;
@@
-59,7
+60,7
@@
StateDCPTimer::StateDCPTimer (string n, string s)
/** @param s New state that the caller is in */
void
/** @param s New state that the caller is in */
void
-State
DCP
Timer::set_state (string s)
+StateTimer::set_state (string s)
{
double const last = _time;
struct timeval t;
{
double const last = _time;
struct timeval t;
@@
-74,14
+75,14
@@
StateDCPTimer::set_state (string s)
_state = s;
}
_state = s;
}
-/** Destroy State
DCP
Timer and generate a summary of the state timings on cout */
-State
DCPTimer::~StateDCP
Timer ()
+/** Destroy StateTimer and generate a summary of the state timings on cout */
+State
Timer::~State
Timer ()
{
if (_state.empty ()) {
return;
}
{
if (_state.empty ()) {
return;
}
-
+
set_state (N_(""));
cout << _name << N_(":\n");
set_state (N_(""));
cout << _name << N_(":\n");