X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cdc03fc96da89f61950be092cf6b7ac069075e29..b9625f82f86db0674e911887addce45dca31b57f:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index c86fbbbb7b..e493ca1b28 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2020. 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. */ @@ -33,11 +33,12 @@ XBT_PRIVATE std::map mount XBT_PRIVATE std::vector known_storages; namespace simgrid { -namespace surf { - -simgrid::xbt::signal on_cluster; -} -} +namespace kernel { +namespace routing { +xbt::signal on_cluster_creation; +} // namespace routing +} // namespace kernel +} // namespace simgrid static int surf_parse_models_setup_already_called = 0; std::map storage_types; @@ -57,7 +58,7 @@ void sg_platf_init() /** Module management function: frees all internal data structures */ void sg_platf_exit() { - simgrid::surf::on_cluster.disconnect_slots(); + simgrid::kernel::routing::on_cluster_creation.disconnect_slots(); simgrid::s4u::Engine::on_platform_created.disconnect_slots(); /* make sure that we will reinit the models while loading the platf once reinited */ @@ -66,7 +67,7 @@ void sg_platf_exit() { } /** @brief Add a host to the current AS */ -void sg_platf_new_host(simgrid::kernel::routing::HostCreationArgs* args) +void sg_platf_new_host(const simgrid::kernel::routing::HostCreationArgs* args) { std::map props; if (args->properties) { @@ -78,12 +79,10 @@ void sg_platf_new_host(simgrid::kernel::routing::HostCreationArgs* args) simgrid::s4u::Host* host = routing_get_current()->create_host(args->id, args->speed_per_pstate, args->core_amount, &props); - host->pimpl_->storage_ = mount_list; + host->pimpl_->set_storages(mount_list); mount_list.clear(); - host->pimpl_->disks_ = std::move(args->disks); - for (auto d : host->pimpl_->disks_) - d->set_host(host); + host->pimpl_->set_disks(args->disks, host); /* Change from the defaults */ if (args->state_trace) @@ -115,8 +114,15 @@ simgrid::kernel::routing::NetPoint* sg_platf_new_router(const std::string& name, return netpoint; } -static void sg_platf_new_link(simgrid::kernel::routing::LinkCreationArgs* link, const std::string& link_name) +static void sg_platf_new_link(const simgrid::kernel::routing::LinkCreationArgs* link, const std::string& link_name) { + static double last_warned_latency = sg_surf_precision; + if (link->latency != 0.0 && link->latency < last_warned_latency) { + XBT_WARN("Latency for link %s is smaller than surf/precision (%g < %g)." + " For more accuracy, consider setting \"--cfg=surf/precision:%g\".", + link_name.c_str(), link->latency, sg_surf_precision, link->latency); + last_warned_latency = link->latency; + } simgrid::kernel::resource::LinkImpl* l = surf_network_model->create_link(link_name, link->bandwidths, link->latency, link->policy); @@ -132,7 +138,7 @@ static void sg_platf_new_link(simgrid::kernel::routing::LinkCreationArgs* link, l->set_state_profile(link->state_trace); } -void sg_platf_new_link(simgrid::kernel::routing::LinkCreationArgs* link) +void sg_platf_new_link(const simgrid::kernel::routing::LinkCreationArgs* link) { if (link->policy == simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX) { sg_platf_new_link(link, link->id + "_UP"); @@ -193,9 +199,9 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster XBT_DEBUG("", host_id.c_str(), cluster->speeds.front()); simgrid::kernel::routing::HostCreationArgs host; - host.id = host_id.c_str(); + host.id = host_id; if ((cluster->properties != nullptr) && (not cluster->properties->empty())) { - host.properties = new std::unordered_map; + host.properties = new std::unordered_map(); for (auto const& elm : *cluster->properties) host.properties->insert({elm.first, elm.second}); @@ -217,8 +223,8 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster // other columns are to store one or more link for the node //add a loopback link - simgrid::s4u::Link* linkUp = nullptr; - simgrid::s4u::Link* linkDown = nullptr; + const simgrid::s4u::Link* linkUp = nullptr; + const 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); @@ -232,7 +238,7 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster 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); + ClusterZone* as_cluster = current_as; as_cluster->private_links_.insert({as_cluster->node_pos(rankId), {linkUp->get_impl(), linkDown->get_impl()}}); } @@ -268,16 +274,12 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster // Add a router. XBT_DEBUG(" "); 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); - } else { - current_as->router_ = sg_platf_new_router(cluster->router_id, NULL); - } + 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); //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.bandwidths.push_back(cluster->bb_bw); @@ -293,7 +295,7 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster XBT_DEBUG(""); sg_platf_new_Zone_seal(); - simgrid::surf::on_cluster(*cluster); + simgrid::kernel::routing::on_cluster_creation(*cluster); delete cluster->radicals; } @@ -309,14 +311,14 @@ void routing_cluster_add_backbone(simgrid::kernel::resource::LinkImpl* bb) XBT_DEBUG("Add a backbone to AS '%s'", current_routing->get_cname()); } -void sg_platf_new_cabinet(simgrid::kernel::routing::CabinetCreationArgs* cabinet) +void sg_platf_new_cabinet(const simgrid::kernel::routing::CabinetCreationArgs* cabinet) { 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.c_str(); + host.id = hostname; host.speed_per_pstate.push_back(cabinet->speed); sg_platf_new_host(&host); @@ -336,7 +338,7 @@ void sg_platf_new_cabinet(simgrid::kernel::routing::CabinetCreationArgs* cabinet delete cabinet->radicals; } -simgrid::kernel::resource::DiskImpl* sg_platf_new_disk(simgrid::kernel::routing::DiskCreationArgs* disk) +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); if (disk->properties) { @@ -352,7 +354,7 @@ 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()); - simgrid::kernel::resource::StorageType* stype; + const simgrid::kernel::resource::StorageType* stype; auto st = storage_types.find(storage->type_id); if (st != storage_types.end()) { stype = st->second; @@ -378,7 +380,8 @@ void sg_platf_new_storage(simgrid::kernel::routing::StorageCreationArgs* storage 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); + 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); @@ -386,7 +389,7 @@ void sg_platf_new_storage(simgrid::kernel::routing::StorageCreationArgs* storage } } -void sg_platf_new_storage_type(simgrid::kernel::routing::StorageTypeCreationArgs* storage_type) +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()); @@ -446,15 +449,16 @@ void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor) } xbt_die("%s", msg.c_str()); } - simgrid::simix::ActorCodeFactory& factory = SIMIX_get_actor_code_factory(actor->function); + const simgrid::kernel::actor::ActorCodeFactory& factory = + simgrid::kernel::EngineImpl::get_instance()->get_function(actor->function); xbt_assert(factory, "Error while creating an actor from the XML file: Function '%s' not registered", actor->function); double start_time = actor->start_time; double kill_time = actor->kill_time; - bool auto_restart = actor->on_failure != simgrid::kernel::routing::ActorOnFailure::DIE; + bool auto_restart = actor->restart_on_failure; std::string actor_name = actor->args[0]; - simgrid::simix::ActorCode code = factory(std::move(actor->args)); + simgrid::kernel::actor::ActorCode code = factory(std::move(actor->args)); std::shared_ptr> properties(actor->properties); simgrid::kernel::actor::ProcessArg* arg = @@ -463,7 +467,6 @@ void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor) host->pimpl_->add_actor_at_boot(arg); if (start_time > SIMIX_get_clock()) { - 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); @@ -494,14 +497,14 @@ void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor) } } -void sg_platf_new_peer(simgrid::kernel::routing::PeerCreationArgs* peer) +void sg_platf_new_peer(const 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 speed_per_pstate; speed_per_pstate.push_back(peer->speed); - simgrid::s4u::Host* host = as->create_host(peer->id.c_str(), speed_per_pstate, 1, nullptr); + simgrid::s4u::Host* host = as->create_host(peer->id, speed_per_pstate, 1, nullptr); as->set_peer_link(host->get_netpoint(), peer->bw_in, peer->bw_out, peer->coord); @@ -566,7 +569,7 @@ static void surf_config_models_setup() * * @param zone the parameters defining the Zone to build. */ -simgrid::kernel::routing::NetZoneImpl* sg_platf_new_Zone_begin(simgrid::kernel::routing::ZoneCreationArgs* zone) +simgrid::kernel::routing::NetZoneImpl* sg_platf_new_Zone_begin(const simgrid::kernel::routing::ZoneCreationArgs* zone) { if (not surf_parse_models_setup_already_called) { simgrid::s4u::Engine::on_platform_creation(); @@ -642,12 +645,12 @@ simgrid::kernel::routing::NetZoneImpl* sg_platf_new_Zone_begin(simgrid::kernel:: return new_zone; } -void sg_platf_new_Zone_set_properties(std::unordered_map* props) +void sg_platf_new_Zone_set_properties(const std::unordered_map* props) { xbt_assert(current_routing, "Cannot set properties of the current Zone: none under construction"); - for (auto kv = props->begin(); kv != props->end(); ++kv) - current_routing->get_iface()->set_property(kv->first, kv->second); + if (props) + current_routing->set_properties(*props); } /** @@ -661,19 +664,19 @@ void sg_platf_new_Zone_seal() xbt_assert(current_routing, "Cannot seal the current AS: none under construction"); current_routing->seal(); simgrid::s4u::NetZone::on_seal(*current_routing->get_iface()); - current_routing = static_cast(current_routing->get_father()); + 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) */ -void sg_platf_new_hostlink(simgrid::kernel::routing::HostLinkCreationArgs* hostlink) +void sg_platf_new_hostlink(const simgrid::kernel::routing::HostLinkCreationArgs* hostlink) { - simgrid::kernel::routing::NetPoint* netpoint = simgrid::s4u::Host::by_name(hostlink->id)->get_netpoint(); + 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."); - 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); + 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); xbt_assert(linkUp, "Link '%s' not found!", hostlink->link_up.c_str()); xbt_assert(linkDown, "Link '%s' not found!", hostlink->link_down.c_str());