Clean up time handling code

base/str.hh:
    this should really be inline
base/time.cc:
base/time.hh:
    clean up how the time class works.  Export only one, and let
    people calculate their own elapsed times, etc.
sim/main.cc:
    sim/sim_time.X -> base/time.X

--HG--
rename : sim/sim_time.cc => base/time.cc
rename : sim/sim_time.hh => base/time.hh
extra : convert_revision : f3888fe3a1fdd1022084c282b58407c631a6d9a0

5 files changed, 153 insertions, 212 deletions

diff --git a/base/str.hh b/base/str.hh
index 29d2c03db..6c3453b8b 100644
--- a/base/str.hh
+++ b/base/str.hh
@@ -98,7 +98,7 @@ template <class T> bool
 to_number(const std::string &value, T &retval);
 
 template <class T>
-std::string
+inline std::string
 to_string(const T& value)
 {
     std::stringstream str;
diff --git a/base/time.cc b/base/time.cc
new file mode 100644
index 000000000..d2e8f60a5
--- /dev/null
+++ b/base/time.cc
@@ -0,0 +1,130 @@
+/*
+ * 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 <string>
+
+#include "base/time.hh"
+
+using namespace std;
+
+struct _timeval
+{
+    timeval tv;
+};
+
+double
+convert(const timeval &tv)
+{
+    return (double)tv.tv_sec + (double)tv.tv_usec / 1000000.0;
+}
+
+Time::Time()
+{
+    time = new _timeval;
+    ::gettimeofday(&time->tv, NULL);
+}
+
+Time::Time(const timeval &val)
+{
+    time = new _timeval;
+    set(val);
+}
+
+Time::Time(const Time &val)
+{
+    time = new _timeval;
+    set(val.get());
+}
+
+Time::~Time()
+{
+    delete time;
+}
+
+const timeval &
+Time::get() const
+{
+    return time->tv;
+}
+
+void
+Time::set(const timeval &tv)
+{
+    memcpy(&time->tv, &tv, sizeof(timeval));
+}
+
+void
+Time::reset()
+{
+    ::gettimeofday(&time->tv, NULL);
+}
+
+double
+Time::operator()() const
+{
+    return convert(get());
+}
+
+string
+Time::date(string format) const
+{
+    const timeval &tv = get();
+    time_t sec = tv.tv_sec;
+    char buf[256];
+
+    if (format.empty()) {
+        ctime_r(&sec, buf);
+        buf[24] = '\0';
+        return buf;
+    }
+
+    struct tm *tm = localtime(&sec);
+    strftime(buf, sizeof(buf), format.c_str(), tm);
+    return buf;
+}
+
+ostream &
+operator<<(ostream &out, const Time &start)
+{
+    out << start.date();
+    return out;
+}
+
+Time
+operator-(const Time &l, const Time &r)
+{
+    timeval tv;
+    timersub(&l.get(), &r.get(), &tv);
+    return tv;
+}
+
+const Time Time::start;
diff --git a/sim/sim_time.hh b/base/time.hh
index 02ca5534f..64da52e1d 100644
--- a/sim/sim_time.hh
+++ b/base/time.hh
@@ -32,59 +32,34 @@
 #include <sys/time.h>
 
 #include <iosfwd>
+#include <string>
 
-namespace Time {
-    struct _timeval;
-    class Start
-    {
-      private:
-        mutable _timeval *start;
+struct _timeval;
 
-      public:
-        Start();
-        ~Start();
+class Time
+{
+  protected:
+    mutable _timeval *time;
 
-        const timeval &get() const;
-        void reset();
-        double operator()() const;
-    };
+  public:
+    Time();
+    Time(const timeval &val);
+    Time(const Time &val);
+    ~Time();
 
-    class Now
-    {
-      private:
-        mutable _timeval *now;
+    const timeval &get() const;
+    void set(const timeval &val);
 
-      public:
-        Now();
-        ~Now();
+    void reset();
+    double operator()() const;
+    std::string date(std::string format = "") const;
 
-        const timeval &get() const;
-        double operator()() const;
-    };
+  public:
+    static const Time start;
+};
 
-    class Elapsed
-    {
-      private:
-        mutable _timeval *elapsed;
-        Start _start;
-        Now _now;
+Time operator-(const Time &l, const Time &r);
 
-      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);
-}
+std::ostream &operator<<(std::ostream &out, const Time &time);
 
 #endif // __SIM_TIME_HH__
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;
-    }
-}