X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b46a15116e3ab14c03a7aad88cce834b40b90a2b..d7c957a488bb2ebd0ef5ea7a3323f1ccea620f30:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index af9b3ebfb1..9066f98feb 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2021. 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. */ @@ -30,9 +30,6 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse); -XBT_PRIVATE std::map mount_list; -XBT_PRIVATE std::vector known_storages; - namespace simgrid { namespace kernel { namespace routing { @@ -42,7 +39,6 @@ xbt::signal on_cluster_creation; } // namespace simgrid 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; @@ -54,11 +50,12 @@ static simgrid::kernel::routing::NetZoneImpl* routing_get_current() /** Module management function: creates all internal data structures */ void sg_platf_init() { - simgrid::s4u::Engine::on_platform_created.connect(check_disk_attachment); + // Do nothing: just for symmetry of user code } /** Module management function: frees all internal data structures */ -void sg_platf_exit() { +void sg_platf_exit() +{ simgrid::kernel::routing::on_cluster_creation.disconnect_slots(); simgrid::s4u::Engine::on_platform_created.disconnect_slots(); @@ -70,19 +67,13 @@ void sg_platf_exit() { /** @brief Add a host to the current AS */ void sg_platf_new_host(const simgrid::kernel::routing::HostCreationArgs* args) { - std::unordered_map props; + simgrid::s4u::Host* host = routing_get_current()->create_host(args->id, args->speed_per_pstate, args->core_amount); + if (args->properties) { - for (auto const& elm : *args->properties) - props.insert({elm.first, elm.second}); + host->set_properties(*args->properties); delete args->properties; } - simgrid::s4u::Host* host = - routing_get_current()->create_host(args->id, args->speed_per_pstate, args->core_amount, &props); - - host->pimpl_->set_storages(mount_list); - mount_list.clear(); - host->pimpl_->set_disks(args->disks, host); /* Change from the defaults */ @@ -90,10 +81,15 @@ void sg_platf_new_host(const simgrid::kernel::routing::HostCreationArgs* args) host->set_state_profile(args->state_trace); if (args->speed_trace) host->set_speed_profile(args->speed_trace); - if (args->pstate != 0) - host->set_pstate(args->pstate); if (not args->coord.empty()) new simgrid::kernel::routing::vivaldi::Coords(host->get_netpoint(), args->coord); + + simgrid::s4u::Host::on_creation(*host); // notify the signal + + /* When energy plugin is activated, changing the pstate requires to already have the HostEnergy extension whose + * allocation is triggered by the on_creation signal. Then set_pstate must be called after the signal emition */ + if (args->pstate != 0) + host->set_pstate(args->pstate); } /** @brief Add a "router" to the network element list */ @@ -111,19 +107,17 @@ simgrid::kernel::routing::NetPoint* sg_platf_new_router(const std::string& name, if (coords && strcmp(coords, "")) new simgrid::kernel::routing::vivaldi::Coords(netpoint, coords); - return netpoint; } static void sg_platf_new_link(const simgrid::kernel::routing::LinkCreationArgs* args, const std::string& link_name) { - std::unordered_map props; - if (args->properties) - for (auto const& elm : *args->properties) - props.insert({elm.first, elm.second}); + simgrid::s4u::Link* link = routing_get_current()->create_link(link_name, args->bandwidths, args->policy); + if (args->policy != simgrid::s4u::Link::SharingPolicy::WIFI) + link->get_impl()->set_latency(args->latency); - simgrid::s4u::Link* link = - routing_get_current()->create_link(link_name, args->bandwidths, args->latency, args->policy, &props); + if (args->properties) + link->set_properties(*args->properties); simgrid::kernel::resource::LinkImpl* l = link->get_impl(); if (args->latency_trace) @@ -132,6 +126,8 @@ static void sg_platf_new_link(const simgrid::kernel::routing::LinkCreationArgs* l->set_bandwidth_profile(args->bandwidth_trace); if (args->state_trace) l->set_state_profile(args->state_trace); + + link->seal(); } void sg_platf_new_link(const simgrid::kernel::routing::LinkCreationArgs* link) @@ -152,7 +148,7 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster using simgrid::kernel::routing::FatTreeZone; using simgrid::kernel::routing::TorusZone; - int rankId=0; + int rankId = 0; // What an inventive way of initializing the AS that I have as ancestor :-( simgrid::kernel::routing::ZoneCreationArgs zone; @@ -178,12 +174,12 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster for (auto const& elm : *cluster->properties) current_as->get_iface()->set_property(elm.first, elm.second); - if(cluster->loopback_bw > 0 || cluster->loopback_lat > 0){ + 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){ + if (cluster->limiter_link > 0) { current_as->num_links_per_node_++; current_as->has_limiter_ = true; } @@ -204,9 +200,9 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster } host.speed_per_pstate = cluster->speeds; - host.pstate = 0; - host.core_amount = cluster->core_amount; - host.coord = ""; + host.pstate = 0; + host.core_amount = cluster->core_amount; + host.coord = ""; sg_platf_new_host(&host); XBT_DEBUG(""); @@ -218,18 +214,18 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster // the second column may store a limiter link if p_has_limiter is set // other columns are to store one or more link for the node - //add a loopback link + // add a loopback link const simgrid::s4u::Link* linkUp = nullptr; const simgrid::s4u::Link* linkDown = nullptr; - if(cluster->loopback_bw > 0 || cluster->loopback_lat > 0){ + 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); simgrid::kernel::routing::LinkCreationArgs link; - link.id = tmp_link; + link.id = tmp_link; link.bandwidths.push_back(cluster->loopback_bw); - link.latency = cluster->loopback_lat; - link.policy = simgrid::s4u::Link::SharingPolicy::FATPIPE; + link.latency = cluster->loopback_lat; + link.policy = simgrid::s4u::Link::SharingPolicy::FATPIPE; sg_platf_new_link(&link); linkUp = simgrid::s4u::Link::by_name_or_null(tmp_link); linkDown = simgrid::s4u::Link::by_name_or_null(tmp_link); @@ -238,18 +234,18 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster 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) + // add a limiter link (shared link to account for maximal bandwidth of the node) linkUp = nullptr; linkDown = nullptr; - if(cluster->limiter_link > 0){ + if (cluster->limiter_link > 0) { std::string tmp_link = std::string(link_id) + "_limiter"; XBT_DEBUG("", tmp_link.c_str(), cluster->limiter_link); simgrid::kernel::routing::LinkCreationArgs link; - link.id = tmp_link; + link.id = tmp_link; link.bandwidths.push_back(cluster->limiter_link); link.latency = 0; - link.policy = simgrid::s4u::Link::SharingPolicy::SHARED; + link.policy = simgrid::s4u::Link::SharingPolicy::SHARED; sg_platf_new_link(&link); linkDown = simgrid::s4u::Link::by_name_or_null(tmp_link); linkUp = linkDown; @@ -257,7 +253,7 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster {current_as->node_pos_with_loopback(rankId), {linkUp->get_impl(), linkDown->get_impl()}}); } - //call the cluster function that adds the others links + // call the cluster function that adds the others links if (cluster->topology == simgrid::kernel::routing::ClusterTopology::FAT_TREE) { static_cast(current_as)->add_processing_node(i); } else { @@ -272,15 +268,15 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster XBT_DEBUG("", cluster->router_id.c_str()); if (cluster->router_id.empty()) cluster->router_id = std::string(cluster->prefix) + cluster->id + "_router" + cluster->suffix; - current_as->router_ = sg_platf_new_router(cluster->router_id, NULL); + current_as->router_ = sg_platf_new_router(cluster->router_id, nullptr); - //Make the backbone + // Make the backbone if ((cluster->bb_bw > 0) || (cluster->bb_lat > 0)) { simgrid::kernel::routing::LinkCreationArgs link; - link.id = std::string(cluster->id)+ "_backbone"; + link.id = std::string(cluster->id) + "_backbone"; link.bandwidths.push_back(cluster->bb_bw); - link.latency = cluster->bb_lat; - link.policy = cluster->bb_sharing_policy; + link.latency = cluster->bb_lat; + link.policy = cluster->bb_sharing_policy; XBT_DEBUG("", link.id.c_str(), cluster->bb_bw, cluster->bb_lat); sg_platf_new_link(&link); @@ -311,17 +307,17 @@ void sg_platf_new_cabinet(const simgrid::kernel::routing::CabinetCreationArgs* c 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.pstate = 0; + host.core_amount = 1; + host.id = hostname; host.speed_per_pstate.push_back(cabinet->speed); sg_platf_new_host(&host); simgrid::kernel::routing::LinkCreationArgs link; - link.policy = simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX; - link.latency = cabinet->lat; + link.policy = simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX; + link.latency = cabinet->lat; link.bandwidths.push_back(cabinet->bw); - link.id = "link_" + hostname; + link.id = "link_" + hostname; sg_platf_new_link(&link); simgrid::kernel::routing::HostLinkCreationArgs host_link; @@ -335,80 +331,16 @@ void sg_platf_new_cabinet(const simgrid::kernel::routing::CabinetCreationArgs* c simgrid::kernel::resource::DiskImpl* sg_platf_new_disk(const simgrid::kernel::routing::DiskCreationArgs* disk) { - simgrid::kernel::resource::DiskImpl* d = surf_disk_model->createDisk(disk->id, disk->read_bw, disk->write_bw); + simgrid::kernel::resource::DiskImpl* pimpl = surf_disk_model->create_disk(disk->id, disk->read_bw, disk->write_bw); + if (disk->properties) { - d->set_properties(*disk->properties); + pimpl->set_properties(*disk->properties); delete disk->properties; } - simgrid::s4u::Disk::on_creation(*d->get_iface()); - return d; -} -void sg_platf_new_storage(simgrid::kernel::routing::StorageCreationArgs* storage) -{ - 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()); - - const simgrid::kernel::resource::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.c_str(), - storage->type_id.c_str(), storage->content.c_str()); - - known_storages.push_back(storage->id); - - // if storage content is not specified use the content of storage_type if any - 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\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->filename, storage->lineno, storage->id, stype->id, - storage->content, storage->attach); - - if (storage->properties) { - s->set_properties(*storage->properties); - delete storage->properties; - } -} - -void sg_platf_new_storage_type(const simgrid::kernel::routing::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()); - - auto* stype = new simgrid::kernel::resource::StorageType(storage_type->id, storage_type->model, storage_type->content, - storage_type->properties, storage_type->model_properties, - storage_type->size); - - 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()); - - storage_types[storage_type->id] = stype; -} - -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()}); + pimpl->seal(); + simgrid::s4u::Disk::on_creation(*pimpl->get_iface()); + return pimpl; } void sg_platf_new_route(simgrid::kernel::routing::RouteCreationArgs* route) @@ -452,7 +384,7 @@ void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor) double kill_time = actor->kill_time; bool auto_restart = actor->restart_on_failure; - std::string actor_name = actor->args[0]; + std::string actor_name = actor->args[0]; simgrid::kernel::actor::ActorCode code = factory(std::move(actor->args)); std::shared_ptr> properties(actor->properties); @@ -467,19 +399,19 @@ void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor) XBT_DEBUG("Process %s@%s will be started at time %f", arg->name.c_str(), arg->host->get_cname(), start_time); simgrid::simix::Timer::set(start_time, [arg, auto_restart]() { simgrid::kernel::actor::ActorImplPtr new_actor = simgrid::kernel::actor::ActorImpl::create( - arg->name.c_str(), std::move(arg->code), arg->data, arg->host, arg->properties.get(), nullptr); + arg->name.c_str(), arg->code, arg->data, arg->host, arg->properties.get(), nullptr); if (arg->kill_time >= 0) new_actor->set_kill_time(arg->kill_time); if (auto_restart) new_actor->set_auto_restart(auto_restart); delete arg; }); - } else { // start_time <= SIMIX_get_clock() + } else { // start_time <= SIMIX_get_clock() XBT_DEBUG("Starting Process %s(%s) right now", arg->name.c_str(), host->get_cname()); try { simgrid::kernel::actor::ActorImplPtr new_actor = nullptr; - new_actor = simgrid::kernel::actor::ActorImpl::create(arg->name.c_str(), std::move(code), nullptr, host, + new_actor = simgrid::kernel::actor::ActorImpl::create(arg->name.c_str(), code, nullptr, host, arg->properties.get(), nullptr); /* The actor creation will fail if the host is currently dead, but that's fine */ if (arg->kill_time >= 0) @@ -499,7 +431,7 @@ void sg_platf_new_peer(const simgrid::kernel::routing::PeerCreationArgs* peer) std::vector speed_per_pstate; speed_per_pstate.push_back(peer->speed); - simgrid::s4u::Host* host = as->create_host(peer->id, speed_per_pstate, 1, nullptr); + simgrid::s4u::Host* host = as->create_host(peer->id, speed_per_pstate, 1); as->set_peer_link(host->get_netpoint(), peer->bw_in, peer->bw_out, peer->coord); @@ -508,6 +440,7 @@ void sg_platf_new_peer(const simgrid::kernel::routing::PeerCreationArgs* peer) host->set_state_profile(peer->state_trace); if (peer->speed_trace) host->set_speed_profile(peer->speed_trace); + simgrid::s4u::Host::on_creation(*host); // notify the signal } /* Pick the right models for CPU, net and host, and call their model_init_preparse */ @@ -517,7 +450,6 @@ static void surf_config_models_setup() std::string network_model_name = simgrid::config::get_value("network/model"); std::string cpu_model_name = simgrid::config::get_value("cpu/model"); std::string disk_model_name = simgrid::config::get_value("disk/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 ((not simgrid::config::is_default("network/model") || not simgrid::config::is_default("cpu/model")) && @@ -548,10 +480,6 @@ static void surf_config_models_setup() XBT_DEBUG("Call disk_model_init"); int disk_id = find_model_description(surf_disk_model_description, disk_model_name); surf_disk_model_description[disk_id].model_init_preparse(); - - XBT_DEBUG("Call storage_model_init"); - int storage_id = find_model_description(surf_storage_model_description, storage_model_name); - surf_storage_model_description[storage_id].model_init_preparse(); } /** @@ -588,25 +516,25 @@ simgrid::kernel::routing::NetZoneImpl* sg_platf_new_Zone_begin(const simgrid::ke simgrid::kernel::resource::NetworkModel* netmodel = current_routing == nullptr ? surf_network_model : current_routing->network_model_; if (strcasecmp(zone->routing.c_str(), "Cluster") == 0) { - new_zone = new simgrid::kernel::routing::ClusterZone(current_routing, zone->id, netmodel); - } else if (strcasecmp(zone->routing.c_str(),"ClusterDragonfly") == 0) { - new_zone = new simgrid::kernel::routing::DragonflyZone(current_routing, zone->id, netmodel); - } else if (strcasecmp(zone->routing.c_str(),"ClusterTorus") == 0) { - new_zone = new simgrid::kernel::routing::TorusZone(current_routing, zone->id, netmodel); - } else if (strcasecmp(zone->routing.c_str(),"ClusterFatTree") == 0) { - new_zone = new simgrid::kernel::routing::FatTreeZone(current_routing, zone->id, netmodel); - } else if (strcasecmp(zone->routing.c_str(),"Dijkstra") == 0) { - new_zone = new simgrid::kernel::routing::DijkstraZone(current_routing, zone->id, netmodel, false); - } else if (strcasecmp(zone->routing.c_str(),"DijkstraCache") == 0) { - new_zone = new simgrid::kernel::routing::DijkstraZone(current_routing, zone->id, netmodel, true); - } else if (strcasecmp(zone->routing.c_str(),"Floyd") == 0) { - new_zone = new simgrid::kernel::routing::FloydZone(current_routing, zone->id, netmodel); - } else if (strcasecmp(zone->routing.c_str(),"Full") == 0) { - new_zone = new simgrid::kernel::routing::FullZone(current_routing, zone->id, netmodel); - } else if (strcasecmp(zone->routing.c_str(),"None") == 0) { - new_zone = new simgrid::kernel::routing::EmptyZone(current_routing, zone->id, netmodel); - } else if (strcasecmp(zone->routing.c_str(),"Vivaldi") == 0) { - new_zone = new simgrid::kernel::routing::VivaldiZone(current_routing, zone->id, netmodel); + new_zone = new simgrid::kernel::routing::ClusterZone(current_routing, zone->id, netmodel); + } else if (strcasecmp(zone->routing.c_str(), "ClusterDragonfly") == 0) { + new_zone = new simgrid::kernel::routing::DragonflyZone(current_routing, zone->id, netmodel); + } else if (strcasecmp(zone->routing.c_str(), "ClusterTorus") == 0) { + new_zone = new simgrid::kernel::routing::TorusZone(current_routing, zone->id, netmodel); + } else if (strcasecmp(zone->routing.c_str(), "ClusterFatTree") == 0) { + new_zone = new simgrid::kernel::routing::FatTreeZone(current_routing, zone->id, netmodel); + } else if (strcasecmp(zone->routing.c_str(), "Dijkstra") == 0) { + new_zone = new simgrid::kernel::routing::DijkstraZone(current_routing, zone->id, netmodel, false); + } else if (strcasecmp(zone->routing.c_str(), "DijkstraCache") == 0) { + new_zone = new simgrid::kernel::routing::DijkstraZone(current_routing, zone->id, netmodel, true); + } else if (strcasecmp(zone->routing.c_str(), "Floyd") == 0) { + new_zone = new simgrid::kernel::routing::FloydZone(current_routing, zone->id, netmodel); + } else if (strcasecmp(zone->routing.c_str(), "Full") == 0) { + new_zone = new simgrid::kernel::routing::FullZone(current_routing, zone->id, netmodel); + } else if (strcasecmp(zone->routing.c_str(), "None") == 0) { + new_zone = new simgrid::kernel::routing::EmptyZone(current_routing, zone->id, netmodel); + } else if (strcasecmp(zone->routing.c_str(), "Vivaldi") == 0) { + new_zone = new simgrid::kernel::routing::VivaldiZone(current_routing, zone->id, netmodel); } else if (strcasecmp(zone->routing.c_str(), "Wifi") == 0) { new_zone = new simgrid::kernel::routing::WifiZone(current_routing, zone->id, netmodel); } else { @@ -639,26 +567,26 @@ void sg_platf_new_Zone_set_properties(const std::unordered_mapseal(); simgrid::s4u::NetZone::on_seal(*current_routing->get_iface()); current_routing = current_routing->get_father(); } -/** @brief Add a link connecting a host to the rest of its AS (which must be cluster or vivaldi) */ +/** @brief Add a link connecting a host to the rest of its Zone (which must be cluster or vivaldi) */ void sg_platf_new_hostlink(const simgrid::kernel::routing::HostLinkCreationArgs* hostlink) { const simgrid::kernel::routing::NetPoint* netpoint = simgrid::s4u::Host::by_name(hostlink->id)->get_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 a host_link."); + "Only hosts from Cluster and Vivaldi Zones can get a host_link."); const simgrid::s4u::Link* linkUp = simgrid::s4u::Link::by_name_or_null(hostlink->link_up); const simgrid::s4u::Link* linkDown = simgrid::s4u::Link::by_name_or_null(hostlink->link_down);