From 934e15f8ffc473c09214dd3dcbd4a926d2fa0846 Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Sun, 1 Oct 2017 22:32:48 +0200
Subject: [PATCH 1/1] Reintroduce lines removed at commit
 5bc3597e1513c7b94497ae0ea819e5fa2e28058a.

Only put them in SIMIX_clean instead of SIMIX_process_killall.

I don't really understand when/why they are useful, but the call to
SIMIX_process_empty_trash() fixes a leak seen with teshsuite/mc/random-bug.
---
 src/simix/smx_global.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp
index 07d7058e2d..61469fb447 100644
--- a/src/simix/smx_global.cpp
+++ b/src/simix/smx_global.cpp
@@ -286,6 +286,8 @@ void SIMIX_clean()
   }
   /* Kill all processes (but maestro) */
   SIMIX_process_killall(simix_global->maestro_process, 1);
+  SIMIX_context_runall();
+  SIMIX_process_empty_trash();
 
   /* Exit the SIMIX network module */
   SIMIX_mailbox_exit();
-- 
2.20.1