X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9735863c1ccb1ae8b55853262d6e1c3ee3a8698f..cb6448e71a64791c262d6c40c050cc0b8d8ed184:/src/s4u/s4u_engine.cpp

diff --git a/src/s4u/s4u_engine.cpp b/src/s4u/s4u_engine.cpp
index f7b078e3f5..73b3b7c380 100644
--- a/src/s4u/s4u_engine.cpp
+++ b/src/s4u/s4u_engine.cpp
@@ -9,6 +9,8 @@
 #include "mc/mc.h"
 #include "simgrid/s4u/As.hpp"
 #include "simgrid/s4u/engine.hpp"
+#include "simgrid/s4u/mailbox.hpp"
+#include "simgrid/s4u/storage.hpp"
 
 XBT_LOG_NEW_CATEGORY(s4u,"Log channels of the S4U (Simgrid for you) interface");
 using namespace simgrid;
@@ -29,6 +31,13 @@ s4u::Engine *s4u::Engine::instance() {
   return s4u::Engine::instance_;
 }
 
+void s4u::Engine::shutdown() {
+  delete s4u::Engine::instance_;
+  s4u::Engine::instance_ = nullptr;
+  delete s4u::Mailbox::mailboxes;
+  delete s4u::Storage::storages_;
+}
+
 double s4u::Engine::getClock()
 {
   return SIMIX_get_clock();
@@ -73,12 +82,12 @@ static s4u::As *asByNameRecursive(s4u::As *current, const char *name)
   if(!strcmp(current->name(), name))
     return current;
 
-  xbt_dict_cursor_t cursor = NULL;
+  xbt_dict_cursor_t cursor = nullptr;
   char *key;
   AS_t elem;
   xbt_dict_foreach(current->children(), cursor, key, elem) {
     simgrid::s4u::As *tmp = asByNameRecursive(elem, name);
-    if (tmp != NULL )
+    if (tmp != nullptr )
         return tmp;
   }
   return nullptr;