return netpoint;
}
-void sg_platf_new_link(simgrid::kernel::routing::LinkCreationArgs* link)
+static void sg_platf_new_link(simgrid::kernel::routing::LinkCreationArgs* link, const std::string& link_name)
{
- std::vector<std::string> names;
+ simgrid::kernel::resource::LinkImpl* l =
+ surf_network_model->create_link(link_name, link->bandwidth, link->latency, link->policy);
- if (link->policy == simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX) {
- names.push_back(link->id+ "_UP");
- names.push_back(link->id+ "_DOWN");
- } else {
- names.push_back(link->id);
+ if (link->properties) {
+ for (auto const& elm : *link->properties)
+ l->set_property(elm.first, elm.second);
}
- for (auto const& link_name : names) {
- simgrid::kernel::resource::LinkImpl* l =
- surf_network_model->create_link(link_name, link->bandwidth, link->latency, link->policy);
- if (link->properties) {
- for (auto const& elm : *link->properties)
- l->set_property(elm.first, elm.second);
- }
+ if (link->latency_trace)
+ l->set_latency_profile(link->latency_trace);
+ if (link->bandwidth_trace)
+ l->set_bandwidth_profile(link->bandwidth_trace);
+ if (link->state_trace)
+ l->set_state_profile(link->state_trace);
+}
- if (link->latency_trace)
- l->set_latency_profile(link->latency_trace);
- if (link->bandwidth_trace)
- l->set_bandwidth_profile(link->bandwidth_trace);
- if (link->state_trace)
- l->set_state_profile(link->state_trace);
+void sg_platf_new_link(simgrid::kernel::routing::LinkCreationArgs* link)
+{
+ if (link->policy == simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX) {
+ sg_platf_new_link(link, link->id + "_UP");
+ sg_platf_new_link(link, link->id + "_DOWN");
+ } else {
+ sg_platf_new_link(link, link->id);
}
delete link->properties;
}
XBT_DEBUG("Process %s@%s will be started at time %f", arg->name.c_str(), arg->host->get_cname(), start_time);
SIMIX_timer_set(start_time, [arg, auto_restart]() {
- smx_actor_t actor = SIMIX_process_create(arg->name.c_str(), std::move(arg->code), arg->data, arg->host,
- arg->properties.get(), nullptr);
+ simgrid::kernel::actor::ActorImplPtr actor = simgrid::kernel::actor::ActorImpl::create(
+ arg->name.c_str(), std::move(arg->code), arg->data, arg->host, arg->properties.get(), nullptr);
if (arg->kill_time >= 0)
- simcall_process_set_kill_time(actor, arg->kill_time);
+ actor->set_kill_time(arg->kill_time);
if (auto_restart)
actor->set_auto_restart(auto_restart);
delete arg;
} else { // start_time <= SIMIX_get_clock()
XBT_DEBUG("Starting Process %s(%s) right now", arg->name.c_str(), host->get_cname());
- smx_actor_t actor =
- SIMIX_process_create(arg->name.c_str(), std::move(code), nullptr, host, arg->properties.get(), nullptr);
+ simgrid::kernel::actor::ActorImplPtr actor = simgrid::kernel::actor::ActorImpl::create(
+ arg->name.c_str(), std::move(code), nullptr, host, arg->properties.get(), nullptr);
/* The actor creation will fail if the host is currently dead, but that's fine */
if (actor != nullptr) {
if (arg->kill_time >= 0)
- simcall_process_set_kill_time(actor, arg->kill_time);
+ actor->set_kill_time(arg->kill_time);
if (auto_restart)
actor->set_auto_restart(auto_restart);
}