X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bf2a602daa0066ff05021f0ddfa55cffd55b6171..7d27e3c81e8c611946aaea9de4edc2714b40be8a:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 5bfa669fe3..a6627a2738 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -14,25 +14,28 @@ #include "src/surf/HostImpl.hpp" #include "surf/surf.h" +#include "simgrid/s4u/engine.hpp" +#include "src/kernel/EngineImpl.hpp" #include "src/simix/smx_private.h" #include "src/include/simgrid/sg_config.h" #include "src/surf/xml/platf_private.hpp" +#include "src/surf/HostImpl.hpp" #include "src/surf/cpu_interface.hpp" #include "src/surf/network_interface.hpp" -#include "surf/surf_routing.h" // FIXME: brain dead public header -#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/AsClusterFatTree.hpp" +#include "src/kernel/routing/AsClusterTorus.hpp" #include "src/kernel/routing/AsDijkstra.hpp" #include "src/kernel/routing/AsFloyd.hpp" #include "src/kernel/routing/AsFull.hpp" +#include "src/kernel/routing/AsImpl.hpp" #include "src/kernel/routing/AsNone.hpp" #include "src/kernel/routing/AsVivaldi.hpp" +#include "src/kernel/routing/NetCard.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse); @@ -50,43 +53,6 @@ simgrid::xbt::signal on_postparse; static int surf_parse_models_setup_already_called = 0; -/* Turn something like "1-4,6,9-11" into the vector {1,2,3,4,6,9,10,11} */ -static std::vector *explodesRadical(const char*radicals){ - std::vector *exploded = new std::vector(); - char *groups; - unsigned int iter; - - //Make all hosts - xbt_dynar_t radical_elements = xbt_str_split(radicals, ","); - xbt_dynar_foreach(radical_elements, iter, groups) { - - xbt_dynar_t radical_ends = xbt_str_split(groups, "-"); - int start = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char *)); - int end=0; - - switch (xbt_dynar_length(radical_ends)) { - case 1: - end = start; - break; - case 2: - end = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 1, char *)); - break; - default: - surf_parse_error("Malformed radical: %s", groups); - break; - } - - for (int i = start; i <= end; i++) - exploded->push_back( i ); - - xbt_dynar_free(&radical_ends); - } - xbt_dynar_free(&radical_elements); - - return exploded; -} - - /** The current AS in the parsing */ static simgrid::kernel::routing::AsImpl *current_routing = nullptr; static simgrid::kernel::routing::AsImpl *routing_get_current() @@ -109,73 +75,42 @@ void sg_platf_exit() { surf_parse_lex_destroy(); } -/** @brief Add an "host" to the current AS */ -void sg_platf_new_host(sg_platf_host_cbarg_t host) +/** @brief Add an host to the current AS */ +void sg_platf_new_host(sg_platf_host_cbarg_t args) { - xbt_assert(sg_host_by_name(host->id) == nullptr, "Refusing to create a second host named '%s'.", host->id); + simgrid::s4u::Host* host = routing_get_current()->createHost(args->id, &args->speed_per_pstate, args->core_amount); - 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; + new simgrid::surf::HostImpl(host, mount_list); + xbt_lib_set(storage_lib, args->id, ROUTING_STORAGE_HOST_LEVEL, static_cast(mount_list)); + mount_list = nullptr; - 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) { - xbt_lib_set(storage_lib, host->id, ROUTING_STORAGE_HOST_LEVEL, (void *) mount_list); - mount_list = nullptr; - } - - if (host->coord && strcmp(host->coord, "")) { - unsigned int cursor; - char*str; - - xbt_assert(COORD_HOST_LEVEL, "To use host coordinates, please add --cfg=network/coordinates:yes to your command line"); - /* Pre-parse the host coordinates -- FIXME factorize with routers by overloading the routing->parse_PU function*/ - 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),nullptr); - xbt_dynar_foreach(ctn_str,cursor, str) { - double val = xbt_str_parse_double(str, "Invalid coordinate: %s"); - xbt_dynar_push(ctn,&val); - } - xbt_dynar_free(&ctn_str); - xbt_dynar_shrink(ctn, 0); - 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); - if (host->state_trace) - cpu->setStateTrace(host->state_trace); - if (host->speed_trace) - cpu->setSpeedTrace(host->speed_trace); - surf_host_model->createHost(host->id, netcard, cpu)->attach(h); - - if (host->properties) { + if (args->properties) { xbt_dict_cursor_t cursor=nullptr; char *key,*data; - xbt_dict_foreach(host->properties,cursor,key,data) - h->setProperty(key,data); - xbt_dict_free(&host->properties); + xbt_dict_foreach (args->properties, cursor, key, data) + host->setProperty(key, data); + xbt_dict_free(&args->properties); } - if (host->pstate != 0) - cpu->setPState(host->pstate); + /* Change from the defaults */ + if (args->state_trace) + host->pimpl_cpu->setStateTrace(args->state_trace); + if (args->speed_trace) + host->pimpl_cpu->setSpeedTrace(args->speed_trace); + if (args->pstate != 0) + host->pimpl_cpu->setPState(args->pstate); + if (args->coord && strcmp(args->coord, "")) + new simgrid::kernel::routing::vivaldi::Coords(host->pimpl_netcard, args->coord); - simgrid::s4u::Host::onCreation(*h); + simgrid::s4u::Host::onCreation(*host); if (TRACE_is_enabled() && TRACE_needs_platform()) - sg_instr_new_host(host); + sg_instr_new_host(*host); } /** @brief Add a "router" to the network element list */ void sg_platf_new_router(sg_platf_router_cbarg_t router) { - using simgrid::kernel::routing::AsCluster; simgrid::kernel::routing::AsImpl* current_routing = routing_get_current(); if (current_routing->hierarchy_ == simgrid::kernel::routing::AsImpl::RoutingMode::unset) @@ -184,29 +119,14 @@ void sg_platf_new_router(sg_platf_router_cbarg_t router) "Refusing to create a router named '%s': this name already describes a node.", router->id); simgrid::kernel::routing::NetCard* netcard = - new simgrid::kernel::routing::NetCardImpl(router->id, simgrid::kernel::routing::NetCard::Type::Router, current_routing); + new simgrid::kernel::routing::NetCard(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; - char*str; - - xbt_assert(COORD_ASR_LEVEL, "To use host coordinates, please add --cfg=network/coordinates:yes to your command line"); - /* 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),nullptr); - xbt_dynar_foreach(ctn_str,cursor, str) { - double val = xbt_str_parse_double(str, "Invalid coordinate: %s"); - xbt_dynar_push(ctn,&val); - } - xbt_dynar_free(&ctn_str); - xbt_dynar_shrink(ctn, 0); - xbt_lib_set(as_router_lib, router->id, COORD_ASR_LEVEL, (void *) ctn); - } + if (router->coord && strcmp(router->coord, "")) + new simgrid::kernel::routing::vivaldi::Coords(netcard, router->coord); - auto cluster = dynamic_cast(current_routing); + 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)); @@ -224,7 +144,15 @@ void sg_platf_new_link(sg_platf_link_cbarg_t link){ names.push_back(xbt_strdup(link->id)); } for (auto link_name : names) { - Link *l = surf_network_model->createLink(link_name, link->bandwidth, link->latency, link->policy, link->properties); + Link* l = surf_network_model->createLink(link_name, link->bandwidth, link->latency, link->policy); + + if (link->properties) { + xbt_dict_cursor_t cursor = nullptr; + char *key, *data; + xbt_dict_foreach (link->properties, cursor, key, data) + l->setProperty(key, data); + xbt_dict_free(&link->properties); + } if (link->latency_trace) l->setLatencyTrace(link->latency_trace); @@ -281,8 +209,7 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) current_as->hasLimiter_ = 1; } - std::vector *radicals = explodesRadical(cluster->radical); - for (int i : *radicals) { + for (int i : *cluster->radicals) { char * host_id = bprintf("%s%d%s", cluster->prefix, i, cluster->suffix); char * link_id = bprintf("%s_link_%d", cluster->id, i); @@ -294,10 +221,10 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) if ((cluster->properties != nullptr) && (!xbt_dict_is_empty(cluster->properties))) { xbt_dict_cursor_t cursor=nullptr; char *key,*data; - host.properties = xbt_dict_new(); + host.properties = xbt_dict_new_homogeneous(free); xbt_dict_foreach(cluster->properties,cursor,key,data) { - xbt_dict_set(host.properties, key, xbt_strdup(data),free); + xbt_dict_set(host.properties, key, xbt_strdup(data), nullptr); } } @@ -366,7 +293,6 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) xbt_free(host_id); rankId++; } - delete radicals; // Add a router. It is magically used thanks to the way in which surf_routing_cluster is written, // and it's very useful to connect clusters together @@ -402,6 +328,7 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) sg_platf_new_AS_seal(); simgrid::surf::on_cluster(cluster); + delete cluster->radicals; } void routing_cluster_add_backbone(simgrid::surf::Link* bb) { simgrid::kernel::routing::AsCluster *cluster = dynamic_cast(current_routing); @@ -415,9 +342,7 @@ void routing_cluster_add_backbone(simgrid::surf::Link* bb) { void sg_platf_new_cabinet(sg_platf_cabinet_cbarg_t cabinet) { - std::vector *radicals = explodesRadical(cabinet->radical); - - for (int radical : *radicals) { + for (int radical : *cabinet->radicals) { char *hostname = bprintf("%s%d%s", cabinet->prefix, radical, cabinet->suffix); s_sg_platf_host_cbarg_t host; memset(&host, 0, sizeof(host)); @@ -447,7 +372,7 @@ void sg_platf_new_cabinet(sg_platf_cabinet_cbarg_t cabinet) free(hostname); } - delete(radicals); + delete cabinet->radicals; } void sg_platf_new_storage(sg_platf_storage_cbarg_t storage) @@ -484,12 +409,16 @@ void sg_platf_new_storage(sg_platf_storage_cbarg_t storage) storage->content_type, storage->properties); - surf_storage_model->createStorage(storage->id, - ((storage_type_t) stype)->type_id, - storage->content, - storage->content_type, - storage->properties, - storage->attach); + auto s = surf_storage_model->createStorage(storage->id, ((storage_type_t)stype)->type_id, storage->content, + storage->content_type, storage->attach); + + if (storage->properties) { + xbt_dict_cursor_t cursor = nullptr; + char *key, *data; + xbt_dict_foreach (storage->properties, cursor, key, data) + s->setProperty(key, data); + xbt_dict_free(&storage->properties); + } } void sg_platf_new_storage_type(sg_platf_storage_type_cbarg_t storage_type){ @@ -570,6 +499,7 @@ 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'; @@ -592,13 +522,11 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) 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()) { @@ -606,18 +534,18 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) 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, @@ -625,12 +553,11 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) delete arg; }); } else { // start_time <= SIMIX_get_clock() - XBT_DEBUG("Starting Process %s(%s) right now", - arg->name.c_str(), sg_host_get_name(host)); + XBT_DEBUG("Starting Process %s(%s) right now", arg->name.c_str(), host->cname()); process_created = simix_global->create_process_function( arg->name.c_str(), std::move(code), nullptr, - sg_host_get_name(host), kill_time, + 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) */ @@ -643,72 +570,22 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) void sg_platf_new_peer(sg_platf_peer_cbarg_t peer) { - 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); - - XBT_DEBUG(" "); - - XBT_DEBUG("", peer->id); - s_sg_platf_AS_cbarg_t AS; - AS.id = peer->id; - AS.routing = A_surfxml_AS_routing_Cluster; - sg_platf_new_AS_begin(&AS); - - XBT_DEBUG("", host_id, peer->speed); - s_sg_platf_host_cbarg_t host; - memset(&host, 0, sizeof(host)); - host.id = host_id; - - 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); - - s_sg_platf_link_cbarg_t link; - memset(&link, 0, sizeof(link)); - link.policy = SURF_LINK_SHARED; - link.latency = peer->lat; - - char* link_up = bprintf("link_%s_UP",peer->id); - XBT_DEBUG("", link_up, peer->bw_out, peer->lat); - link.id = link_up; - link.bandwidth = peer->bw_out; - sg_platf_new_link(&link); - - char* link_down = bprintf("link_%s_DOWN",peer->id); - XBT_DEBUG("", link_down, peer->bw_in, peer->lat); - link.id = link_down; - link.bandwidth = peer->bw_in; - sg_platf_new_link(&link); - - XBT_DEBUG("", host_id,link_up,link_down); - s_sg_platf_host_link_cbarg_t host_link; - memset(&host_link, 0, sizeof(host_link)); - host_link.id = host_id; - host_link.link_up = link_up; - host_link.link_down = link_down; - sg_platf_new_hostlink(&host_link); - free(link_up); - free(link_down); - - XBT_DEBUG("", router_id); - s_sg_platf_router_cbarg_t router; - memset(&router, 0, sizeof(router)); - router.id = router_id; - router.coord = peer->coord; - sg_platf_new_router(&router); - - XBT_DEBUG(""); - sg_platf_new_AS_seal(); - XBT_DEBUG(" "); - - free(router_id); - free(host_id); + using simgrid::kernel::routing::AsVivaldi; + + AsVivaldi* as = dynamic_cast(current_routing); + xbt_assert(as, " tag can only be used in Vivaldi ASes"); + + std::vector speedPerPstate; + speedPerPstate.push_back(peer->speed); + simgrid::s4u::Host* host = as->createHost(peer->id, &speedPerPstate, 1); + as->setPeerLink(host->pimpl_netcard, peer->bw_in, peer->bw_out, peer->lat, peer->coord); + simgrid::s4u::Host::onCreation(*host); + + /* Change from the defaults */ + if (peer->state_trace) + host->pimpl_cpu->setStateTrace(peer->state_trace); + if (peer->speed_trace) + host->pimpl_cpu->setSpeedTrace(peer->speed_trace); } void sg_platf_begin() { /* Do nothing: just for symmetry of user code */ } @@ -720,74 +597,44 @@ void sg_platf_end() { /* Pick the right models for CPU, net and host, and call their model_init_preparse */ static void surf_config_models_setup() { - const char *host_model_name; - const char *vm_model_name; - int host_id = -1; - int vm_id = -1; - char *network_model_name = nullptr; - char *cpu_model_name = nullptr; - int storage_id = -1; - char *storage_model_name = nullptr; - - host_model_name = xbt_cfg_get_string("host/model"); - vm_model_name = xbt_cfg_get_string("vm/model"); - network_model_name = xbt_cfg_get_string("network/model"); - cpu_model_name = xbt_cfg_get_string("cpu/model"); - storage_model_name = xbt_cfg_get_string("storage/model"); - - /* Check whether we use a net/cpu model differing from the default ones, in which case - * we should switch to the "compound" host model to correctly dispatch stuff to - * the right net/cpu models. - */ - - if ((!xbt_cfg_is_default_value("network/model") || - !xbt_cfg_is_default_value("cpu/model")) && + const char* host_model_name = xbt_cfg_get_string("host/model"); + const char* network_model_name = xbt_cfg_get_string("network/model"); + const char* cpu_model_name = xbt_cfg_get_string("cpu/model"); + const char* storage_model_name = xbt_cfg_get_string("storage/model"); + + /* The compound host model is needed when using non-default net/cpu models */ + if ((!xbt_cfg_is_default_value("network/model") || !xbt_cfg_is_default_value("cpu/model")) && xbt_cfg_is_default_value("host/model")) { host_model_name = "compound"; xbt_cfg_set_string("host/model", host_model_name); } XBT_DEBUG("host model: %s", host_model_name); - host_id = find_model_description(surf_host_model_description, host_model_name); if (!strcmp(host_model_name, "compound")) { - int network_id = -1; - int cpu_id = -1; + xbt_assert(cpu_model_name, "Set a cpu model to use with the 'compound' host model"); + xbt_assert(network_model_name, "Set a network model to use with the 'compound' host model"); - xbt_assert(cpu_model_name, - "Set a cpu model to use with the 'compound' host model"); + int cpu_id = find_model_description(surf_cpu_model_description, cpu_model_name); + surf_cpu_model_description[cpu_id].model_init_preparse(); - xbt_assert(network_model_name, - "Set a network model to use with the 'compound' host model"); - - if(surf_cpu_model_init_preparse){ - surf_cpu_model_init_preparse(); - } else { - cpu_id = - find_model_description(surf_cpu_model_description, cpu_model_name); - surf_cpu_model_description[cpu_id].model_init_preparse(); - } - - network_id = - find_model_description(surf_network_model_description, - network_model_name); + int network_id = find_model_description(surf_network_model_description, network_model_name); surf_network_model_description[network_id].model_init_preparse(); } XBT_DEBUG("Call host_model_init"); + int host_id = find_model_description(surf_host_model_description, host_model_name); surf_host_model_description[host_id].model_init_preparse(); XBT_DEBUG("Call vm_model_init"); - vm_id = find_model_description(surf_vm_model_description, vm_model_name); - surf_vm_model_description[vm_id].model_init_preparse(); + surf_vm_model_init_HL13(); XBT_DEBUG("Call storage_model_init"); - storage_id = find_model_description(surf_storage_model_description, storage_model_name); + int storage_id = find_model_description(surf_storage_model_description, storage_model_name); surf_storage_model_description[storage_id].model_init_preparse(); - } /** - * \brief Make a new routing component to the platform + * \brief Add an AS to the platform * * Add a new autonomous system to the platform. Any elements (such as host, * router or sub-AS) added after this call and before the corresponding call @@ -812,9 +659,6 @@ simgrid::s4u::As * sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) surf_config_models_setup(); } - xbt_assert(nullptr == xbt_lib_get_or_null(as_router_lib, AS->id, ROUTING_ASR_LEVEL), - "Refusing to create a second AS called \"%s\".", AS->id); - _sg_cfg_init_status = 2; /* HACK: direct access to the global controlling the level of configuration to prevent * any further config now that we created some real content */ @@ -822,47 +666,57 @@ simgrid::s4u::As * sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) /* 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 */ - simgrid::kernel::routing::NetCard *netcard = new simgrid::kernel::routing::NetCardImpl(new_as->name(), simgrid::kernel::routing::NetCard::Type::As, current_routing); - - if (current_routing == nullptr && routing_platf->root_ == nullptr) { /* it is the first one */ - routing_platf->root_ = new_as; - } else if (current_routing != nullptr && routing_platf->root_ != nullptr) { + if (current_routing == nullptr) { /* it is the first one */ + xbt_assert(simgrid::s4u::Engine::instance()->pimpl->rootAs_ == nullptr, + "All defined components must belong to a AS"); + simgrid::s4u::Engine::instance()->pimpl->rootAs_ = new_as; - 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; + } else { /* set the father behavior */ 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, nullptr); - } else { - THROWF(arg_error, 0, "All defined components must belong to a AS"); } - xbt_lib_set(as_router_lib, netcard->name(), ROUTING_ASR_LEVEL, (void *) netcard); - XBT_DEBUG("Having set name '%s' id '%d'", new_as->name(), netcard->id()); - /* set the new current component of the tree */ current_routing = new_as; - current_routing->netcard_ = netcard; - simgrid::kernel::routing::asCreatedCallbacks(new_as); if (TRACE_is_enabled()) sg_instr_AS_begin(AS); @@ -905,6 +759,6 @@ void sg_platf_new_hostlink(sg_platf_host_link_cbarg_t hostlink) 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_DEBUG("Push Host_link for host '%s' to position %d", netcard->name().c_str(), netcard->id()); as_cluster->privateLinks_.insert({netcard->id(), link_up_down}); }