From 3420f0e223888bf70cd502efb5a534e651891b5c Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Sun, 7 Oct 2018 03:59:56 -0700 Subject: systemc: Don't depend on the order of static initializers. STL containers may need to be constructed before they're used. Don't count on being able to insert into them during a static initializer. Change-Id: Icb05d5084a470e1ebd976ae6e1954b1a78aabd6a Reviewed-on: https://gem5-review.googlesource.com/c/13329 Reviewed-by: Gabe Black Maintainer: Gabe Black --- src/systemc/core/python.cc | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) (limited to 'src/systemc/core/python.cc') diff --git a/src/systemc/core/python.cc b/src/systemc/core/python.cc index 99d6cc9a0..e4a0dd0cb 100644 --- a/src/systemc/core/python.cc +++ b/src/systemc/core/python.cc @@ -40,14 +40,25 @@ namespace sc_gem5 namespace { -std::vector pythonReadyFuncs; -std::vector pythonInitFuncs; +PythonReadyFunc *& +firstReadyFunc() +{ + static PythonReadyFunc *first = nullptr; + return first; +} + +PythonInitFunc *& +firstInitFunc() +{ + static PythonInitFunc *first = nullptr; + return first; +} void python_ready(pybind11::args args) { - for (auto &func: pythonReadyFuncs) - func->run(); + for (auto ptr = firstReadyFunc(); ptr; ptr = ptr->next) + ptr->run(); } void @@ -55,21 +66,21 @@ systemc_pybind(pybind11::module &m_internal) { pybind11::module m = m_internal.def_submodule("systemc"); m.def("python_ready", &python_ready); - for (auto &func: pythonInitFuncs) - func->run(m); + for (auto ptr = firstInitFunc(); ptr; ptr = ptr->next) + ptr->run(m); } EmbeddedPyBind embed_("systemc", &systemc_pybind); } // anonymous namespace -PythonReadyFunc::PythonReadyFunc() +PythonReadyFunc::PythonReadyFunc() : next(firstReadyFunc()) { - pythonReadyFuncs.push_back(this); + firstReadyFunc() = this; } -PythonInitFunc::PythonInitFunc() +PythonInitFunc::PythonInitFunc() : next(firstInitFunc()) { - pythonInitFuncs.push_back(this); + firstInitFunc() = this; } } // namespace sc_gem5 -- cgit v1.2.3