#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
#include "src/instr/instr_private.hpp"
+#include "src/kernel/EngineImpl.hpp"
#include "src/msg/msg_private.hpp"
-#include "src/simix/smx_private.hpp"
#include <xbt/config.hpp>
XBT_LOG_NEW_CATEGORY(msg, "All MSG categories");
simgrid::config::bind_flag(MSG_Global_t::debug_multiple_use, "msg/debug-multiple-use",
"Print backtraces of both processes when there is a conflict of multiple use of a task");
- SIMIX_global_init(argc, argv);
+ simgrid::kernel::EngineImpl::get_instance(argc, argv);
msg_global = new MSG_Global_t();
msg_global->sent_msg = 0;
msg_global->task_copy_callback = nullptr;
msg_global->process_data_cleanup = nullptr;
- simgrid::s4u::Actor::on_termination.connect([](simgrid::s4u::Actor const& actor) {
+ simgrid::s4u::Actor::on_termination_cb([](simgrid::s4u::Actor const& actor) {
// free the data if a function was provided
void* userdata = sg_actor_get_data(&actor);
if (userdata && msg_global->process_data_cleanup)