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:
@@ -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:
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -69,3 +69,8 @@ unserializeAll(const std::string &cpt_dir)
|
||||
Serializable::unserializeAll(cpt_dir);
|
||||
}
|
||||
|
||||
inline void
|
||||
startupAll()
|
||||
{
|
||||
SimObject::startupAll();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user