sim: fold StartupCallback into SimObject

There used to be a reason to have StartupCallback
be a separate object, but not any more.  Now
it's just confusing.
This commit is contained in:
Steve Reinhardt
2010-07-05 21:39:38 -07:00
parent 345dfd1b41
commit 30ce620d1d
10 changed files with 32 additions and 118 deletions

View File

@@ -91,7 +91,7 @@ def simulate(*args, **kwargs):
global need_resume, need_startup
if need_startup:
internal.core.SimStartup()
internal.core.startupAll()
need_startup = False
for root in need_resume:

View File

@@ -38,7 +38,6 @@
#include "base/socket.hh"
#include "base/types.hh"
#include "sim/core.hh"
#include "sim/startup.hh"
extern const char *compileDate;
@@ -62,7 +61,6 @@ inline void disableAllListeners() { ListenSocket::disableAll(); }
%include "base/types.hh"
void setOutputDir(const std::string &dir);
void SimStartup();
void doExitCleanup();
void disableAllListeners();
@@ -82,6 +80,7 @@ void unserializeAll(const std::string &cpt_dir);
void initAll();
void regAllStats();
void startupAll();
bool want_warn, warn_verbose;
bool want_info, info_verbose;

View File

@@ -69,3 +69,8 @@ unserializeAll(const std::string &cpt_dir)
Serializable::unserializeAll(cpt_dir);
}
inline void
startupAll()
{
SimObject::startupAll();
}