X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5d4bf7d1cd502bc979d98e35067872186f2a0a21..1bf033cc925aa31693ef5163ea056fde5b75ff1e:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 5e00d5e5d4..5df6412412 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -1,43 +1,43 @@ +/* Copyright (c) 2006-2018. The SimGrid Team. All rights reserved. */ /* 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/kernel/routing/ClusterZone.hpp" +#include "simgrid/kernel/routing/DijkstraZone.hpp" +#include "simgrid/kernel/routing/DragonflyZone.hpp" +#include "simgrid/kernel/routing/EmptyZone.hpp" +#include "simgrid/kernel/routing/FatTreeZone.hpp" +#include "simgrid/kernel/routing/FloydZone.hpp" +#include "simgrid/kernel/routing/FullZone.hpp" +#include "simgrid/kernel/routing/NetPoint.hpp" +#include "simgrid/kernel/routing/NetZoneImpl.hpp" +#include "simgrid/kernel/routing/TorusZone.hpp" +#include "simgrid/kernel/routing/VivaldiZone.hpp" +#include "simgrid/s4u/Engine.hpp" +#include "src/include/simgrid/sg_config.hpp" #include "src/kernel/EngineImpl.hpp" -#include "src/simix/smx_private.h" - -#include "src/include/simgrid/sg_config.h" - +#include "src/simix/smx_host_private.hpp" +#include "src/simix/smx_private.hpp" #include "src/surf/HostImpl.hpp" -#include "src/surf/cpu_interface.hpp" -#include "src/surf/network_interface.hpp" - -#include "src/kernel/routing/ClusterZone.hpp" -#include "src/kernel/routing/DijkstraZone.hpp" -#include "src/kernel/routing/DragonflyZone.hpp" -#include "src/kernel/routing/EmptyZone.hpp" -#include "src/kernel/routing/FatTreeZone.hpp" -#include "src/kernel/routing/FloydZone.hpp" -#include "src/kernel/routing/FullZone.hpp" -#include "src/kernel/routing/NetPoint.hpp" -#include "src/kernel/routing/NetZoneImpl.hpp" -#include "src/kernel/routing/TorusZone.hpp" -#include "src/kernel/routing/VivaldiZone.hpp" +#include "src/surf/xml/platf_private.hpp" + +#include XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse); -XBT_PRIVATE xbt_dynar_t mount_list = nullptr; +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; } } 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; @@ -47,13 +47,15 @@ static simgrid::kernel::routing::NetZoneImpl* routing_get_current() } /** Module management function: creates all internal data structures */ -void sg_platf_init() { +void sg_platf_init() +{ + simgrid::s4u::on_platform_created.connect(check_disk_attachment); } /** Module management function: frees all internal data structures */ void sg_platf_exit() { - simgrid::surf::on_cluster.disconnect_all_slots(); - simgrid::s4u::onPlatformCreated.disconnect_all_slots(); + simgrid::surf::on_cluster.disconnect_slots(); + simgrid::s4u::on_platform_created.disconnect_slots(); /* make sure that we will reinit the models while loading the platf once reinited */ surf_parse_models_setup_already_called = 0; @@ -61,92 +63,83 @@ void sg_platf_exit() { } /** @brief Add an host to the current AS */ -void sg_platf_new_host(sg_platf_host_cbarg_t args) +void sg_platf_new_host(simgrid::kernel::routing::HostCreationArgs* args) { - std::unordered_map props; + std::map props; if (args->properties) { - xbt_dict_cursor_t cursor=nullptr; - char *key,*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 = - routing_get_current()->createHost(args->id, &args->speed_per_pstate, args->core_amount, &props); + routing_get_current()->create_host(args->id, &args->speed_per_pstate, args->core_amount, &props); host->pimpl_->storage_ = mount_list; - xbt_lib_set(storage_lib, args->id, ROUTING_STORAGE_HOST_LEVEL, static_cast(mount_list)); - mount_list = nullptr; + mount_list.clear(); /* Change from the defaults */ if (args->state_trace) - host->pimpl_cpu->setStateTrace(args->state_trace); + host->pimpl_cpu->set_state_trace(args->state_trace); if (args->speed_trace) - host->pimpl_cpu->setSpeedTrace(args->speed_trace); + host->pimpl_cpu->set_speed_trace(args->speed_trace); if (args->pstate != 0) - host->pimpl_cpu->setPState(args->pstate); + host->pimpl_cpu->set_pstate(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::get_instance()->netpoint_by_name_or_null(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; } -void sg_platf_new_link(sg_platf_link_cbarg_t link){ - std::vector names; +void sg_platf_new_link(simgrid::kernel::routing::LinkCreationArgs* link) +{ + std::vector names; - if (link->policy == SURF_LINK_FULLDUPLEX) { - names.push_back(bprintf("%s_UP", link->id)); - names.push_back(bprintf("%s_DOWN", link->id)); + if (link->policy == simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX) { + names.push_back(link->id+ "_UP"); + names.push_back(link->id+ "_DOWN"); } else { - names.push_back(xbt_strdup(link->id)); + names.push_back(link->id); } - for (auto link_name : names) { - Link* l = surf_network_model->createLink(link_name, link->bandwidth, link->latency, link->policy); + for (auto const& link_name : names) { + simgrid::kernel::resource::LinkImpl* 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); + for (auto const& elm : *link->properties) + l->set_property(elm.first, elm.second); } if (link->latency_trace) - l->setLatencyTrace(link->latency_trace); + l->set_latency_trace(link->latency_trace); if (link->bandwidth_trace) - l->setBandwidthTrace(link->bandwidth_trace); + l->set_bandwidth_trace(link->bandwidth_trace); if (link->state_trace) - l->setStateTrace(link->state_trace); - - xbt_free(link_name); + l->set_state_trace(link->state_trace); } + delete link->properties; } -void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) +void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster) { using simgrid::kernel::routing::ClusterZone; using simgrid::kernel::routing::DragonflyZone; @@ -155,66 +148,60 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) int rankId=0; - s_sg_platf_link_cbarg_t link; - // What an inventive way of initializing the AS that I have as ancestor :-( - s_sg_platf_AS_cbarg_t AS; - AS.id = cluster->id; + simgrid::kernel::routing::ZoneCreationArgs zone; + zone.id = cluster->id; switch (cluster->topology) { - 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; - default: - AS.routing = A_surfxml_AS_routing_Cluster; - break; + case simgrid::kernel::routing::ClusterTopology::TORUS: + zone.routing = A_surfxml_AS_routing_ClusterTorus; + break; + case simgrid::kernel::routing::ClusterTopology::DRAGONFLY: + zone.routing = A_surfxml_AS_routing_ClusterDragonfly; + break; + case simgrid::kernel::routing::ClusterTopology::FAT_TREE: + zone.routing = A_surfxml_AS_routing_ClusterFatTree; + break; + default: + 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); - if(cluster->loopback_bw!=0 || cluster->loopback_lat!=0){ - current_as->linkCountPerNode_++; - current_as->hasLoopback_ = 1; + if(cluster->loopback_bw > 0 || cluster->loopback_lat > 0){ + current_as->num_links_per_node_++; + current_as->has_loopback_ = true; } - if(cluster->limiter_link!=0){ - current_as->linkCountPerNode_++; - current_as->hasLimiter_ = 1; + if(cluster->limiter_link > 0){ + current_as->num_links_per_node_++; + current_as->has_limiter_ = true; } - 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->speed); + 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,*data; - host.properties = xbt_dict_new_homogeneous(free); + simgrid::kernel::routing::HostCreationArgs host; + host.id = host_id.c_str(); + if ((cluster->properties != nullptr) && (not cluster->properties->empty())) { + host.properties = new std::unordered_map; - xbt_dict_foreach(cluster->properties,cursor,key,data) { - xbt_dict_set(host.properties, key, xbt_strdup(data), nullptr); - } + for (auto const& elm : *cluster->properties) + host.properties->insert({elm.first, elm.second}); } - host.speed_per_pstate.push_back(cluster->speed); + host.speed_per_pstate = cluster->speeds; host.pstate = 0; host.core_amount = cluster->core_amount; host.coord = ""; 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. @@ -223,373 +210,308 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) // other columns are to store one or more link for the node //add a loopback link - Link* linkUp = nullptr; - Link* 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); + simgrid::s4u::Link* linkUp = nullptr; + simgrid::s4u::Link* linkDown = nullptr; + if(cluster->loopback_bw > 0 || cluster->loopback_lat > 0){ + std::string tmp_link = link_id + "_loopback"; + XBT_DEBUG("", tmp_link.c_str(), cluster->loopback_bw); - memset(&link, 0, sizeof(link)); + simgrid::kernel::routing::LinkCreationArgs link; link.id = tmp_link; link.bandwidth = cluster->loopback_bw; link.latency = cluster->loopback_lat; - link.policy = SURF_LINK_FATPIPE; + link.policy = simgrid::s4u::Link::SharingPolicy::FATPIPE; sg_platf_new_link(&link); - linkUp = Link::byName(tmp_link); - linkDown = Link::byName(tmp_link); - free(tmp_link); + linkUp = simgrid::s4u::Link::by_name_or_null(tmp_link); + linkDown = simgrid::s4u::Link::by_name_or_null(tmp_link); - auto as_cluster = static_cast(current_as); - as_cluster->privateLinks_.insert({rankId * as_cluster->linkCountPerNode_, {linkUp, linkDown}}); + auto* as_cluster = static_cast(current_as); + as_cluster->private_links_.insert({as_cluster->node_pos(rankId), {linkUp->get_impl(), linkDown->get_impl()}}); } //add a limiter link (shared link to account for maximal bandwidth of the node) linkUp = nullptr; linkDown = nullptr; - if(cluster->limiter_link!=0){ - char *tmp_link = bprintf("%s_limiter", link_id); - XBT_DEBUG("", tmp_link, cluster->limiter_link); + if(cluster->limiter_link > 0){ + std::string tmp_link = std::string(link_id) + "_limiter"; + XBT_DEBUG("", tmp_link.c_str(), cluster->limiter_link); - memset(&link, 0, sizeof(link)); - link.id = tmp_link; + simgrid::kernel::routing::LinkCreationArgs link; + link.id = tmp_link; link.bandwidth = cluster->limiter_link; link.latency = 0; - link.policy = SURF_LINK_SHARED; + link.policy = simgrid::s4u::Link::SharingPolicy::SHARED; sg_platf_new_link(&link); - linkUp = linkDown = Link::byName(tmp_link); - free(tmp_link); - current_as->privateLinks_.insert( - {rankId * current_as->linkCountPerNode_ + current_as->hasLoopback_, {linkUp, linkDown}}); + linkDown = simgrid::s4u::Link::by_name_or_null(tmp_link); + linkUp = linkDown; + current_as->private_links_.insert( + {current_as->node_pos_with_loopback(rankId), {linkUp->get_impl(), linkDown->get_impl()}}); } //call the cluster function that adds the others links - if (cluster->topology == SURF_CLUSTER_FAT_TREE) { - static_cast(current_as)->addProcessingNode(i); - } - else { - current_as->create_links_for_node(cluster, i, rankId, - rankId*current_as->linkCountPerNode_ + current_as->hasLoopback_ + current_as->hasLimiter_ ); + if (cluster->topology == simgrid::kernel::routing::ClusterTopology::FAT_TREE) { + static_cast(current_as)->add_processing_node(i); + } else { + current_as->create_links_for_node(cluster, i, rankId, current_as->node_pos_with_loopback_limiter(rankId)); } - xbt_free(link_id); - xbt_free(host_id); rankId++; } + 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); } //Make the backbone - if ((cluster->bb_bw != 0) || (cluster->bb_lat != 0)) { + if ((cluster->bb_bw > 0) || (cluster->bb_lat > 0)) { - memset(&link, 0, sizeof(link)); - link.id = bprintf("%s_backbone", cluster->id); + simgrid::kernel::routing::LinkCreationArgs link; + link.id = std::string(cluster->id)+ "_backbone"; link.bandwidth = cluster->bb_bw; link.latency = cluster->bb_lat; link.policy = cluster->bb_sharing_policy; - XBT_DEBUG("", link.id, cluster->bb_bw, cluster->bb_lat); + XBT_DEBUG("", link.id.c_str(), cluster->bb_bw, cluster->bb_lat); sg_platf_new_link(&link); - routing_cluster_add_backbone(Link::byName(link.id)); - free((char*)link.id); + routing_cluster_add_backbone(simgrid::s4u::Link::by_name(link.id)->get_impl()); } XBT_DEBUG(""); - sg_platf_new_AS_seal(); + sg_platf_new_Zone_seal(); simgrid::surf::on_cluster(cluster); delete cluster->radicals; } -void routing_cluster_add_backbone(simgrid::surf::LinkImpl* bb) + +void routing_cluster_add_backbone(simgrid::kernel::resource::LinkImpl* bb) { simgrid::kernel::routing::ClusterZone* 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()); + xbt_assert(nullptr == cluster->backbone_, "Cluster %s already has a backbone link!", cluster->get_cname()); cluster->backbone_ = bb; - XBT_DEBUG("Add a backbone to AS '%s'", current_routing->name()); + XBT_DEBUG("Add a backbone to AS '%s'", current_routing->get_cname()); } -void sg_platf_new_cabinet(sg_platf_cabinet_cbarg_t cabinet) +void sg_platf_new_cabinet(simgrid::kernel::routing::CabinetCreationArgs* cabinet) { - 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)); + for (int const& radical : *cabinet->radicals) { + std::string hostname = cabinet->prefix + std::to_string(radical) + cabinet->suffix; + simgrid::kernel::routing::HostCreationArgs host; host.pstate = 0; host.core_amount = 1; - host.id = hostname; + host.id = hostname.c_str(); host.speed_per_pstate.push_back(cabinet->speed); sg_platf_new_host(&host); - s_sg_platf_link_cbarg_t link; - memset(&link, 0, sizeof(link)); - link.policy = SURF_LINK_FULLDUPLEX; + simgrid::kernel::routing::LinkCreationArgs link; + link.policy = simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX; link.latency = cabinet->lat; link.bandwidth = cabinet->bw; - link.id = bprintf("link_%s",hostname); + link.id = "link_" + hostname; sg_platf_new_link(&link); - free((char*)link.id); - s_sg_platf_host_link_cbarg_t host_link; - memset(&host_link, 0, sizeof(host_link)); + simgrid::kernel::routing::HostLinkCreationArgs host_link; host_link.id = hostname; - host_link.link_up = bprintf("link_%s_UP",hostname); - host_link.link_down = bprintf("link_%s_DOWN",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); - - free(hostname); } delete cabinet->radicals; } -void sg_platf_new_storage(sg_platf_storage_cbarg_t storage) +void sg_platf_new_storage(simgrid::kernel::routing::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, *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->set_property(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); - - 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; - - 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_lib_set(storage_type_lib, - stype->type_id, - ROUTING_STORAGE_TYPE_LEVEL, - (void *) stype); -} -static void mount_free(void *p) +void sg_platf_new_storage_type(simgrid::kernel::routing::StorageTypeCreationArgs* storage_type) { - mount_t mnt = (mount_t) p; - xbt_free(mnt->name); -} + 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()); -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); + 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 Mount '%s' on '%s'",mount->storageId, mount->name); + 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()); - s_mount_t mnt; - mnt.storage = surf_storage_resource_priv(surf_storage_resource_by_name(mount->storageId)); - mnt.name = xbt_strdup(mount->name); + storage_types[storage_type->id] = stype; +} - if(!mount_list){ - XBT_DEBUG("Create a Mount list for %s",A_surfxml_host_id); - mount_list = xbt_dynar_new(sizeof(s_mount_t), mount_free); - } - xbt_dynar_push(mount_list, &mnt); +void sg_platf_new_mount(simgrid::kernel::routing::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()); + + 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.insert({mount->name, simgrid::s4u::Engine::get_instance()->storage_by_name(mount->storageId)->get_impl()}); } -void sg_platf_new_route(sg_platf_route_cbarg_t route) +void sg_platf_new_route(simgrid::kernel::routing::RouteCreationArgs* route) { - routing_get_current()->addRoute(route); + routing_get_current()->add_route(route->src, route->dst, route->gw_src, route->gw_dst, route->link_list, + route->symmetrical); } -void sg_platf_new_bypassRoute(sg_platf_route_cbarg_t bypassRoute) +void sg_platf_new_bypassRoute(simgrid::kernel::routing::RouteCreationArgs* bypassRoute) { - routing_get_current()->addBypassRoute(bypassRoute); + routing_get_current()->add_bypass_route(bypassRoute->src, bypassRoute->dst, bypassRoute->gw_src, bypassRoute->gw_dst, + bypassRoute->link_list, bypassRoute->symmetrical); } -void sg_platf_new_process(sg_platf_process_cbarg_t process) +void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor) { - sg_host_t host = sg_host_by_name(process->host); - if (!host) { + sg_host_t host = sg_host_by_name(actor->host); + if (not host) { // The requested host does not exist. Do a nice message to the user - char *tmp = bprintf("Cannot create process '%s': host '%s' does not exist\nExisting hosts: '",process->function, process->host); - xbt_strbuff_t msg = xbt_strbuff_new_from(tmp); - free(tmp); - xbt_dynar_t all_hosts = xbt_dynar_sort_strings(sg_hosts_as_dynar()); - simgrid::s4u::Host* host; - unsigned int cursor; - xbt_dynar_foreach(all_hosts,cursor, host) { - xbt_strbuff_append(msg, host->cname()); - xbt_strbuff_append(msg,"', '"); - if (msg->used > 1024) { - msg->data[msg->used-3]='\0'; - msg->used -= 3; - - xbt_strbuff_append(msg," ...(list truncated)......");// That will be shortened by 3 chars when existing the loop + std::string msg = std::string("Cannot create actor '") + actor->function + "': host '" + actor->host + + "' does not exist\nExisting hosts: '"; + + std::vector list = simgrid::s4u::Engine::get_instance()->get_all_hosts(); + + for (auto const& host : list) { + msg += host->get_name(); + msg += "', '"; + if (msg.length() > 1024) { + msg.pop_back(); // remove trailing quote + msg += "...(list truncated)......"; break; } } - msg->data[msg->used-3]='\0'; - xbt_die("%s", msg->data); + xbt_die("%s", msg.c_str()); } - simgrid::simix::ActorCodeFactory& factory = SIMIX_get_actor_code_factory(process->function); - xbt_assert(factory, "Function '%s' unknown", process->function); + simgrid::simix::ActorCodeFactory& factory = SIMIX_get_actor_code_factory(actor->function); + xbt_assert(factory, "Function '%s' unknown", actor->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; + double start_time = actor->start_time; + double kill_time = actor->kill_time; + bool auto_restart = actor->on_failure != simgrid::kernel::routing::ActorOnFailure::DIE; - std::vector args(process->argv, process->argv + process->argc); - std::function code = factory(std::move(args)); + std::string actor_name = actor->args[0]; + std::function code = factory(std::move(actor->args)); + std::shared_ptr> properties(actor->properties); - smx_process_arg_t arg = nullptr; - smx_actor_t process_created = nullptr; + simgrid::kernel::actor::ProcessArg* arg = + new simgrid::kernel::actor::ProcessArg(actor_name, code, nullptr, host, kill_time, properties, auto_restart); - arg = new simgrid::simix::ProcessArg(); - arg->name = std::string(process->argv[0]); - arg->code = code; - arg->data = nullptr; - arg->host = host; - arg->kill_time = kill_time; - arg->properties = current_property_set; - - sg_host_simix(host)->boot_processes.push_back(arg); + host->extension()->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 = 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->host->cname(), start_time); - SIMIX_timer_set(start_time, [=]() { - simix_global->create_process_function( - arg->name.c_str(), - std::move(arg->code), - arg->data, - arg->host, - arg->kill_time, - arg->properties, - arg->auto_restart, - nullptr); + arg = new simgrid::kernel::actor::ProcessArg(actor_name, code, nullptr, host, kill_time, properties, auto_restart); + + 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_global->create_process_function(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); + if (auto_restart) + SIMIX_process_auto_restart_set(actor, auto_restart); 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->get_cname()); - process_created = simix_global->create_process_function( - arg->name.c_str(), std::move(code), nullptr, - host, kill_time, - current_property_set, auto_restart, nullptr); + smx_actor_t actor = simix_global->create_process_function(arg->name.c_str(), std::move(code), nullptr, host, + arg->properties.get(), 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; + /* 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); + if (auto_restart) + SIMIX_process_auto_restart_set(actor, auto_restart); } } - current_property_set = nullptr; } -void sg_platf_new_peer(sg_platf_peer_cbarg_t peer) +void sg_platf_new_peer(simgrid::kernel::routing::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->create_host(peer->id.c_str(), &speedPerPstate, 1, nullptr); as->setPeerLink(host->pimpl_netpoint, peer->bw_in, peer->bw_out, peer->coord); /* Change from the defaults */ if (peer->state_trace) - host->pimpl_cpu->setStateTrace(peer->state_trace); + host->pimpl_cpu->set_state_trace(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 */ } - -void sg_platf_end() { - simgrid::s4u::onPlatformCreated(); + host->pimpl_cpu->set_speed_trace(peer->speed_trace); } /* 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 = 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"); + std::string host_model_name = simgrid::config::get_value("host/model"); + std::string network_model_name = simgrid::config::get_value("network/model"); + std::string cpu_model_name = simgrid::config::get_value("cpu/model"); + std::string storage_model_name = simgrid::config::get_value("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")) { + if ((not simgrid::config::is_default("network/model") || not simgrid::config::is_default("cpu/model")) && + simgrid::config::is_default("host/model")) { host_model_name = "compound"; - xbt_cfg_set_string("host/model", host_model_name); + simgrid::config::set_value("host/model", host_model_name); } - XBT_DEBUG("host model: %s", host_model_name); - if (!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"); + XBT_DEBUG("host model: %s", host_model_name.c_str()); + if (host_model_name == "compound") { + xbt_assert(not cpu_model_name.empty(), "Set a cpu model to use with the 'compound' host model"); + xbt_assert(not network_model_name.empty(), "Set a network 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(); @@ -611,20 +533,20 @@ 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(simgrid::kernel::routing::ZoneCreationArgs* zone) { - if (!surf_parse_models_setup_already_called) { + if (not surf_parse_models_setup_already_called) { + simgrid::s4u::on_platform_creation(); + /* 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 * @@ -639,39 +561,38 @@ simgrid::s4u::NetZone* sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) _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 */ - /* 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, false); 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, true); 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!"); @@ -679,25 +600,20 @@ 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; - + simgrid::s4u::Engine::get_instance()->set_netzone_root(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 */ - xbt_dict_set(current_routing->children(), AS->id, (void *) new_as, nullptr); + current_routing->get_children()->push_back(static_cast(new_zone)); } /* set the new current component of the tree */ - current_routing = new_as; + current_routing = new_zone; + simgrid::s4u::NetZone::on_creation(*new_zone); // notify the signal - if (TRACE_is_enabled()) - sg_instr_AS_begin(AS); - - return new_as; + return new_zone; } /** @@ -706,48 +622,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::on_seal(*current_routing); + current_routing = static_cast(current_routing->get_father()); } /** @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(simgrid::kernel::routing::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 = Link::byName(hostlink->link_up); - simgrid::surf::LinkImpl* linkDown = Link::byName(hostlink->link_down); + simgrid::s4u::Link* linkUp = simgrid::s4u::Link::by_name_or_null(hostlink->link_up); + simgrid::s4u::Link* linkDown = simgrid::s4u::Link::by_name_or_null(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); + 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); + if (as_cluster->private_links_.find(netpoint->id()) != as_cluster->private_links_.end()) + 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()); - as_cluster->privateLinks_.insert({netpoint->id(), {linkUp, linkDown}}); + XBT_DEBUG("Push Host_link for host '%s' to position %u", netpoint->get_cname(), netpoint->id()); + as_cluster->private_links_.insert({netpoint->id(), {linkUp->get_impl(), linkDown->get_impl()}}); } -void sg_platf_new_trace(sg_platf_trace_cbarg_t trace) +void sg_platf_new_trace(simgrid::kernel::routing::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}); }