From 15cd0a2b725a3a828b9eec14a3f589e77673de29 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sat, 10 Mar 2018 03:37:49 +0100 Subject: [PATCH] kill the useless simgrid::surf::surfExitCallbacks callback --- src/smpi/internals/smpi_global.cpp | 3 ++- src/surf/surf_interface.cpp | 1 - src/surf/surf_interface.hpp | 7 ------- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp index 84f00e4418..2dbfbce721 100644 --- a/src/smpi/internals/smpi_global.cpp +++ b/src/smpi/internals/smpi_global.cpp @@ -6,6 +6,7 @@ #include "SmpiHost.hpp" #include "mc/mc.h" #include "private.hpp" +#include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Host.hpp" #include "simgrid/s4u/Mailbox.hpp" #include "simgrid/s4u/forward.hpp" @@ -620,7 +621,7 @@ void SMPI_init(){ smpi_global_init(); smpi_check_options(); TRACE_smpi_alloc(); - simgrid::surf::surfExitCallbacks.connect(TRACE_smpi_release); + simgrid::s4u::onSimulationEnd.connect(TRACE_smpi_release); if(smpi_privatize_global_variables == SMPI_PRIVATIZE_MMAP) smpi_backup_global_memory_segment(); } diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index 3549820d09..fa9aaa2a73 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -337,7 +337,6 @@ void surf_exit() delete model; delete all_existing_models; - simgrid::surf::surfExitCallbacks(); if (future_evt_set) { delete future_evt_set; diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp index 34599d2ccc..a2c9467c3b 100644 --- a/src/surf/surf_interface.hpp +++ b/src/surf/surf_interface.hpp @@ -71,13 +71,6 @@ XBT_PUBLIC(double) surf_get_clock(); */ XBT_PUBLIC_DATA(std::vector) host_that_restart; -namespace simgrid { -namespace surf { - -extern XBT_PRIVATE simgrid::xbt::signal surfExitCallbacks; -} -} - int XBT_PRIVATE __surf_is_absolute_file_path(const char *file_path); /********** -- 2.20.1