From: Christian Menard Date: Fri, 10 Feb 2017 00:11:23 +0000 (-0500) Subject: misc: Fix order of object construction in the CxxConfigManager X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5fd959260cbcc35f1f5187321f5c473f04647bf6;p=gem5.git misc: Fix order of object construction in the CxxConfigManager The CxxConfigManager schould create objects by traversing the object tree starting from the root object. However, currently objects are created in aplphabetical order, which only works if the root object alphabetically comes before any system object (e.g. 'root' < 'system'. Otherwise (e.g. 'a_system' < 'root'), object construction may fail. The reason for this behaviour is, that the call to findObject() in the sorting code also constructs the object if it is not yet existent. Then findTraversalOrder() calls findObject("root") and subseqeuently calls findObject() on all the children, and so on. However, the call to findTraversalOrder() is redundant, since all objects are already created in alphabetical order. This patch simply removes the alphabetical ordering, leading to the objects being created starting from 'root'. Reviewed at http://reviews.gem5.org/r/3778/ Signed-off-by: Jason Lowe-Power --- diff --git a/src/sim/cxx_manager.cc b/src/sim/cxx_manager.cc index bb6c6a807..915736127 100644 --- a/src/sim/cxx_manager.cc +++ b/src/sim/cxx_manager.cc @@ -415,13 +415,6 @@ CxxConfigManager::findAllObjects() std::vector objects; configFile.getAllObjectNames(objects); - /* Sort the object names to get a consistent initialisation order - * even with config file reorganisation */ - std::sort(objects.begin(), objects.end()); - - for (auto i = objects.begin(); i != objects.end(); ++i) - findObject(*i); - /* Set the traversal order for further iterators */ objectsInOrder.clear(); findTraversalOrder("root");