From 1c175147cb92a354153248569a18794834b361f6 Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Mon, 5 Feb 2018 16:34:23 +0100
Subject: [PATCH] Search in map only once.

---
 src/smpi/internals/smpi_global.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp
index 0e46a5291d..776bdcf707 100644
--- a/src/smpi/internals/smpi_global.cpp
+++ b/src/smpi/internals/smpi_global.cpp
@@ -612,9 +612,10 @@ void SMPI_init(){
     process_data.insert({actor, new simgrid::smpi::Process(actor, nullptr)});
   });
   simgrid::s4u::Actor::onDestruction.connect([](simgrid::s4u::ActorPtr actor) {
-    if (process_data.find(actor) != process_data.end()) {
-      delete process_data.at(actor);
-      process_data.erase(actor);
+    auto it = process_data.find(actor);
+    if (it != process_data.end()) {
+      delete it->second;
+      process_data.erase(it);
     }
   });
 
-- 
2.20.1