#include "simgrid/kernel/routing/NetZoneImpl.hpp"
#include "simgrid/kernel/routing/TorusZone.hpp"
#include "simgrid/kernel/routing/VivaldiZone.hpp"
+#include "simgrid/kernel/routing/WifiZone.hpp"
#include "simgrid/s4u/Engine.hpp"
#include "src/include/simgrid/sg_config.hpp"
#include "src/include/surf/surf.hpp"
for (auto const& elm : *args->properties)
props.insert({elm.first, elm.second});
- simgrid::s4u::Link* link =
+ const simgrid::s4u::Link* link =
routing_get_current()->create_link(link_name, args->bandwidths, args->latency, args->policy, &props);
simgrid::kernel::resource::LinkImpl* l = link->get_impl();
XBT_DEBUG("<router id=\"%s\"/>", cluster->router_id.c_str());
if (cluster->router_id.empty())
cluster->router_id = std::string(cluster->prefix) + cluster->id + "_router" + cluster->suffix;
- current_as->router_ = sg_platf_new_router(cluster->router_id, NULL);
+ current_as->router_ = sg_platf_new_router(cluster->router_id, nullptr);
//Make the backbone
if ((cluster->bb_bw > 0) || (cluster->bb_lat > 0)) {
XBT_DEBUG("Process %s@%s will be started at time %f", arg->name.c_str(), arg->host->get_cname(), start_time);
simgrid::simix::Timer::set(start_time, [arg, auto_restart]() {
simgrid::kernel::actor::ActorImplPtr new_actor = simgrid::kernel::actor::ActorImpl::create(
- arg->name.c_str(), std::move(arg->code), arg->data, arg->host, arg->properties.get(), nullptr);
+ arg->name.c_str(), arg->code, arg->data, arg->host, arg->properties.get(), nullptr);
if (arg->kill_time >= 0)
new_actor->set_kill_time(arg->kill_time);
if (auto_restart)
try {
simgrid::kernel::actor::ActorImplPtr new_actor = nullptr;
- new_actor = simgrid::kernel::actor::ActorImpl::create(arg->name.c_str(), std::move(code), nullptr, host,
+ new_actor = simgrid::kernel::actor::ActorImpl::create(arg->name.c_str(), code, nullptr, host,
arg->properties.get(), nullptr);
/* The actor creation will fail if the host is currently dead, but that's fine */
if (arg->kill_time >= 0)
new_zone = new simgrid::kernel::routing::EmptyZone(current_routing, zone->id, netmodel);
} else if (strcasecmp(zone->routing.c_str(),"Vivaldi") == 0) {
new_zone = new simgrid::kernel::routing::VivaldiZone(current_routing, zone->id, netmodel);
+ } else if (strcasecmp(zone->routing.c_str(), "Wifi") == 0) {
+ new_zone = new simgrid::kernel::routing::WifiZone(current_routing, zone->id, netmodel);
} else {
- xbt_die("Not a valid model!");
+ xbt_die("Not a valid model!");
}
if (current_routing == nullptr) { /* it is the first one */