msg->used -= 3;
xbt_strbuff_append(msg," ...(list truncated)......");// That will be shortened by 3 chars when existing the loop
+ break;
}
}
msg->data[msg->used-3]='\0';
arg->name = std::string(process->argv[0]);
arg->code = code;
arg->data = nullptr;
- arg->hostname = sg_host_get_name(host);
+ arg->host = host;
arg->kill_time = kill_time;
arg->properties = current_property_set;
- if (!sg_host_simix(host)->boot_processes)
- sg_host_simix(host)->boot_processes = xbt_dynar_new(sizeof(smx_process_arg_t), _SIMIX_host_free_process_arg);
- xbt_dynar_push_as(sg_host_simix(host)->boot_processes,smx_process_arg_t,arg);
+ sg_host_simix(host)->boot_processes.push_back(arg);
if (start_time > SIMIX_get_clock()) {
arg->name = std::string(process->argv[0]);
arg->code = std::move(code);
arg->data = nullptr;
- arg->hostname = sg_host_get_name(host);
+ arg->host = host;
arg->kill_time = kill_time;
arg->properties = current_property_set;
- XBT_DEBUG("Process %s(%s) will be started at time %f",
- arg->name.c_str(), arg->hostname, start_time);
+ XBT_DEBUG("Process %s@%s will be started at time %f",
+ arg->name.c_str(), arg->host->name().c_str(), start_time);
SIMIX_timer_set(start_time, [=]() {
simix_global->create_process_function(
arg->name.c_str(),
std::move(arg->code),
arg->data,
- arg->hostname,
+ arg->host,
arg->kill_time,
arg->properties,
arg->auto_restart,
XBT_DEBUG("Starting Process %s(%s) right now",
arg->name.c_str(), sg_host_get_name(host));
- if (simix_global->create_process_function)
- process_created = simix_global->create_process_function(
- arg->name.c_str(), std::move(code), nullptr,
- sg_host_get_name(host), kill_time,
- current_property_set, auto_restart, nullptr);
- else
- process_created = simcall_process_create(
- arg->name.c_str(), std::move(code), nullptr, sg_host_get_name(host), kill_time,
- current_property_set,auto_restart);
+ process_created = simix_global->create_process_function(
+ arg->name.c_str(), std::move(code), nullptr,
+ host, kill_time,
+ current_property_set, auto_restart, nullptr);
/* verify if process has been created (won't be the case if the host is currently dead, but that's fine) */
if (!process_created) {
/* search the routing model */
simgrid::kernel::routing::AsImpl *new_as = nullptr;
switch(AS->routing){
- case A_surfxml_AS_routing_Cluster: new_as = new simgrid::kernel::routing::AsCluster(AS->id); break;
- case A_surfxml_AS_routing_ClusterDragonfly: new_as = new simgrid::kernel::routing::AsClusterDragonfly(AS->id); break;
- case A_surfxml_AS_routing_ClusterTorus: new_as = new simgrid::kernel::routing::AsClusterTorus(AS->id); break;
- case A_surfxml_AS_routing_ClusterFatTree: new_as = new simgrid::kernel::routing::AsClusterFatTree(AS->id); break;
- case A_surfxml_AS_routing_Dijkstra: new_as = new simgrid::kernel::routing::AsDijkstra(AS->id, 0); break;
- case A_surfxml_AS_routing_DijkstraCache: new_as = new simgrid::kernel::routing::AsDijkstra(AS->id, 1); break;
- case A_surfxml_AS_routing_Floyd: new_as = new simgrid::kernel::routing::AsFloyd(AS->id); break;
- case A_surfxml_AS_routing_Full: new_as = new simgrid::kernel::routing::AsFull(AS->id); break;
- case A_surfxml_AS_routing_None: new_as = new simgrid::kernel::routing::AsNone(AS->id); break;
- case A_surfxml_AS_routing_Vivaldi: new_as = new simgrid::kernel::routing::AsVivaldi(AS->id); break;
- default: xbt_die("Not a valid model!"); break;
+ case A_surfxml_AS_routing_Cluster:
+ new_as = new simgrid::kernel::routing::AsCluster(current_routing, AS->id);
+ break;
+ case A_surfxml_AS_routing_ClusterDragonfly:
+ new_as = new simgrid::kernel::routing::AsClusterDragonfly(current_routing, AS->id);
+ break;
+ case A_surfxml_AS_routing_ClusterTorus:
+ new_as = new simgrid::kernel::routing::AsClusterTorus(current_routing, AS->id);
+ break;
+ case A_surfxml_AS_routing_ClusterFatTree:
+ new_as = new simgrid::kernel::routing::AsClusterFatTree(current_routing, AS->id);
+ break;
+ case A_surfxml_AS_routing_Dijkstra:
+ new_as = new simgrid::kernel::routing::AsDijkstra(current_routing, AS->id, 0);
+ break;
+ case A_surfxml_AS_routing_DijkstraCache:
+ new_as = new simgrid::kernel::routing::AsDijkstra(current_routing, AS->id, 1);
+ break;
+ case A_surfxml_AS_routing_Floyd:
+ new_as = new simgrid::kernel::routing::AsFloyd(current_routing, AS->id);
+ break;
+ case A_surfxml_AS_routing_Full:
+ new_as = new simgrid::kernel::routing::AsFull(current_routing, AS->id);
+ break;
+ case A_surfxml_AS_routing_None:
+ new_as = new simgrid::kernel::routing::AsNone(current_routing, AS->id);
+ break;
+ case A_surfxml_AS_routing_Vivaldi:
+ new_as = new simgrid::kernel::routing::AsVivaldi(current_routing, AS->id);
+ break;
+ default:
+ xbt_die("Not a valid model!");
+ break;
}
/* make a new routing component */
routing_platf->root_ = new_as;
} else if (current_routing != nullptr && routing_platf->root_ != nullptr) {
- xbt_assert(!xbt_dict_get_or_null(current_routing->children(), AS->id),
- "The AS \"%s\" already exists", AS->id);
- /* it is a part of the tree */
- new_as->father_ = current_routing;
+ xbt_assert(!xbt_dict_get_or_null(current_routing->children(), AS->id), "The AS '%s' already exists", AS->id);
/* set the father behavior */
if (current_routing->hierarchy_ == simgrid::kernel::routing::AsImpl::RoutingMode::unset)
current_routing->hierarchy_ = simgrid::kernel::routing::AsImpl::RoutingMode::recursive;
