commit 081af5ec9c6dff33081ccd00f4ec1d494fa6af3c
author Gabe Black <gabeblack@google.com> Wed Aug 08 02:03:30 2018 -0700
committer Gabe Black <gabeblack@google.com> Thu Sep 20 01:43:26 2018 +0000
tree 8c131f6cba419bb711f5b034212e865ea590d7fb
parent de45562a8abae66ada57a3fc06078fadbd9f625b

systemc: Use an std::list to track all modules.

This is less efficient when modules are destroyed since the list isn't
sorted, and each module needs to find its own entry to remove. The
benefit is that entries added to the end of the list while the list is
being iterated over will still be included, and that the order the
modules are added will be preserved so that it matches what the order
in the regression tests.

Change-Id: I5af5d15f316fa58561e8fd9ca77f667ddc8b2c5e
Reviewed-on: https://gem5-review.googlesource.com/12077
Reviewed-by: Gabe Black <gabeblack@google.com>
Maintainer: Gabe Black <gabeblack@google.com>

src/systemc/core/module.cc

diff --git a/src/systemc/core/module.cc b/src/systemc/core/module.cc
index 986ad25..b13b50d 100644
--- a/src/systemc/core/module.cc
+++ b/src/systemc/core/module.cc
@@ -30,7 +30,6 @@
 #include "systemc/core/module.hh"
 
 #include <cassert>
-#include <list>
 
 #include "base/logging.hh"
 
@@ -53,7 +52,7 @@
     _new_module = this;
 }
 
-Module::~Module() { allModules.erase(this); }
+Module::~Module() { allModules.remove(this); }
 
 void
 Module::finish(Object *this_obj)
@@ -65,7 +64,7 @@
     // This is called from the constructor of this_obj, so it can't use
     // dynamic cast.
     sc_mod(static_cast<::sc_core::sc_module *>(this_obj->sc_obj()));
-    allModules.insert(this);
+    allModules.emplace_back(this);
 }
 
 void
@@ -95,6 +94,6 @@
 void callbackModule(Module *m) { _callbackModule = m; }
 Module *callbackModule() { return _callbackModule; }
 
-std::set<Module *> allModules;
+std::list<Module *> allModules;
 
 } // namespace sc_gem5

src/systemc/core/module.hh

diff --git a/src/systemc/core/module.hh b/src/systemc/core/module.hh
index 7e54e29..a5bf929 100644
--- a/src/systemc/core/module.hh
+++ b/src/systemc/core/module.hh
@@ -31,8 +31,8 @@
 #define __SYSTEMC_CORE_MODULE_HH__
 
 #include <cassert>
+#include <list>
 #include <map>
-#include <set>
 #include <sstream>
 #include <string>
 
@@ -109,7 +109,7 @@
 void callbackModule(Module *m);
 Module *callbackModule();
 
-extern std::set<Module *> allModules;
+extern std::list<Module *> allModules;
 
 } // namespace sc_gem5