summaryrefslogtreecommitdiff
path: root/sim
diff options
context:
space:
mode:
Diffstat (limited to 'sim')
-rw-r--r--sim/main.cc2
-rw-r--r--sim/sim_time.cc164
-rw-r--r--sim/sim_time.hh90
3 files changed, 1 insertions, 255 deletions
diff --git a/sim/main.cc b/sim/main.cc
index 287b3d6e6..3cb6c8b71 100644
--- a/sim/main.cc
+++ b/sim/main.cc
@@ -42,6 +42,7 @@
#include "base/misc.hh"
#include "base/pollevent.hh"
#include "base/statistics.hh"
+#include "base/time.hh"
#include "cpu/base_cpu.hh"
#include "cpu/full_cpu/smt.hh"
#include "sim/async.hh"
@@ -52,7 +53,6 @@
#include "sim/sim_exit.hh"
#include "sim/sim_object.hh"
#include "sim/sim_stats.hh"
-#include "sim/sim_time.hh"
using namespace std;
diff --git a/sim/sim_time.cc b/sim/sim_time.cc
deleted file mode 100644
index 09c5a66de..000000000
--- a/sim/sim_time.cc
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * 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;
- }
-}
diff --git a/sim/sim_time.hh b/sim/sim_time.hh
deleted file mode 100644
index 02ca5534f..000000000
--- a/sim/sim_time.hh
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * 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.
- */
-
-#ifndef __SIM_TIME_HH__
-#define __SIM_TIME_HH__
-
-#include <sys/time.h>
-
-#include <iosfwd>
-
-namespace Time {
- struct _timeval;
- class Start
- {
- private:
- mutable _timeval *start;
-
- public:
- Start();
- ~Start();
-
- const timeval &get() const;
- void reset();
- double operator()() const;
- };
-
- class Now
- {
- private:
- mutable _timeval *now;
-
- public:
- Now();
- ~Now();
-
- const timeval &get() const;
- double operator()() const;
- };
-
- class Elapsed
- {
- private:
- mutable _timeval *elapsed;
- Start _start;
- Now _now;
-
- public:
- Elapsed();
- ~Elapsed();
-
- const timeval &get() const;
- void reset();
- double operator()() const;
- };
-
- extern Start start;
- extern Now now;
- extern Elapsed elapsed;
-
- std::ostream &operator<<(std::ostream &out, const Start &start);
- std::ostream &operator<<(std::ostream &out, const Now &now);
- std::ostream &operator<<(std::ostream &out, const Elapsed &elapsed);
-}
-
-#endif // __SIM_TIME_HH__
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 10:24:43 +0000