diff options
| author | Kevin Lim <ktlim@umich.edu> | 2005-02-04 18:25:49 -0500 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2005-02-04 18:25:49 -0500 |
| commit | 1e7a744c09d0bde70e0f83179fdf4d6059585e4b (patch) | |
| tree | 9bbc7713c4bb79abb3f76b07547d8822f0557caa /sim/startup.cc | |
| parent | c389c2e327cc3ee1c988855b05505660c6670172 (diff) | |
| parent | b78d7c2f16dac11ed468de45a088a362605c6493 (diff) | |
| download | gem5-1e7a744c09d0bde70e0f83179fdf4d6059585e4b.tar.xz | |
Hand merge
--HG--
extra : convert_revision : 86c7399b79c17558041a73056745227f70fe8b3b
Diffstat (limited to 'sim/startup.cc')
| -rw-r--r-- | sim/startup.cc | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/sim/startup.cc b/sim/startup.cc index ebb4c0bc0..7cc0ac8fb 100644 --- a/sim/startup.cc +++ b/sim/startup.cc @@ -29,20 +29,32 @@ #include <list> #include "base/misc.hh" -#include "sim/startup.hh" #include "sim/debug.hh" +#include "sim/startup.hh" typedef std::list<StartupCallback *> startupq_t; -startupq_t &startupq() { static startupq_t queue; return queue; } -StartupCallback::StartupCallback() { startupq().push_back(this); } -StartupCallback::~StartupCallback() { startupq().remove(this); } + +startupq_t *startupq = NULL; + +StartupCallback::StartupCallback() +{ + if (startupq == NULL) + startupq = new startupq_t; + startupq->push_back(this); +} + +StartupCallback::~StartupCallback() +{ + startupq->remove(this); +} + void StartupCallback::startup() { } void SimStartup() { - startupq_t::iterator i = startupq().begin(); - startupq_t::iterator end = startupq().end(); + startupq_t::iterator i = startupq->begin(); + startupq_t::iterator end = startupq->end(); while (i != end) { (*i)->startup(); |