sim-se: Add default to SyscallDesc constructor

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

diff --git a/src/sim/cxx_manager.cc b/src/sim/cxx_manager.cc
index 6d4565dbcedd19b1b80596bc3eb3df3f047a8263..91573612709b3d5f0c030993dcf1092f6e558055 100644 (file)
--- a/src/sim/cxx_manager.cc
+++ b/src/sim/cxx_manager.cc
@@ -37,13 +37,15 @@
  * Authors: Andrew Bardsley
  */
 
+#include "sim/cxx_manager.hh"
+
 #include <cstdlib>
 #include <sstream>
 
 #include "base/str.hh"
+#include "base/trace.hh"
 #include "debug/CxxConfig.hh"
 #include "mem/mem_object.hh"
-#include "sim/cxx_manager.hh"
 #include "sim/serialize.hh"
 
 CxxConfigManager::CxxConfigManager(CxxConfigFileBase &configFile_) :
@@ -413,13 +415,6 @@ CxxConfigManager::findAllObjects()
     std::vector<std::string> objects;
     configFile.getAllObjectNames(objects);
 
-    /* Sort the object names to get a consistent initialisation order
-     *  even with config file reorganisation */
-    std::sort(objects.begin(), objects.end());
-
-    for (auto i = objects.begin(); i != objects.end(); ++i)
-        findObject(*i);
-
     /* Set the traversal order for further iterators */
     objectsInOrder.clear();
     findTraversalOrder("root");
@@ -644,20 +639,15 @@ CxxConfigManager::startup()
 }
 
 unsigned int
-CxxConfigManager::drain(DrainManager *drain_manager)
+CxxConfigManager::drain()
 {
-    unsigned int ret = 0;
-
-    for (auto i = objectsInOrder.begin(); i != objectsInOrder.end(); ++ i)
-        ret += (*i)->drain(drain_manager);
-
-    return ret;
+    return DrainManager::instance().tryDrain() ? 0 : 1;
 }
 
 void
 CxxConfigManager::drainResume()
 {
-    forEachObject(&SimObject::drainResume);
+    DrainManager::instance().resume();
 }
 
 void