-/* Copyright (c) 2014-2020. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2014-2023. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "simgrid/s4u.hpp"
-XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this msg example");
+XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this example");
-simgrid::s4u::ExecPtr exec;
-
-static void computation_fun()
+static void computation_fun(simgrid::s4u::ExecPtr& exec)
{
const char* pr_name = simgrid::s4u::this_actor::get_cname();
const char* host_name = simgrid::s4u::Host::current()->get_cname();
static void master_main()
{
auto* pm0 = simgrid::s4u::Host::by_name("Fafard");
- auto* vm0 = new simgrid::s4u::VirtualMachine("VM0", pm0, 1);
+ auto* vm0 = pm0->create_vm("VM0", 1);
vm0->start();
- simgrid::s4u::Actor::create("compute", vm0, computation_fun);
+ simgrid::s4u::ExecPtr exec;
+ simgrid::s4u::Actor::create("compute", vm0, computation_fun, std::ref(exec));
while (simgrid::s4u::Engine::get_clock() < 100) {
if (exec)
e.load_platform(argv[1]);
- simgrid::s4u::Actor::create("master_", simgrid::s4u::Host::by_name("Fafard"), master_main);
+ simgrid::s4u::Actor::create("master_", e.host_by_name("Fafard"), master_main);
e.run();
- XBT_INFO("Bye (simulation time %g)", e.get_clock());
+ XBT_INFO("Bye (simulation time %g)", simgrid::s4u::Engine::get_clock());
return 0;
}