X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d17f206ea75d3cccc5f1b83b67f58d4fe87781d1..312fb09ad52ce2677ad845a760d477b688a30d2c:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 5f7f50d686..21d0d8c0f9 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -9,6 +9,7 @@ #include "xbt/str.h" #include "xbt/dict.h" #include "xbt/RngStream.h" +#include #include #include "src/surf/HostImpl.hpp" #include "surf/surf.h" @@ -22,19 +23,20 @@ #include "src/surf/network_interface.hpp" #include "surf/surf_routing.h" // FIXME: brain dead public header -#include "src/surf/AsImpl.hpp" -#include "src/surf/AsCluster.hpp" -#include "src/surf/AsClusterTorus.hpp" -#include "src/surf/AsClusterFatTree.hpp" -#include "src/surf/AsDijkstra.hpp" -#include "src/surf/AsFloyd.hpp" -#include "src/surf/AsFull.hpp" -#include "src/surf/AsNone.hpp" -#include "src/surf/AsVivaldi.hpp" +#include "src/kernel/routing/AsImpl.hpp" +#include "src/kernel/routing/AsCluster.hpp" +#include "src/kernel/routing/AsClusterTorus.hpp" +#include "src/kernel/routing/AsClusterFatTree.hpp" +#include "src/kernel/routing/AsClusterDragonfly.hpp" +#include "src/kernel/routing/AsDijkstra.hpp" +#include "src/kernel/routing/AsFloyd.hpp" +#include "src/kernel/routing/AsFull.hpp" +#include "src/kernel/routing/AsNone.hpp" +#include "src/kernel/routing/AsVivaldi.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse); -XBT_PRIVATE xbt_dynar_t mount_list = NULL; +XBT_PRIVATE xbt_dynar_t mount_list = nullptr; namespace simgrid { namespace surf { @@ -86,18 +88,18 @@ static std::vector *explodesRadical(const char*radicals){ /** The current AS in the parsing */ -static simgrid::surf::AsImpl *current_routing = NULL; -static simgrid::surf::AsImpl* routing_get_current() +static simgrid::kernel::routing::AsImpl *current_routing = nullptr; +static simgrid::kernel::routing::AsImpl *routing_get_current() { return current_routing; } /** Module management function: creates all internal data structures */ -void sg_platf_init(void) { +void sg_platf_init() { } /** Module management function: frees all internal data structures */ -void sg_platf_exit(void) { +void sg_platf_exit() { simgrid::surf::on_link.disconnect_all_slots(); simgrid::surf::on_cluster.disconnect_all_slots(); simgrid::surf::on_postparse.disconnect_all_slots(); @@ -110,21 +112,21 @@ void sg_platf_exit(void) { /** @brief Add an "host" to the current AS */ void sg_platf_new_host(sg_platf_host_cbarg_t host) { - xbt_assert(! sg_host_by_name(host->id), "Refusing to create a second host named '%s'.", host->id); + xbt_assert(sg_host_by_name(host->id) == nullptr, "Refusing to create a second host named '%s'.", host->id); - simgrid::surf::AsImpl* current_routing = routing_get_current(); - if (current_routing->hierarchy_ == simgrid::surf::AsImpl::RoutingMode::unset) - current_routing->hierarchy_ = simgrid::surf::AsImpl::RoutingMode::base; + simgrid::kernel::routing::AsImpl* current_routing = routing_get_current(); + if (current_routing->hierarchy_ == simgrid::kernel::routing::AsImpl::RoutingMode::unset) + current_routing->hierarchy_ = simgrid::kernel::routing::AsImpl::RoutingMode::base; - simgrid::surf::NetCard *netcard = - new simgrid::surf::NetCardImpl(host->id, simgrid::surf::NetCard::Type::Host, current_routing); + simgrid::kernel::routing::NetCard *netcard = + new simgrid::kernel::routing::NetCardImpl(host->id, simgrid::kernel::routing::NetCard::Type::Host, current_routing); sg_host_t h = simgrid::s4u::Host::by_name_or_create(host->id); h->pimpl_netcard = netcard; - if(mount_list){ + if(mount_list) { xbt_lib_set(storage_lib, host->id, ROUTING_STORAGE_HOST_LEVEL, (void *) mount_list); - mount_list = NULL; + mount_list = nullptr; } if (host->coord && strcmp(host->coord, "")) { @@ -136,7 +138,7 @@ void sg_platf_new_host(sg_platf_host_cbarg_t host) xbt_dynar_t ctn_str = xbt_str_split_str(host->coord, " "); xbt_assert(xbt_dynar_length(ctn_str)==3,"Coordinates of %s must have 3 dimensions", host->id); - xbt_dynar_t ctn = xbt_dynar_new(sizeof(double),NULL); + xbt_dynar_t ctn = xbt_dynar_new(sizeof(double),nullptr); xbt_dynar_foreach(ctn_str,cursor, str) { double val = xbt_str_parse_double(str, "Invalid coordinate: %s"); xbt_dynar_push(ctn,&val); @@ -146,7 +148,7 @@ void sg_platf_new_host(sg_platf_host_cbarg_t host) h->extension_set(COORD_HOST_LEVEL, (void *) ctn); } - simgrid::surf::Cpu *cpu = surf_cpu_model_pm->createCpu( h, host->speed_per_pstate, host->core_amount); + simgrid::surf::Cpu *cpu = surf_cpu_model_pm->createCpu( h, &host->speed_per_pstate, host->core_amount); if (host->state_trace) cpu->setStateTrace(host->state_trace); if (host->speed_trace) @@ -154,7 +156,7 @@ void sg_platf_new_host(sg_platf_host_cbarg_t host) surf_host_model->createHost(host->id, netcard, cpu)->attach(h); if (host->properties) { - xbt_dict_cursor_t cursor=NULL; + xbt_dict_cursor_t cursor=nullptr; char *key,*data; xbt_dict_foreach(host->properties,cursor,key,data) h->setProperty(key,data); @@ -173,17 +175,18 @@ void sg_platf_new_host(sg_platf_host_cbarg_t host) /** @brief Add a "router" to the network element list */ void sg_platf_new_router(sg_platf_router_cbarg_t router) { - simgrid::surf::AsImpl* current_routing = routing_get_current(); + using simgrid::kernel::routing::AsCluster; + simgrid::kernel::routing::AsImpl* current_routing = routing_get_current(); - if (current_routing->hierarchy_ == simgrid::surf::AsImpl::RoutingMode::unset) - current_routing->hierarchy_ = simgrid::surf::AsImpl::RoutingMode::base; + if (current_routing->hierarchy_ == simgrid::kernel::routing::AsImpl::RoutingMode::unset) + current_routing->hierarchy_ = simgrid::kernel::routing::AsImpl::RoutingMode::base; xbt_assert(nullptr == xbt_lib_get_or_null(as_router_lib, router->id, ROUTING_ASR_LEVEL), "Refusing to create a router named '%s': this name already describes a node.", router->id); - simgrid::surf::NetCard *netcard = - new simgrid::surf::NetCardImpl(router->id, simgrid::surf::NetCard::Type::Router, current_routing); - xbt_lib_set(as_router_lib, router->id, ROUTING_ASR_LEVEL, (void *) netcard); - XBT_DEBUG("Having set name '%s' id '%d'", router->id, netcard->id()); + simgrid::kernel::routing::NetCard* netcard = + new simgrid::kernel::routing::NetCardImpl(router->id, simgrid::kernel::routing::NetCard::Type::Router, current_routing); + xbt_lib_set(as_router_lib, router->id, ROUTING_ASR_LEVEL, netcard); + XBT_DEBUG("Router '%s' has the id %d", router->id, netcard->id()); if (router->coord && strcmp(router->coord, "")) { unsigned int cursor; @@ -193,7 +196,7 @@ void sg_platf_new_router(sg_platf_router_cbarg_t router) /* Pre-parse the host coordinates */ xbt_dynar_t ctn_str = xbt_str_split_str(router->coord, " "); xbt_assert(xbt_dynar_length(ctn_str)==3,"Coordinates of %s must have 3 dimensions", router->id); - xbt_dynar_t ctn = xbt_dynar_new(sizeof(double),NULL); + xbt_dynar_t ctn = xbt_dynar_new(sizeof(double),nullptr); xbt_dynar_foreach(ctn_str,cursor, str) { double val = xbt_str_parse_double(str, "Invalid coordinate: %s"); xbt_dynar_push(ctn,&val); @@ -203,6 +206,10 @@ void sg_platf_new_router(sg_platf_router_cbarg_t router) xbt_lib_set(as_router_lib, router->id, COORD_ASR_LEVEL, (void *) ctn); } + auto cluster = dynamic_cast(current_routing); + if(cluster != nullptr) + cluster->router_ = static_cast(xbt_lib_get_or_null(as_router_lib, router->id, ROUTING_ASR_LEVEL)); + if (TRACE_is_enabled() && TRACE_needs_platform()) sg_instr_new_router(router); } @@ -234,9 +241,10 @@ void sg_platf_new_link(sg_platf_link_cbarg_t link){ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) { - using simgrid::surf::AsCluster; - using simgrid::surf::AsClusterTorus; - using simgrid::surf::AsClusterFatTree; + using simgrid::kernel::routing::AsCluster; + using simgrid::kernel::routing::AsClusterDragonfly; + using simgrid::kernel::routing::AsClusterFatTree; + using simgrid::kernel::routing::AsClusterTorus; int rankId=0; @@ -249,6 +257,9 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) case SURF_CLUSTER_TORUS: AS.routing = A_surfxml_AS_routing_ClusterTorus; break; + case SURF_CLUSTER_DRAGONFLY: + AS.routing = A_surfxml_AS_routing_ClusterDragonfly; + break; case SURF_CLUSTER_FAT_TREE: AS.routing = A_surfxml_AS_routing_ClusterFatTree; break; @@ -257,17 +268,17 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) break; } sg_platf_new_AS_begin(&AS); - simgrid::surf::AsCluster *current_as = static_cast(routing_get_current()); + simgrid::kernel::routing::AsCluster *current_as = static_cast(routing_get_current()); current_as->parse_specific_arguments(cluster); if(cluster->loopback_bw!=0 || cluster->loopback_lat!=0){ - current_as->nb_links_per_node_++; - current_as->has_loopback_ = 1; + current_as->linkCountPerNode_++; + current_as->hasLoopback_ = 1; } if(cluster->limiter_link!=0){ - current_as->nb_links_per_node_++; - current_as->has_limiter_ = 1; + current_as->linkCountPerNode_++; + current_as->hasLimiter_ = 1; } std::vector *radicals = explodesRadical(cluster->radical); @@ -280,8 +291,8 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) s_sg_platf_host_cbarg_t host; memset(&host, 0, sizeof(host)); host.id = host_id; - if ((cluster->properties != NULL) && (!xbt_dict_is_empty(cluster->properties))) { - xbt_dict_cursor_t cursor=NULL; + if ((cluster->properties != nullptr) && (!xbt_dict_is_empty(cluster->properties))) { + xbt_dict_cursor_t cursor=nullptr; char *key,*data; host.properties = xbt_dict_new(); @@ -290,21 +301,19 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) } } - host.speed_per_pstate = xbt_dynar_new(sizeof(double), NULL); - xbt_dynar_push(host.speed_per_pstate,&cluster->speed); + host.speed_per_pstate.push_back(cluster->speed); host.pstate = 0; host.core_amount = cluster->core_amount; host.coord = ""; sg_platf_new_host(&host); - xbt_dynar_free(&host.speed_per_pstate); XBT_DEBUG(""); XBT_DEBUG("", link_id, cluster->bw, cluster->lat); - s_surf_parsing_link_up_down_t info_lim, info_loop; + s_surf_parsing_link_up_down_t info_lim; + s_surf_parsing_link_up_down_t info_loop; // All links are saved in a matrix; - // every row describes a single node; every node - // may have multiple links. + // every row describes a single node; every node may have multiple links. // the first column may store a link from x to x if p_has_loopback is set // the second column may store a limiter link if p_has_limiter is set // other columns are to store one or more link for the node @@ -312,7 +321,7 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) //add a loopback link if(cluster->loopback_bw!=0 || cluster->loopback_lat!=0){ char *tmp_link = bprintf("%s_loopback", link_id); - XBT_DEBUG("", tmp_link, cluster->limiter_link); + XBT_DEBUG("", tmp_link, cluster->loopback_bw); memset(&link, 0, sizeof(link)); link.id = tmp_link; @@ -320,10 +329,12 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) link.latency = cluster->loopback_lat; link.policy = SURF_LINK_FATPIPE; sg_platf_new_link(&link); - info_loop.link_up = info_loop.link_down = Link::byName(tmp_link); + info_loop.linkUp = Link::byName(tmp_link); + info_loop.linkDown = Link::byName(tmp_link); free(tmp_link); + auto as_cluster = static_cast(current_as); - xbt_dynar_set(as_cluster->privateLinks_, rankId*as_cluster->nb_links_per_node_, &info_loop); + as_cluster->privateLinks_.insert({rankId*as_cluster->linkCountPerNode_, info_loop}); } //add a limiter link (shared link to account for maximal bandwidth of the node) @@ -337,18 +348,19 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) link.latency = 0; link.policy = SURF_LINK_SHARED; sg_platf_new_link(&link); - info_lim.link_up = info_lim.link_down = Link::byName(tmp_link); + info_lim.linkUp = info_lim.linkDown = Link::byName(tmp_link); free(tmp_link); - xbt_dynar_set(current_as->privateLinks_, rankId * current_as->nb_links_per_node_ + current_as->has_loopback_ , &info_lim); + current_as->privateLinks_.insert( + {rankId * current_as->linkCountPerNode_ + current_as->hasLoopback_ , info_lim}); } //call the cluster function that adds the others links if (cluster->topology == SURF_CLUSTER_FAT_TREE) { - ((AsClusterFatTree*) current_as)->addProcessingNode(i); + static_cast(current_as)->addProcessingNode(i); } else { current_as->create_links_for_node(cluster, i, rankId, - rankId*current_as->nb_links_per_node_ + current_as->has_loopback_ + current_as->has_limiter_ ); + rankId*current_as->linkCountPerNode_ + current_as->hasLoopback_ + current_as->hasLimiter_ ); } xbt_free(link_id); xbt_free(host_id); @@ -360,14 +372,14 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) // and it's very useful to connect clusters together XBT_DEBUG(" "); XBT_DEBUG("", cluster->router_id); - char *newid = NULL; + char *newid = nullptr; s_sg_platf_router_cbarg_t router; memset(&router, 0, sizeof(router)); router.id = cluster->router_id; if (!router.id || !strcmp(router.id, "")) router.id = newid = bprintf("%s%s_router%s", cluster->prefix, cluster->id, cluster->suffix); sg_platf_new_router(&router); - current_as->router_ = (simgrid::surf::NetCard*) xbt_lib_get_or_null(as_router_lib, router.id, ROUTING_ASR_LEVEL); + current_as->router_ = (simgrid::kernel::routing::NetCard*) xbt_lib_get_or_null(as_router_lib, router.id, ROUTING_ASR_LEVEL); free(newid); //Make the backbone @@ -392,7 +404,7 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) simgrid::surf::on_cluster(cluster); } void routing_cluster_add_backbone(simgrid::surf::Link* bb) { - simgrid::surf::AsCluster *cluster = dynamic_cast(current_routing); + simgrid::kernel::routing::AsCluster *cluster = dynamic_cast(current_routing); xbt_assert(cluster, "Only hosts from Cluster can get a backbone."); xbt_assert(nullptr == cluster->backbone_, "Cluster %s already has a backbone link!", cluster->name()); @@ -412,10 +424,8 @@ void sg_platf_new_cabinet(sg_platf_cabinet_cbarg_t cabinet) host.pstate = 0; host.core_amount = 1; host.id = hostname; - host.speed_per_pstate = xbt_dynar_new(sizeof(double), NULL); - xbt_dynar_push(host.speed_per_pstate,&cabinet->speed); + host.speed_per_pstate.push_back(cabinet->speed); sg_platf_new_host(&host); - xbt_dynar_free(&host.speed_per_pstate); s_sg_platf_link_cbarg_t link; memset(&link, 0, sizeof(link)); @@ -560,86 +570,80 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) 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'; xbt_die("%s", msg->data); } - xbt_main_func_t parse_code = SIMIX_get_registered_function(process->function); - xbt_assert(parse_code, "Function '%s' unknown", process->function); + simgrid::simix::ActorCodeFactory& factory = SIMIX_get_actor_code_factory(process->function); + xbt_assert(factory, "Function '%s' unknown", process->function); double start_time = process->start_time; double kill_time = process->kill_time; int auto_restart = process->on_failure == SURF_PROCESS_ON_FAILURE_DIE ? 0 : 1; - std::function code = simgrid::simix::wrap_main(parse_code, process->argc, process->argv); + std::vector args(process->argv, process->argv + process->argc); + std::function code = factory(std::move(args)); - smx_process_arg_t arg = NULL; - smx_process_t process_created = NULL; + smx_process_arg_t arg = nullptr; + smx_actor_t process_created = nullptr; arg = new simgrid::simix::ProcessArg(); arg->name = std::string(process->argv[0]); arg->code = code; - arg->data = NULL; - arg->hostname = sg_host_get_name(host); + arg->data = nullptr; + 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 = new simgrid::simix::ProcessArg(); arg->name = std::string(process->argv[0]); arg->code = std::move(code); - arg->data = NULL; - arg->hostname = sg_host_get_name(host); + arg->data = nullptr; + 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); - SIMIX_timer_set(start_time, [](void* p) { - smx_process_arg_t arg = static_cast(p); + 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, - NULL); + nullptr); delete arg; - }, arg); + }); } else { // start_time <= SIMIX_get_clock() 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), NULL, - sg_host_get_name(host), kill_time, - current_property_set, auto_restart, NULL); - else - process_created = simcall_process_create( - arg->name.c_str(), std::move(code), NULL, 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) { return; } } - current_property_set = NULL; + current_property_set = nullptr; } void sg_platf_new_peer(sg_platf_peer_cbarg_t peer) { - using simgrid::surf::NetCard; - using simgrid::surf::AsCluster; + using simgrid::kernel::routing::NetCard; + using simgrid::kernel::routing::AsCluster; char *host_id = bprintf("peer_%s", peer->id); char *router_id = bprintf("router_%s", peer->id); @@ -657,14 +661,12 @@ void sg_platf_new_peer(sg_platf_peer_cbarg_t peer) memset(&host, 0, sizeof(host)); host.id = host_id; - host.speed_per_pstate = xbt_dynar_new(sizeof(double), NULL); - xbt_dynar_push(host.speed_per_pstate,&peer->speed); + host.speed_per_pstate.push_back(peer->speed); host.pstate = 0; host.speed_trace = peer->availability_trace; host.state_trace = peer->state_trace; host.core_amount = 1; sg_platf_new_host(&host); - xbt_dynar_free(&host.speed_per_pstate); s_sg_platf_link_cbarg_t link; memset(&link, 0, sizeof(link)); @@ -699,7 +701,6 @@ void sg_platf_new_peer(sg_platf_peer_cbarg_t peer) router.id = router_id; router.coord = peer->coord; sg_platf_new_router(&router); - static_cast(current_routing)->router_ = static_cast(xbt_lib_get_or_null(as_router_lib, router.id, ROUTING_ASR_LEVEL)); XBT_DEBUG(""); sg_platf_new_AS_seal(); @@ -722,10 +723,10 @@ static void surf_config_models_setup() const char *vm_model_name; int host_id = -1; int vm_id = -1; - char *network_model_name = NULL; - char *cpu_model_name = NULL; + char *network_model_name = nullptr; + char *cpu_model_name = nullptr; int storage_id = -1; - char *storage_model_name = NULL; + char *storage_model_name = nullptr; host_model_name = xbt_cfg_get_string("host/model"); vm_model_name = xbt_cfg_get_string("vm/model"); @@ -818,36 +819,56 @@ simgrid::s4u::As * sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) /* search the routing model */ - simgrid::surf::AsImpl *new_as = NULL; + simgrid::kernel::routing::AsImpl *new_as = nullptr; switch(AS->routing){ - case A_surfxml_AS_routing_Cluster: new_as = new simgrid::surf::AsCluster(AS->id); break; - case A_surfxml_AS_routing_ClusterTorus: new_as = new simgrid::surf::AsClusterTorus(AS->id); break; - case A_surfxml_AS_routing_ClusterFatTree: new_as = new simgrid::surf::AsClusterFatTree(AS->id); break; - case A_surfxml_AS_routing_Dijkstra: new_as = new simgrid::surf::AsDijkstra(AS->id, 0); break; - case A_surfxml_AS_routing_DijkstraCache: new_as = new simgrid::surf::AsDijkstra(AS->id, 1); break; - case A_surfxml_AS_routing_Floyd: new_as = new simgrid::surf::AsFloyd(AS->id); break; - case A_surfxml_AS_routing_Full: new_as = new simgrid::surf::AsFull(AS->id); break; - case A_surfxml_AS_routing_None: new_as = new simgrid::surf::AsNone(AS->id); break; - case A_surfxml_AS_routing_Vivaldi: new_as = new simgrid::surf::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 */ - simgrid::surf::NetCard *netcard = new simgrid::surf::NetCardImpl(new_as->name(), simgrid::surf::NetCard::Type::As, current_routing); + simgrid::kernel::routing::NetCard *netcard = new simgrid::kernel::routing::NetCardImpl(new_as->name(), simgrid::kernel::routing::NetCard::Type::As, current_routing); - if (current_routing == NULL && routing_platf->root_ == NULL) { /* it is the first one */ + if (current_routing == nullptr && routing_platf->root_ == nullptr) { /* it is the first one */ routing_platf->root_ = new_as; - } else if (current_routing != NULL && routing_platf->root_ != NULL) { + } 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::surf::AsImpl::RoutingMode::unset) - current_routing->hierarchy_ = simgrid::surf::AsImpl::RoutingMode::recursive; + if (current_routing->hierarchy_ == simgrid::kernel::routing::AsImpl::RoutingMode::unset) + current_routing->hierarchy_ = simgrid::kernel::routing::AsImpl::RoutingMode::recursive; /* add to the sons dictionary */ - xbt_dict_set(current_routing->children(), AS->id, (void *) new_as, NULL); + xbt_dict_set(current_routing->children(), AS->id, (void *) new_as, nullptr); } else { THROWF(arg_error, 0, "All defined components must belong to a AS"); } @@ -859,7 +880,7 @@ simgrid::s4u::As * sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) current_routing = new_as; current_routing->netcard_ = netcard; - simgrid::surf::asCreatedCallbacks(new_as); + simgrid::kernel::routing::asCreatedCallbacks(new_as); if (TRACE_is_enabled()) sg_instr_AS_begin(AS); @@ -876,7 +897,7 @@ void sg_platf_new_AS_seal() { xbt_assert(current_routing, "Cannot seal the current AS: none under construction"); current_routing->seal(); - current_routing = static_cast(current_routing->father()); + current_routing = static_cast(current_routing->father()); if (TRACE_is_enabled()) sg_instr_AS_end(); @@ -885,24 +906,23 @@ void sg_platf_new_AS_seal() /** @brief Add a link connecting an host to the rest of its AS (which must be cluster or vivaldi) */ void sg_platf_new_hostlink(sg_platf_host_link_cbarg_t hostlink) { - simgrid::surf::NetCard *netcard = sg_host_by_name(hostlink->id)->pimpl_netcard; + simgrid::kernel::routing::NetCard *netcard = sg_host_by_name(hostlink->id)->pimpl_netcard; xbt_assert(netcard, "Host '%s' not found!", hostlink->id); - xbt_assert(dynamic_cast(current_routing), + xbt_assert(dynamic_cast(current_routing), "Only hosts from Cluster and Vivaldi ASes can get an host_link."); s_surf_parsing_link_up_down_t link_up_down; - link_up_down.link_up = Link::byName(hostlink->link_up); - link_up_down.link_down = Link::byName(hostlink->link_down); + link_up_down.linkUp = Link::byName(hostlink->link_up); + link_up_down.linkDown = Link::byName(hostlink->link_down); + + xbt_assert(link_up_down.linkUp, "Link '%s' not found!",hostlink->link_up); + xbt_assert(link_up_down.linkDown, "Link '%s' not found!",hostlink->link_down); - xbt_assert(link_up_down.link_up, "Link '%s' not found!",hostlink->link_up); - xbt_assert(link_up_down.link_down, "Link '%s' not found!",hostlink->link_down); + auto as_cluster = static_cast(current_routing); - // If dynar is is greater than netcard id and if the host_link is already defined - auto as_cluster = static_cast(current_routing); - if((int)xbt_dynar_length(as_cluster->privateLinks_) > netcard->id() && - xbt_dynar_get_as(as_cluster->privateLinks_, netcard->id(), void*)) - surf_parse_error("Host_link for '%s' is already defined!",hostlink->id); + if (as_cluster->privateLinks_.find(netcard->id()) != as_cluster->privateLinks_.end()) + surf_parse_error("Host_link for '%s' is already defined!",hostlink->id); XBT_DEBUG("Push Host_link for host '%s' to position %d", netcard->name(), netcard->id()); - xbt_dynar_set_as(as_cluster->privateLinks_, netcard->id(), s_surf_parsing_link_up_down_t, link_up_down); + as_cluster->privateLinks_.insert({netcard->id(), link_up_down}); }