9471a4d20f
make SIGUSR2 dump and reset stats Make resetting time work base/statistics.cc: Fix statistics reset so that it works again, and correctly reset bins as well. (The old code wouldn't reset if you didn't have any bins, and then would actually only reset the first bin) cpu/simple_cpu/simple_cpu.cc: cpu/simple_cpu/simple_cpu.hh: convert idleCycles/idleFraction into a single Average stat to make reset work more simply sim/main.cc: handle SIGUSR2 to dump and reset stats (SIGUSR1 only dumps them) sim/sim_time.cc: sim/sim_time.hh: Add support for resetting the time --HG-- extra : convert_revision : ea43e03c50c0a4bb826dc0842a8c4fa1a9289e0a
164 lines
3.6 KiB
C++
164 lines
3.6 KiB
C++
/*
|
|
* Copyright (c) 2003 The Regents of The University of Michigan
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are
|
|
* met: redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer;
|
|
* redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution;
|
|
* neither the name of the copyright holders nor the names of its
|
|
* contributors may be used to endorse or promote products derived from
|
|
* this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/time.h>
|
|
#include <time.h>
|
|
#include <iostream>
|
|
|
|
#include "sim/sim_time.hh"
|
|
|
|
using namespace std;
|
|
|
|
namespace Time
|
|
{
|
|
struct _timeval
|
|
{
|
|
timeval tv;
|
|
};
|
|
|
|
double
|
|
convert(const timeval &tv)
|
|
{
|
|
return (double)tv.tv_sec + (double)tv.tv_usec / 1000000.0;
|
|
}
|
|
|
|
Start::Start()
|
|
{
|
|
start = new _timeval;
|
|
::gettimeofday(&start->tv, NULL);
|
|
}
|
|
|
|
Start::~Start()
|
|
{
|
|
delete start;
|
|
}
|
|
|
|
const timeval &
|
|
Start::get() const
|
|
{
|
|
return start->tv;
|
|
}
|
|
|
|
void
|
|
Start::reset()
|
|
{
|
|
::gettimeofday(&start->tv, NULL);
|
|
}
|
|
|
|
double
|
|
Start::operator()() const
|
|
{
|
|
return convert(get());
|
|
}
|
|
|
|
Now::Now()
|
|
: now(0)
|
|
{
|
|
}
|
|
|
|
Now::~Now()
|
|
{
|
|
if (now)
|
|
delete now;
|
|
}
|
|
|
|
const timeval &
|
|
Now::get() const
|
|
{
|
|
if (!now)
|
|
now = new _timeval;
|
|
|
|
::gettimeofday(&now->tv, NULL);
|
|
return now->tv;
|
|
}
|
|
|
|
double
|
|
Now::operator()() const
|
|
{
|
|
return convert(get());
|
|
}
|
|
|
|
|
|
Elapsed::Elapsed()
|
|
: elapsed(0)
|
|
{}
|
|
|
|
Elapsed::~Elapsed()
|
|
{
|
|
if (elapsed)
|
|
delete elapsed;
|
|
}
|
|
|
|
const timeval &
|
|
Elapsed::get() const
|
|
{
|
|
if (!elapsed)
|
|
elapsed = new _timeval;
|
|
|
|
timersub(&_now.get(), &_start.get(), &elapsed->tv);
|
|
return elapsed->tv;
|
|
}
|
|
|
|
void
|
|
Elapsed::reset()
|
|
{
|
|
_start.reset();
|
|
}
|
|
|
|
double
|
|
Elapsed::operator()() const
|
|
{
|
|
return convert(get());
|
|
}
|
|
|
|
Start start;
|
|
Now now;
|
|
Elapsed elapsed;
|
|
|
|
ostream &
|
|
operator<<(ostream &out, const Start &start)
|
|
{
|
|
out << ::ctime((const time_t *)&start.get().tv_sec);
|
|
return out;
|
|
}
|
|
|
|
ostream &
|
|
operator<<(ostream &out, const Now &now)
|
|
{
|
|
out << ::ctime((const time_t *)&now.get().tv_sec);
|
|
return out;
|
|
}
|
|
|
|
ostream &
|
|
operator<<(ostream &out, const Elapsed &elapsed)
|
|
{
|
|
out << ::ctime((const time_t *)&elapsed.get().tv_sec);
|
|
return out;
|
|
}
|
|
}
|