X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/047872771f0685df5ad0db3422b3333e26696330..5ad97e643fcc12fffcbcdfae0449d0b18292f4db:/src/surf/surf_interface.cpp diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index c1729908bc..5fb89fb004 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -5,19 +5,16 @@ #include "surf_interface.hpp" #include "mc/mc.h" -#include "simgrid/kernel/routing/NetPoint.hpp" #include "simgrid/s4u/Engine.hpp" #include "simgrid/sg_config.hpp" -#include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals -#include "src/kernel/lmm/maxmin.hpp" // Constraint +#include "src/internal_config.h" #include "src/surf/HostImpl.hpp" #include "src/surf/xml/platf.hpp" -#include "xbt/utility.hpp" +#include "surf/surf.hpp" +#include "xbt/module.h" #include -#include #include -#include #ifdef _WIN32 #include @@ -39,13 +36,6 @@ std::vector host_that_restart; std::set watched_hosts; extern std::map storage_types; -namespace simgrid { -namespace surf { - -simgrid::xbt::signal surfExitCallbacks; -} -} - #include // FIXME: this plug-in should not be linked to the core #include // FIXME: this plug-in should not be linked to the core @@ -314,8 +304,6 @@ void surf_init(int *argc, char **argv) void surf_exit() { - TRACE_end(); /* Just in case it was not called by the upper layer (or there is no upper layer) */ - simgrid::s4u::Engine::shutdown(); sg_link_exit(); for (auto const& e : storage_types) {