Answer to Martin's feedback

diff --git a/src/bindings/python/simgrid_python.cpp b/src/bindings/python/simgrid_python.cpp
index 4da8616..288c0cf 100644 (file)
--- a/src/bindings/python/simgrid_python.cpp
+++ b/src/bindings/python/simgrid_python.cpp
@@ -219,7 +219,7 @@ PYBIND11_MODULE(simgrid, m)
                   res();
               } catch (const py::error_already_set& ex) {
                 XBT_VERB("Actor killed");
-                simgrid::ForcefulKillException::do_throw(); // Forward that ForcefulKill exception
+                simgrid::ForcefulKillException::do_throw();
                 throw;
               }
             });
@@ -743,7 +743,7 @@ PYBIND11_MODULE(simgrid, m)
                 fun(*args);
               } catch (const py::error_already_set& ex) {
                 XBT_VERB("Actor killed");
-                simgrid::ForcefulKillException::do_throw(); // Forward that ForcefulKill exception
+                simgrid::ForcefulKillException::do_throw();
                 throw;
               }
             });

diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp
index b35092d..1e669cb 100644 (file)
--- a/src/kernel/EngineImpl.cpp
+++ b/src/kernel/EngineImpl.cpp
@@ -297,7 +297,7 @@ void EngineImpl::shutdown()
   XBT_DEBUG("EngineImpl::shutdown() called. Simulation's over.");
 #if HAVE_SMPI
   if (not instance_->actor_list_.empty()) {
-    if (smpi_process() && smpi_process()->initialized()) {
+    if (smpi_process()->initialized()) {
       xbt_die("Process exited without calling MPI_Finalize - Killing simulation");
     } else {
       XBT_WARN("Process called exit when leaving - Skipping cleanups");