X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bfd98a2964b17caa9ed2f331432cbf9a641c2d2a..2e490cd7e982eb004e8fd7f1c37b1f8154edf01a:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index ef4864e0ae..97ce0b11fd 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -3,7 +3,8 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "simgrid/s4u/engine.hpp" +#include "simgrid/s4u/Engine.hpp" +#include "simgrid/s4u/Storage.hpp" #include "src/kernel/EngineImpl.hpp" #include "src/simix/smx_private.h" @@ -28,13 +29,13 @@ #include XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse); -XBT_PRIVATE std::vector mount_list; +XBT_PRIVATE std::map mount_list; +XBT_PRIVATE std::vector known_storages; namespace simgrid { namespace surf { -simgrid::xbt::signal on_cluster; - +simgrid::xbt::signal on_cluster; } } @@ -46,6 +47,7 @@ extern std::map host_list; } static int surf_parse_models_setup_already_called = 0; +std::map storage_types; /** The current AS in the parsing */ static simgrid::kernel::routing::NetZoneImpl* current_routing = nullptr; @@ -72,14 +74,11 @@ void sg_platf_exit() { /** @brief Add an host to the current AS */ void sg_platf_new_host(sg_platf_host_cbarg_t args) { - std::unordered_map props; + std::map props; if (args->properties) { - xbt_dict_cursor_t cursor=nullptr; - char *key; - char* data; - xbt_dict_foreach (args->properties, cursor, key, data) - props[key] = data; - xbt_dict_free(&args->properties); + for (auto const& elm : *args->properties) + props.insert({elm.first, elm.second}); + delete args->properties; } simgrid::s4u::Host* host = @@ -97,29 +96,25 @@ void sg_platf_new_host(sg_platf_host_cbarg_t args) host->pimpl_cpu->setPState(args->pstate); if (args->coord && strcmp(args->coord, "")) new simgrid::kernel::routing::vivaldi::Coords(host->pimpl_netpoint, args->coord); - - if (TRACE_is_enabled() && TRACE_needs_platform()) - sg_instr_new_host(*host); } /** @brief Add a "router" to the network element list */ -simgrid::kernel::routing::NetPoint* sg_platf_new_router(const char* name, const char* coords) +simgrid::kernel::routing::NetPoint* sg_platf_new_router(std::string name, const char* coords) { simgrid::kernel::routing::NetZoneImpl* current_routing = routing_get_current(); if (current_routing->hierarchy_ == simgrid::kernel::routing::NetZoneImpl::RoutingMode::unset) current_routing->hierarchy_ = simgrid::kernel::routing::NetZoneImpl::RoutingMode::base; - xbt_assert(nullptr == simgrid::s4u::Engine::instance()->netpointByNameOrNull(name), - "Refusing to create a router named '%s': this name already describes a node.", name); + xbt_assert(nullptr == simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(name), + "Refusing to create a router named '%s': this name already describes a node.", name.c_str()); simgrid::kernel::routing::NetPoint* netpoint = new simgrid::kernel::routing::NetPoint(name, simgrid::kernel::routing::NetPoint::Type::Router, current_routing); - XBT_DEBUG("Router '%s' has the id %d", name, netpoint->id()); + XBT_DEBUG("Router '%s' has the id %u", name.c_str(), netpoint->id()); if (coords && strcmp(coords, "")) new simgrid::kernel::routing::vivaldi::Coords(netpoint, coords); - sg_instr_new_router(name); return netpoint; } @@ -134,17 +129,13 @@ void sg_platf_new_link(LinkCreationArgs* link) } else { names.push_back(link->id); } - for (auto link_name : names) { + for (auto const& link_name : names) { simgrid::surf::LinkImpl* l = surf_network_model->createLink(link_name.c_str(), link->bandwidth, link->latency, link->policy); if (link->properties) { - xbt_dict_cursor_t cursor = nullptr; - char* key; - char* data; - xbt_dict_foreach (link->properties, cursor, key, data) - l->setProperty(key, data); - xbt_dict_free(&link->properties); + for (auto const& elm : *link->properties) + l->setProperty(elm.first, elm.second); } if (link->latency_trace) @@ -154,9 +145,10 @@ void sg_platf_new_link(LinkCreationArgs* link) if (link->state_trace) l->setStateTrace(link->state_trace); } + delete link->properties; } -void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) +void sg_platf_new_cluster(ClusterCreationArgs* cluster) { using simgrid::kernel::routing::ClusterZone; using simgrid::kernel::routing::DragonflyZone; @@ -166,23 +158,23 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) int rankId=0; // What an inventive way of initializing the AS that I have as ancestor :-( - s_sg_platf_AS_cbarg_t AS; - AS.id = cluster->id; + ZoneCreationArgs zone; + zone.id = cluster->id; switch (cluster->topology) { case SURF_CLUSTER_TORUS: - AS.routing = A_surfxml_AS_routing_ClusterTorus; + zone.routing = A_surfxml_AS_routing_ClusterTorus; break; case SURF_CLUSTER_DRAGONFLY: - AS.routing = A_surfxml_AS_routing_ClusterDragonfly; + zone.routing = A_surfxml_AS_routing_ClusterDragonfly; break; case SURF_CLUSTER_FAT_TREE: - AS.routing = A_surfxml_AS_routing_ClusterFatTree; + zone.routing = A_surfxml_AS_routing_ClusterFatTree; break; default: - AS.routing = A_surfxml_AS_routing_Cluster; + zone.routing = A_surfxml_AS_routing_Cluster; break; } - sg_platf_new_AS_begin(&AS); + sg_platf_new_Zone_begin(&zone); simgrid::kernel::routing::ClusterZone* current_as = static_cast(routing_get_current()); current_as->parse_specific_arguments(cluster); @@ -196,24 +188,20 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) current_as->hasLimiter_ = 1; } - 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); + for (int const& i : *cluster->radicals) { + std::string host_id = std::string(cluster->prefix) + std::to_string(i) + cluster->suffix; + std::string link_id = std::string(cluster->id) + "_link_" + std::to_string(i); - XBT_DEBUG("", host_id, cluster->speeds.front()); + XBT_DEBUG("", host_id.c_str(), cluster->speeds.front()); s_sg_platf_host_cbarg_t host; memset(&host, 0, sizeof(host)); - host.id = host_id; - if ((cluster->properties != nullptr) && (!xbt_dict_is_empty(cluster->properties))) { - xbt_dict_cursor_t cursor=nullptr; - char *key; - char* data; - host.properties = xbt_dict_new_homogeneous(free); - - xbt_dict_foreach(cluster->properties,cursor,key,data) { - xbt_dict_set(host.properties, key, xbt_strdup(data), nullptr); - } + host.id = host_id.c_str(); + if ((cluster->properties != nullptr) && (not cluster->properties->empty())) { + host.properties = new std::map; + + for (auto const& elm : *cluster->properties) + host.properties->insert({elm.first, elm.second}); } host.speed_per_pstate = cluster->speeds; @@ -223,7 +211,7 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) sg_platf_new_host(&host); XBT_DEBUG(""); - XBT_DEBUG("", link_id, cluster->bw, cluster->lat); + XBT_DEBUG("", link_id.c_str(), cluster->bw, cluster->lat); // All links are saved in a matrix; // every row describes a single node; every node may have multiple links. @@ -235,8 +223,8 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) simgrid::surf::LinkImpl* linkUp = nullptr; simgrid::surf::LinkImpl* linkDown = nullptr; if(cluster->loopback_bw > 0 || cluster->loopback_lat > 0){ - char *tmp_link = bprintf("%s_loopback", link_id); - XBT_DEBUG("", tmp_link, cluster->loopback_bw); + std::string tmp_link = link_id + "_loopback"; + XBT_DEBUG("", tmp_link.c_str(), cluster->loopback_bw); LinkCreationArgs link; link.id = tmp_link; @@ -246,7 +234,6 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) sg_platf_new_link(&link); linkUp = simgrid::surf::LinkImpl::byName(tmp_link); linkDown = simgrid::surf::LinkImpl::byName(tmp_link); - free(tmp_link); auto as_cluster = static_cast(current_as); as_cluster->privateLinks_.insert({rankId * as_cluster->linkCountPerNode_, {linkUp, linkDown}}); @@ -256,18 +243,17 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) linkUp = nullptr; linkDown = nullptr; if(cluster->limiter_link > 0){ - char *tmp_link = bprintf("%s_limiter", link_id); - XBT_DEBUG("", tmp_link, cluster->limiter_link); + std::string tmp_link = std::string(link_id) + "_limiter"; + XBT_DEBUG("", tmp_link.c_str(), cluster->limiter_link); LinkCreationArgs link; - link.id = tmp_link; + link.id = tmp_link; link.bandwidth = cluster->limiter_link; link.latency = 0; link.policy = SURF_LINK_SHARED; sg_platf_new_link(&link); linkDown = simgrid::surf::LinkImpl::byName(tmp_link); linkUp = linkDown; - free(tmp_link); current_as->privateLinks_.insert( {rankId * current_as->linkCountPerNode_ + current_as->hasLoopback_, {linkUp, linkDown}}); } @@ -279,19 +265,16 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) current_as->create_links_for_node(cluster, i, rankId, rankId*current_as->linkCountPerNode_ + current_as->hasLoopback_ + current_as->hasLimiter_ ); } - xbt_free(link_id); - xbt_free(host_id); rankId++; } - xbt_dict_free(&cluster->properties); + delete cluster->properties; // Add a router. XBT_DEBUG(" "); - XBT_DEBUG("", cluster->router_id); - if (!cluster->router_id || !strcmp(cluster->router_id, "")) { - char* newid = bprintf("%s%s_router%s", cluster->prefix, cluster->id, cluster->suffix); + XBT_DEBUG("", cluster->router_id.c_str()); + if (cluster->router_id.empty()) { + std::string newid = std::string(cluster->prefix) + cluster->id + "_router" + cluster->suffix; current_as->router_ = sg_platf_new_router(newid, NULL); - free(newid); } else { current_as->router_ = sg_platf_new_router(cluster->router_id, NULL); } @@ -308,11 +291,11 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) XBT_DEBUG("", link.id.c_str(), cluster->bb_bw, cluster->bb_lat); sg_platf_new_link(&link); - routing_cluster_add_backbone(simgrid::surf::LinkImpl::byName(link.id.c_str())); + routing_cluster_add_backbone(simgrid::surf::LinkImpl::byName(link.id)); } XBT_DEBUG(""); - sg_platf_new_AS_seal(); + sg_platf_new_Zone_seal(); simgrid::surf::on_cluster(cluster); delete cluster->radicals; @@ -324,16 +307,16 @@ void routing_cluster_add_backbone(simgrid::surf::LinkImpl* bb) 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()); + xbt_assert(nullptr == cluster->backbone_, "Cluster %s already has a backbone link!", cluster->getCname()); cluster->backbone_ = bb; - XBT_DEBUG("Add a backbone to AS '%s'", current_routing->name()); + XBT_DEBUG("Add a backbone to AS '%s'", current_routing->getCname()); } -void sg_platf_new_cabinet(sg_platf_cabinet_cbarg_t cabinet) +void sg_platf_new_cabinet(CabinetCreationArgs* cabinet) { - for (int radical : *cabinet->radicals) { - std::string hostname = std::string(cabinet->prefix) + std::to_string(radical) + std::string(cabinet->suffix); + for (int const& radical : *cabinet->radicals) { + std::string hostname = cabinet->prefix + std::to_string(radical) + cabinet->suffix; s_sg_platf_host_cbarg_t host; memset(&host, 0, sizeof(host)); host.pstate = 0; @@ -349,97 +332,80 @@ void sg_platf_new_cabinet(sg_platf_cabinet_cbarg_t cabinet) link.id = "link_" + hostname; sg_platf_new_link(&link); - s_sg_platf_host_link_cbarg_t host_link; - memset(&host_link, 0, sizeof(host_link)); - host_link.id = hostname.c_str(); - host_link.link_up = bprintf("link_%s_UP",hostname.c_str()); - host_link.link_down = bprintf("link_%s_DOWN",hostname.c_str()); + HostLinkCreationArgs host_link; + host_link.id = hostname; + host_link.link_up = std::string("link_") + hostname + "_UP"; + host_link.link_down = std::string("link_") + hostname + "_DOWN"; sg_platf_new_hostlink(&host_link); - free((char*)host_link.link_up); - free((char*)host_link.link_down); } delete cabinet->radicals; } -void sg_platf_new_storage(sg_platf_storage_cbarg_t storage) +void sg_platf_new_storage(StorageCreationArgs* storage) { - xbt_assert(!xbt_lib_get_or_null(storage_lib, storage->id,ROUTING_STORAGE_LEVEL), - "Refusing to add a second storage named \"%s\"", storage->id); + xbt_assert(std::find(known_storages.begin(), known_storages.end(), storage->id) == known_storages.end(), + "Refusing to add a second storage named \"%s\"", storage->id.c_str()); - void* stype = xbt_lib_get_or_null(storage_type_lib, storage->type_id,ROUTING_STORAGE_TYPE_LEVEL); - xbt_assert(stype,"No storage type '%s'", storage->type_id); + simgrid::surf::StorageType* stype; + auto st = storage_types.find(storage->type_id); + if (st != storage_types.end()) { + stype = st->second; + } else { + xbt_die("No storage type '%s'", storage->type_id.c_str()); + } - XBT_DEBUG("ROUTING Create a storage name '%s' with type_id '%s' and content '%s'", - storage->id, - storage->type_id, - storage->content); + XBT_DEBUG("ROUTING Create a storage name '%s' with type_id '%s' and content '%s'", storage->id.c_str(), + storage->type_id.c_str(), storage->content.c_str()); - xbt_lib_set(storage_lib, storage->id, ROUTING_STORAGE_LEVEL, (void *) xbt_strdup(storage->type_id)); + known_storages.push_back(storage->id); // if storage content is not specified use the content of storage_type if any - if(!strcmp(storage->content,"") && strcmp(((storage_type_t) stype)->content,"")){ - storage->content = ((storage_type_t) stype)->content; - storage->content_type = ((storage_type_t) stype)->content_type; - XBT_DEBUG("For disk '%s' content is empty, inherit the content (of type %s) from storage type '%s' ", - storage->id,((storage_type_t) stype)->content_type, - ((storage_type_t) stype)->type_id); + if (storage->content.empty() && not stype->content.empty()) { + storage->content = stype->content; + XBT_DEBUG("For disk '%s' content is empty, inherit the content (of type %s)", storage->id.c_str(), + stype->id.c_str()); } XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s' " - "\n\t\tmodel '%s' \n\t\tcontent '%s'\n\t\tcontent_type '%s' " - "\n\t\tproperties '%p''\n", - storage->id, - ((storage_type_t) stype)->model, - ((storage_type_t) stype)->type_id, - storage->content, - storage->content_type, - storage->properties); - - auto s = surf_storage_model->createStorage(storage->id, ((storage_type_t)stype)->type_id, storage->content, - storage->content_type, storage->attach); + "\n\t\tmodel '%s' \n\t\tcontent '%s' " + "\n\t\tproperties '%p''\n", + storage->id.c_str(), stype->model.c_str(), stype->id.c_str(), storage->content.c_str(), + storage->properties); + + auto s = surf_storage_model->createStorage(storage->id, stype->id, storage->content, storage->attach); if (storage->properties) { - xbt_dict_cursor_t cursor = nullptr; - char *key; - char* data; - xbt_dict_foreach (storage->properties, cursor, key, data) - s->setProperty(key, data); - xbt_dict_free(&storage->properties); + for (auto const& elm : *storage->properties) + s->setProperty(elm.first, elm.second); + delete storage->properties; } } -void sg_platf_new_storage_type(sg_platf_storage_type_cbarg_t storage_type){ - xbt_assert(!xbt_lib_get_or_null(storage_type_lib, storage_type->id,ROUTING_STORAGE_TYPE_LEVEL), - "Reading a storage type, processing unit \"%s\" already exists", storage_type->id); +void sg_platf_new_storage_type(StorageTypeCreationArgs* storage_type) +{ + xbt_assert(storage_types.find(storage_type->id) == storage_types.end(), + "Reading a storage type, processing unit \"%s\" already exists", storage_type->id.c_str()); - storage_type_t stype = xbt_new0(s_storage_type_t, 1); - stype->model = xbt_strdup(storage_type->model); - stype->properties = storage_type->properties; - stype->content = xbt_strdup(storage_type->content); - stype->content_type = xbt_strdup(storage_type->content_type); - stype->type_id = xbt_strdup(storage_type->id); - stype->size = storage_type->size; - stype->model_properties = storage_type->model_properties; + simgrid::surf::StorageType* stype = + new simgrid::surf::StorageType(storage_type->id, storage_type->model, storage_type->content, + storage_type->properties, storage_type->model_properties, storage_type->size); - XBT_DEBUG("ROUTING Create a storage type id '%s' with model '%s', content '%s', and content_type '%s'", - stype->type_id, stype->model, storage_type->content, storage_type->content_type); + XBT_DEBUG("Create a storage type id '%s' with model '%s', content '%s'", storage_type->id.c_str(), + storage_type->model.c_str(), storage_type->content.c_str()); - xbt_lib_set(storage_type_lib, stype->type_id, ROUTING_STORAGE_TYPE_LEVEL, (void*)stype); + storage_types[storage_type->id] = stype; } -void sg_platf_new_mount(sg_platf_mount_cbarg_t mount){ - xbt_assert(xbt_lib_get_or_null(storage_lib, mount->storageId, ROUTING_STORAGE_LEVEL), - "Cannot mount non-existent disk \"%s\"", mount->storageId); - - XBT_DEBUG("ROUTING Mount '%s' on '%s'",mount->storageId, mount->name); +void sg_platf_new_mount(MountCreationArgs* mount) +{ + xbt_assert(std::find(known_storages.begin(), known_storages.end(), mount->storageId) != known_storages.end(), + "Cannot mount non-existent disk \"%s\"", mount->storageId.c_str()); - s_mount_t mnt; - mnt.storage = surf_storage_resource_priv(surf_storage_resource_by_name(mount->storageId)); - mnt.name = xbt_strdup(mount->name); + XBT_DEBUG("Mount '%s' on '%s'", mount->storageId.c_str(), mount->name.c_str()); if (mount_list.empty()) XBT_DEBUG("Create a Mount list for %s", A_surfxml_host_id); - mount_list.push_back(mnt); + mount_list.insert({mount->name, simgrid::surf::StorageImpl::byName(mount->storageId.c_str())}); } void sg_platf_new_route(sg_platf_route_cbarg_t route) @@ -455,13 +421,13 @@ void sg_platf_new_bypassRoute(sg_platf_route_cbarg_t bypassRoute) void sg_platf_new_process(sg_platf_process_cbarg_t process) { sg_host_t host = sg_host_by_name(process->host); - if (!host) { + if (not host) { // The requested host does not exist. Do a nice message to the user std::string msg = std::string("Cannot create process '") + process->function + "': host '" + process->host + "' does not exist\nExisting hosts: '"; - for (auto kv : simgrid::s4u::host_list) { + for (auto const& kv : simgrid::s4u::host_list) { simgrid::s4u::Host* host = kv.second; - msg += host->name(); + msg += host->getName(); msg += "', '"; if (msg.length() > 1024) { msg.pop_back(); // remove trailing quote @@ -476,7 +442,7 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) 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; + int auto_restart = process->on_failure == SURF_ACTOR_ON_FAILURE_DIE ? 0 : 1; std::vector args(process->argv, process->argv + process->argc); std::function code = factory(std::move(args)); @@ -489,7 +455,7 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) arg->data = nullptr; arg->host = host; arg->kill_time = kill_time; - arg->properties = current_property_set; + arg->properties = process->properties; host->extension()->boot_processes.push_back(arg); @@ -501,9 +467,9 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) arg->data = nullptr; arg->host = host; arg->kill_time = kill_time; - arg->properties = current_property_set; + arg->properties = process->properties; - XBT_DEBUG("Process %s@%s will be started at time %f", arg->name.c_str(), arg->host->cname(), start_time); + XBT_DEBUG("Process %s@%s will be started at time %f", arg->name.c_str(), arg->host->getCname(), start_time); SIMIX_timer_set(start_time, [arg, auto_restart]() { smx_actor_t actor = simix_global->create_process_function(arg->name.c_str(), std::move(arg->code), arg->data, arg->host, arg->properties, nullptr); @@ -514,10 +480,10 @@ 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(), host->cname()); + XBT_DEBUG("Starting Process %s(%s) right now", arg->name.c_str(), host->getCname()); smx_actor_t actor = simix_global->create_process_function(arg->name.c_str(), std::move(code), nullptr, host, - current_property_set, nullptr); + arg->properties, nullptr); /* The actor creation will fail if the host is currently dead, but that's fine */ if (actor != nullptr) { @@ -530,14 +496,14 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) current_property_set = nullptr; } -void sg_platf_new_peer(sg_platf_peer_cbarg_t peer) +void sg_platf_new_peer(PeerCreationArgs* peer) { simgrid::kernel::routing::VivaldiZone* as = dynamic_cast(current_routing); xbt_assert(as, " tag can only be used in Vivaldi netzones."); std::vector speedPerPstate; speedPerPstate.push_back(peer->speed); - simgrid::s4u::Host* host = as->createHost(peer->id, &speedPerPstate, 1, nullptr); + simgrid::s4u::Host* host = as->createHost(peer->id.c_str(), &speedPerPstate, 1, nullptr); as->setPeerLink(host->pimpl_netpoint, peer->bw_in, peer->bw_out, peer->coord); @@ -563,14 +529,14 @@ static void surf_config_models_setup() 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")) && + if ((not xbt_cfg_is_default_value("network/model") || not 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); - if (!strcmp(host_model_name, "compound")) { + if (not strcmp(host_model_name, "compound")) { 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"); @@ -594,20 +560,18 @@ static void surf_config_models_setup() } /** - * \brief Add an AS to the platform + * \brief Add a Zone 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 - * to sg_platf_new_AS_seal() will be added to this AS. + * Add a new autonomous system to the platform. Any elements (such as host, router or sub-Zone) added after this call + * and before the corresponding call to sg_platf_new_Zone_seal() will be added to this Zone. * - * Once this function was called, the configuration concerning the used - * models cannot be changed anymore. + * Once this function was called, the configuration concerning the used models cannot be changed anymore. * - * @param AS the parameters defining the AS to build. + * @param zone the parameters defining the Zone to build. */ -simgrid::s4u::NetZone* sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) +simgrid::s4u::NetZone* sg_platf_new_Zone_begin(ZoneCreationArgs* zone) { - if (!surf_parse_models_setup_already_called) { + if (not surf_parse_models_setup_already_called) { /* Initialize the surf models. That must be done after we got all config, and before we need the models. * That is, after the last tag, if any, and before the first of cluster|peer|AS|trace|trace_connect * @@ -623,37 +587,37 @@ simgrid::s4u::NetZone* sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) * any further config now that we created some real content */ /* search the routing model */ - simgrid::kernel::routing::NetZoneImpl* new_as = nullptr; - switch(AS->routing){ + simgrid::kernel::routing::NetZoneImpl* new_zone = nullptr; + switch (zone->routing) { case A_surfxml_AS_routing_Cluster: - new_as = new simgrid::kernel::routing::ClusterZone(current_routing, AS->id); + new_zone = new simgrid::kernel::routing::ClusterZone(current_routing, zone->id); break; case A_surfxml_AS_routing_ClusterDragonfly: - new_as = new simgrid::kernel::routing::DragonflyZone(current_routing, AS->id); + new_zone = new simgrid::kernel::routing::DragonflyZone(current_routing, zone->id); break; case A_surfxml_AS_routing_ClusterTorus: - new_as = new simgrid::kernel::routing::TorusZone(current_routing, AS->id); + new_zone = new simgrid::kernel::routing::TorusZone(current_routing, zone->id); break; case A_surfxml_AS_routing_ClusterFatTree: - new_as = new simgrid::kernel::routing::FatTreeZone(current_routing, AS->id); + new_zone = new simgrid::kernel::routing::FatTreeZone(current_routing, zone->id); break; case A_surfxml_AS_routing_Dijkstra: - new_as = new simgrid::kernel::routing::DijkstraZone(current_routing, AS->id, 0); + new_zone = new simgrid::kernel::routing::DijkstraZone(current_routing, zone->id, 0); break; case A_surfxml_AS_routing_DijkstraCache: - new_as = new simgrid::kernel::routing::DijkstraZone(current_routing, AS->id, 1); + new_zone = new simgrid::kernel::routing::DijkstraZone(current_routing, zone->id, 1); break; case A_surfxml_AS_routing_Floyd: - new_as = new simgrid::kernel::routing::FloydZone(current_routing, AS->id); + new_zone = new simgrid::kernel::routing::FloydZone(current_routing, zone->id); break; case A_surfxml_AS_routing_Full: - new_as = new simgrid::kernel::routing::FullZone(current_routing, AS->id); + new_zone = new simgrid::kernel::routing::FullZone(current_routing, zone->id); break; case A_surfxml_AS_routing_None: - new_as = new simgrid::kernel::routing::EmptyZone(current_routing, AS->id); + new_zone = new simgrid::kernel::routing::EmptyZone(current_routing, zone->id); break; case A_surfxml_AS_routing_Vivaldi: - new_as = new simgrid::kernel::routing::VivaldiZone(current_routing, AS->id); + new_zone = new simgrid::kernel::routing::VivaldiZone(current_routing, zone->id); break; default: xbt_die("Not a valid model!"); @@ -661,25 +625,24 @@ simgrid::s4u::NetZone* sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) } if (current_routing == nullptr) { /* it is the first one */ - xbt_assert(simgrid::s4u::Engine::instance()->pimpl->netRoot_ == nullptr, - "All defined components must belong to a AS"); - simgrid::s4u::Engine::instance()->pimpl->netRoot_ = new_as; + xbt_assert(simgrid::s4u::Engine::getInstance()->pimpl->netRoot_ == nullptr, + "All defined components must belong to a networking zone."); + simgrid::s4u::Engine::getInstance()->pimpl->netRoot_ = new_zone; } else { /* set the father behavior */ if (current_routing->hierarchy_ == simgrid::kernel::routing::NetZoneImpl::RoutingMode::unset) current_routing->hierarchy_ = simgrid::kernel::routing::NetZoneImpl::RoutingMode::recursive; /* add to the sons dictionary */ - current_routing->children()->push_back(static_cast(new_as)); + current_routing->getChildren()->push_back(static_cast(new_zone)); } /* set the new current component of the tree */ - current_routing = new_as; + current_routing = new_zone; - if (TRACE_is_enabled()) - sg_instr_AS_begin(AS); + simgrid::s4u::NetZone::onCreation(*new_zone); // notify the signal - return new_as; + return new_zone; } /** @@ -688,48 +651,46 @@ simgrid::s4u::NetZone* sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) * Once you've declared all the content of your AS, you have to seal * it with this call. Your AS is not usable until you call this function. */ -void sg_platf_new_AS_seal() +void sg_platf_new_Zone_seal() { xbt_assert(current_routing, "Cannot seal the current AS: none under construction"); current_routing->seal(); - current_routing = static_cast(current_routing->father()); - - if (TRACE_is_enabled()) - sg_instr_AS_end(); + simgrid::s4u::NetZone::onSeal(*current_routing); + current_routing = static_cast(current_routing->getFather()); } /** @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) +void sg_platf_new_hostlink(HostLinkCreationArgs* hostlink) { - simgrid::kernel::routing::NetPoint* netpoint = sg_host_by_name(hostlink->id)->pimpl_netpoint; - xbt_assert(netpoint, "Host '%s' not found!", hostlink->id); + simgrid::kernel::routing::NetPoint* netpoint = sg_host_by_name(hostlink->id.c_str())->pimpl_netpoint; + xbt_assert(netpoint, "Host '%s' not found!", hostlink->id.c_str()); xbt_assert(dynamic_cast(current_routing), "Only hosts from Cluster and Vivaldi ASes can get an host_link."); simgrid::surf::LinkImpl* linkUp = simgrid::surf::LinkImpl::byName(hostlink->link_up); simgrid::surf::LinkImpl* linkDown = simgrid::surf::LinkImpl::byName(hostlink->link_down); - xbt_assert(linkUp, "Link '%s' not found!", hostlink->link_up); - xbt_assert(linkDown, "Link '%s' not found!", hostlink->link_down); + xbt_assert(linkUp, "Link '%s' not found!", hostlink->link_up.c_str()); + xbt_assert(linkDown, "Link '%s' not found!", hostlink->link_down.c_str()); auto as_cluster = static_cast(current_routing); if (as_cluster->privateLinks_.find(netpoint->id()) != as_cluster->privateLinks_.end()) - surf_parse_error("Host_link for '%s' is already defined!",hostlink->id); + surf_parse_error(std::string("Host_link for '") + hostlink->id.c_str() + "' is already defined!"); - XBT_DEBUG("Push Host_link for host '%s' to position %d", netpoint->cname(), netpoint->id()); + XBT_DEBUG("Push Host_link for host '%s' to position %u", netpoint->cname(), netpoint->id()); as_cluster->privateLinks_.insert({netpoint->id(), {linkUp, linkDown}}); } -void sg_platf_new_trace(sg_platf_trace_cbarg_t trace) +void sg_platf_new_trace(TraceCreationArgs* trace) { tmgr_trace_t tmgr_trace; - if (trace->file && strcmp(trace->file, "") != 0) { + if (not trace->file.empty()) { tmgr_trace = tmgr_trace_new_from_file(trace->file); } else { - xbt_assert(strcmp(trace->pc_data, ""), - "Trace '%s' must have either a content, or point to a file on disk.",trace->id); + xbt_assert(not trace->pc_data.empty(), "Trace '%s' must have either a content, or point to a file on disk.", + trace->id.c_str()); tmgr_trace = tmgr_trace_new_from_string(trace->id, trace->pc_data, trace->periodicity); } - xbt_dict_set(traces_set_list, trace->id, static_cast(tmgr_trace), nullptr); + traces_set_list.insert({trace->id, tmgr_trace}); }