From 5ea906ba1625266ee80968d70e0c218adedcce9f Mon Sep 17 00:00:00 2001
From: Steve Reinhardt <steve.reinhardt@amd.com>
Date: Tue, 17 Aug 2010 05:08:50 -0700
Subject: sim: move iterating over SimObjects into Python.

---
 src/python/swig/core.i       |  4 ----
 src/python/swig/pyobject.hh  | 17 -----------------
 src/python/swig/sim_object.i |  6 ++++++
 3 files changed, 6 insertions(+), 21 deletions(-)

(limited to 'src/python/swig')

diff --git a/src/python/swig/core.i b/src/python/swig/core.i
index f7a075f74..81085dd06 100644
--- a/src/python/swig/core.i
+++ b/src/python/swig/core.i
@@ -78,10 +78,6 @@ Tick curTick;
 void serializeAll(const std::string &cpt_dir);
 void unserializeAll(const std::string &cpt_dir);
 
-void initAll();
-void regAllStats();
-void startupAll();
-
 bool want_warn, warn_verbose;
 bool want_info, info_verbose;
 bool want_hack, hack_verbose;
diff --git a/src/python/swig/pyobject.hh b/src/python/swig/pyobject.hh
index 01f0fd95e..a27080d08 100644
--- a/src/python/swig/pyobject.hh
+++ b/src/python/swig/pyobject.hh
@@ -45,17 +45,6 @@ SimObject *resolveSimObject(const std::string &name);
 int connectPorts(SimObject *o1, const std::string &name1, int i1,
     SimObject *o2, const std::string &name2, int i2);
 
-inline void
-initAll()
-{
-    SimObject::initAll();
-}
-
-inline void
-regAllStats()
-{
-    SimObject::regAllStats();
-}
 
 inline void
 serializeAll(const std::string &cpt_dir)
@@ -68,9 +57,3 @@ unserializeAll(const std::string &cpt_dir)
 {
     Serializable::unserializeAll(cpt_dir);
 }
-
-inline void
-startupAll()
-{
-    SimObject::startupAll();
-}
diff --git a/src/python/swig/sim_object.i b/src/python/swig/sim_object.i
index c98e44ec2..8cd8e8beb 100644
--- a/src/python/swig/sim_object.i
+++ b/src/python/swig/sim_object.i
@@ -50,6 +50,12 @@ class SimObject {
       Drained
     };
 
+    void init();
+    void regStats();
+    void regFormulas();
+    void resetStats();
+    void startup();
+
     unsigned int drain(Event *drain_event);
     void resume();
     void switchOut();
-- 
cgit v1.2.3