From c533259777a80ef9daddc0a5f9d0e265a289f1b0 Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Thu, 15 Mar 2018 15:23:40 +0100
Subject: [PATCH] No need to switch data segment when process is finished.

---
 src/simix/ActorImpl.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp
index b93d87482e..adfd9e389f 100644
--- a/src/simix/ActorImpl.cpp
+++ b/src/simix/ActorImpl.cpp
@@ -748,7 +748,7 @@ void SIMIX_process_yield(smx_actor_t self)
     std::rethrow_exception(std::move(exception));
   }
 
-  if(SMPI_switch_data_segment){
+  if (SMPI_switch_data_segment && !self->finished) {
     SMPI_switch_data_segment(self->pid);
   }
 }
-- 
2.20.1