From 2093e4004f3ffabf1af3aa77ca4396d872e1179f Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Mon, 30 Apr 2018 17:27:04 +0200 Subject: [PATCH] Obey! Move signal trigger at a better place --- src/surf/sg_platf.cpp | 1 + src/surf/xml/surfxml_sax_cb.cpp | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index e331fd1cff..fa00565f2a 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -557,6 +557,7 @@ simgrid::s4u::NetZone* sg_platf_new_Zone_begin(simgrid::kernel::routing::ZoneCre _sg_cfg_init_status = 2; /* HACK: direct access to the global controlling the level of configuration to prevent * any further config now that we created some real content */ + simgrid::s4u::on_config_in_platform_done(); /* search the routing model */ simgrid::kernel::routing::NetZoneImpl* new_zone = nullptr; diff --git a/src/surf/xml/surfxml_sax_cb.cpp b/src/surf/xml/surfxml_sax_cb.cpp index 22836f53d4..e56c3f0ca7 100644 --- a/src/surf/xml/surfxml_sax_cb.cpp +++ b/src/surf/xml/surfxml_sax_cb.cpp @@ -869,7 +869,6 @@ void ETag_surfxml_config() } XBT_DEBUG("End configuration name = %s",A_surfxml_config_id); - simgrid::s4u::on_config_in_platform_done(); delete current_property_set; current_property_set = nullptr; } -- 2.20.1