misc: Rename misc.(hh|cc) to logging.(hh|cc)

[gem5.git] / src / sim / sim_object.cc

diff --git a/src/sim/sim_object.cc b/src/sim/sim_object.cc
index a835aee5b2d0de17fdd36f9013bd9b02daf5decc..ab92ae55a368ad609ebf5db400836f9a1edd4f1a 100644 (file)
--- a/src/sim/sim_object.cc
+++ b/src/sim/sim_object.cc
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2001-2005 The Regents of The University of Michigan
+ * Copyright (c) 2010 Advanced Micro Devices, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29,17 +30,13 @@
  *          Nathan Binkert
  */
 
-#include <assert.h>
+#include "sim/sim_object.hh"
 
-#include "base/callback.hh"
-#include "base/inifile.hh"
+#include "base/logging.hh"
 #include "base/match.hh"
-#include "base/misc.hh"
 #include "base/trace.hh"
-#include "base/stats/events.hh"
-#include "sim/host.hh"
-#include "sim/sim_object.hh"
-#include "sim/stats.hh"
+#include "debug/Checkpoint.hh"
+#include "sim/probe/probe.hh"
 
 using namespace std;
 
@@ -59,22 +56,18 @@ SimObject::SimObjectList SimObject::simObjectList;
 // SimObject constructor: used to maintain static simObjectList
 //
 SimObject::SimObject(const Params *p)
-    : _params(p)
+    : EventManager(getEventQueue(p->eventq_index)), _params(p)
 {
 #ifdef DEBUG
     doDebugBreak = false;
 #endif
-
     simObjectList.push_back(this);
-    state = Running;
+    probeManager = new ProbeManager(this);
 }
 
-SimObjectParams *
-SimObject::makeParams(const std::string &name)
+SimObject::~SimObject()
 {
-    SimObjectParams *params = new SimObjectParams;
-    params->name = name;
-    return params;
+    delete probeManager;
 }
 
 void
@@ -82,127 +75,81 @@ SimObject::init()
 {
 }
 
-//
-// no default statistics, so nothing to do in base implementation
-//
 void
-SimObject::regStats()
+SimObject::loadState(CheckpointIn &cp)
 {
+    if (cp.sectionExists(name())) {
+        DPRINTF(Checkpoint, "unserializing\n");
+        // This works despite name() returning a fully qualified name
+        // since we are at the top level.
+        unserializeSection(cp, name());
+    } else {
+        DPRINTF(Checkpoint, "no checkpoint section found\n");
+    }
 }
 
 void
-SimObject::regFormulas()
+SimObject::initState()
 {
 }
 
 void
-SimObject::resetStats()
+SimObject::startup()
 {
 }
 
 //
-// static function:
-//   call regStats() on all SimObjects and then regFormulas() on all
-//   SimObjects.
+// no default statistics, so nothing to do in base implementation
 //
-struct SimObjectResetCB : public Callback
+void
+SimObject::regStats()
 {
-    virtual void process() { SimObject::resetAllStats(); }
-};
-
-namespace {
-    static SimObjectResetCB StatResetCB;
 }
 
 void
-SimObject::regAllStats()
+SimObject::resetStats()
 {
-    SimObjectList::iterator i;
-    SimObjectList::iterator end = simObjectList.end();
-
-    /**
-     * @todo change cprintfs to DPRINTFs
-     */
-    for (i = simObjectList.begin(); i != end; ++i) {
-#ifdef STAT_DEBUG
-        cprintf("registering stats for %s\n", (*i)->name());
-#endif
-        (*i)->regStats();
-    }
-
-    for (i = simObjectList.begin(); i != end; ++i) {
-#ifdef STAT_DEBUG
-        cprintf("registering formulas for %s\n", (*i)->name());
-#endif
-        (*i)->regFormulas();
-    }
-
-    Stats::registerResetCallback(&StatResetCB);
 }
 
-//
-// static function: call init() on all SimObjects.
-//
+/**
+ * No probe points by default, so do nothing in base.
+ */
 void
-SimObject::initAll()
+SimObject::regProbePoints()
 {
-    SimObjectList::iterator i = simObjectList.begin();
-    SimObjectList::iterator end = simObjectList.end();
-
-    for (; i != end; ++i) {
-        SimObject *obj = *i;
-        obj->init();
-    }
 }
 
-//
-// static function: call resetStats() on all SimObjects.
-//
+/**
+ * No probe listeners by default, so do nothing in base.
+ */
 void
-SimObject::resetAllStats()
+SimObject::regProbeListeners()
 {
-    SimObjectList::iterator i = simObjectList.begin();
-    SimObjectList::iterator end = simObjectList.end();
+}
 
-    for (; i != end; ++i) {
-        SimObject *obj = *i;
-        obj->resetStats();
-    }
+ProbeManager *
+SimObject::getProbeManager()
+{
+    return probeManager;
 }
 
 //
 // static function: serialize all SimObjects.
 //
 void
-SimObject::serializeAll(ostream &os)
+SimObject::serializeAll(CheckpointOut &cp)
 {
     SimObjectList::reverse_iterator ri = simObjectList.rbegin();
     SimObjectList::reverse_iterator rend = simObjectList.rend();
 
     for (; ri != rend; ++ri) {
         SimObject *obj = *ri;
-        obj->nameOut(os);
-        obj->serialize(os);
+        // This works despite name() returning a fully qualified name
+        // since we are at the top level.
+        obj->serializeSection(cp, obj->name());
    }
 }
 
-void
-SimObject::unserializeAll(Checkpoint *cp)
-{
-    SimObjectList::reverse_iterator ri = simObjectList.rbegin();
-    SimObjectList::reverse_iterator rend = simObjectList.rend();
-
-    for (; ri != rend; ++ri) {
-        SimObject *obj = *ri;
-        DPRINTFR(Config, "Unserializing '%s'\n",
-                 obj->name());
-        if(cp->sectionExists(obj->name()))
-            obj->unserialize(cp, obj->name());
-        else
-            warn("Not unserializing '%s': no section found in checkpoint.\n",
-                 obj->name());
-   }
-}
 
 #ifdef DEBUG
 //
@@ -228,44 +175,6 @@ debugObjectBreak(const char *objs)
 }
 #endif
 
-void
-SimObject::recordEvent(const std::string &stat)
-{
-    Stats::recordEvent(stat);
-}
-
-unsigned int
-SimObject::drain(Event *drain_event)
-{
-    state = Drained;
-    return 0;
-}
-
-void
-SimObject::resume()
-{
-    state = Running;
-}
-
-void
-SimObject::setMemoryMode(State new_mode)
-{
-    panic("setMemoryMode() should only be called on systems");
-}
-
-void
-SimObject::switchOut()
-{
-    panic("Unimplemented!");
-}
-
-void
-SimObject::takeOverFrom(BaseCPU *cpu)
-{
-    panic("Unimplemented!");
-}
-
-
 SimObject *
 SimObject::find(const char *name)
 {