Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5

[gem5.git] / sim / sim_object.cc

diff --git a/sim/sim_object.cc b/sim/sim_object.cc
index 9626c54ea7299533430e7962a7b0b7016a83dd3c..818648b98253a996864a43f1a425806c71799d10 100644 (file)
--- a/sim/sim_object.cc
+++ b/sim/sim_object.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2001-2004 The Regents of The University of Michigan
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,12 +30,15 @@
 
 #include "base/callback.hh"
 #include "base/inifile.hh"
+#include "base/match.hh"
 #include "base/misc.hh"
 #include "base/trace.hh"
+#include "base/stats/events.hh"
 #include "sim/configfile.hh"
 #include "sim/host.hh"
 #include "sim/sim_object.hh"
 #include "sim/stats.hh"
+#include "sim/param.hh"
 
 using namespace std;
 
@@ -51,12 +54,21 @@ using namespace std;
 //
 SimObject::SimObjectList SimObject::simObjectList;
 
+namespace Stats {
+    extern ObjectMatch event_ignore;
+}
+
 //
 // SimObject constructor: used to maintain static simObjectList
 //
 SimObject::SimObject(const string &_name)
     : objName(_name)
 {
+#ifdef DEBUG
+    doDebugBreak = false;
+#endif
+
+    doRecordEvent = !Stats::event_ignore.match(_name);
     simObjectList.push_back(this);
 }
 
@@ -120,7 +132,7 @@ SimObject::regAllStats()
         (*i)->regFormulas();
     }
 
-    Statistics::registerResetCallback(&StatResetCB);
+    Stats::registerResetCallback(&StatResetCB);
 }
 
 //
@@ -168,3 +180,37 @@ SimObject::serializeAll(ostream &os)
         obj->serialize(os);
    }
 }
+
+#ifdef DEBUG
+//
+// static function: flag which objects should have the debugger break
+//
+void
+SimObject::debugObjectBreak(const string &objs)
+{
+    SimObjectList::const_iterator i = simObjectList.begin();
+    SimObjectList::const_iterator end = simObjectList.end();
+
+    ObjectMatch match(objs);
+    for (; i != end; ++i) {
+        SimObject *obj = *i;
+        obj->doDebugBreak = match.match(obj->name());
+   }
+}
+
+extern "C"
+void
+debugObjectBreak(const char *objs)
+{
+    SimObject::debugObjectBreak(string(objs));
+}
+#endif
+
+void
+SimObject::recordEvent(const std::string &stat)
+{
+    if (doRecordEvent)
+        Stats::recordEvent(stat);
+}
+
+DEFINE_SIM_OBJECT_CLASS_NAME("SimObject", SimObject)