Merge CheckerSide::start() intp the constructor

[simgrid.git] / src / kernel / EngineImpl.cpp

diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp
index d4939567822f91876c1855774b47d8b9e876900e..f7af9b41ad15e42670ab76778484cbcfaf998f5f 100644 (file)
--- a/src/kernel/EngineImpl.cpp
+++ b/src/kernel/EngineImpl.cpp
@@ -184,12 +184,11 @@ void EngineImpl::initialize(int* argc, char** argv)
 
     simgrid::xbt::install_exception_handler();
 
-    for (int i = 0; i < *argc; i++)
-      cmdline_.emplace_back(argv[i]);
-
     sg_config_init(argc, argv);
   }
 
+  cmdline_.assign(argv, argv + *argc);
+
   instance_->context_mod_init();
 
   install_signal_handlers();
@@ -363,7 +362,7 @@ void EngineImpl::handle_ended_actions() const
         if (action->get_activity()->get_actor() == maestro_)
           action->get_activity()->get_iface()->complete(s4u::Activity::State::FAILED);
 
-        activity::ActivityImplPtr(action->get_activity())->post();
+        activity::ActivityImplPtr(action->get_activity())->finish();
       }
     }
     XBT_DEBUG("Handling the terminated actions (if any)");
@@ -376,7 +375,7 @@ void EngineImpl::handle_ended_actions() const
         if (action->get_activity()->get_actor() == maestro_)
           action->get_activity()->get_iface()->complete(s4u::Activity::State::FINISHED);
 
-        activity::ActivityImplPtr(action->get_activity())->post();
+        activity::ActivityImplPtr(action->get_activity())->finish();
       }
     }
   }