X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/27032003460976597e8a3fc709c0aae9fbc653a5..bde09a7b53c62986d6f22b10de50dec039b4f96a:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 21dd6c1989..6247def36c 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -19,6 +19,7 @@ #include "src/include/simgrid/sg_config.hpp" #include "src/include/surf/surf.hpp" #include "src/kernel/EngineImpl.hpp" +#include "src/kernel/resource/DiskImpl.hpp" #include "src/kernel/resource/profile/Profile.hpp" #include "src/simix/smx_private.hpp" #include "src/surf/HostImpl.hpp" @@ -32,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; @@ -51,13 +53,13 @@ static simgrid::kernel::routing::NetZoneImpl* routing_get_current() /** Module management function: creates all internal data structures */ void sg_platf_init() { - simgrid::s4u::on_platform_created.connect(check_disk_attachment); + simgrid::s4u::Engine::on_platform_created.connect(check_disk_attachment); } /** Module management function: frees all internal data structures */ void sg_platf_exit() { - simgrid::surf::on_cluster.disconnect_slots(); - simgrid::s4u::on_platform_created.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 */ surf_parse_models_setup_already_called = 0; @@ -80,15 +82,19 @@ void sg_platf_new_host(simgrid::kernel::routing::HostCreationArgs* args) host->pimpl_->storage_ = mount_list; mount_list.clear(); + host->pimpl_->disks_ = std::move(args->disks); + for (auto d : host->pimpl_->disks_) + d->set_host(host); + /* Change from the defaults */ if (args->state_trace) - host->pimpl_cpu->set_state_profile(args->state_trace); + host->set_state_profile(args->state_trace); if (args->speed_trace) - host->pimpl_cpu->set_speed_profile(args->speed_trace); + host->set_speed_profile(args->speed_trace); if (args->pstate != 0) - host->pimpl_cpu->set_pstate(args->pstate); + host->set_pstate(args->pstate); if (not args->coord.empty()) - new simgrid::kernel::routing::vivaldi::Coords(host->pimpl_netpoint, args->coord); + new simgrid::kernel::routing::vivaldi::Coords(host->get_netpoint(), args->coord); } /** @brief Add a "router" to the network element list */ @@ -113,7 +119,7 @@ simgrid::kernel::routing::NetPoint* sg_platf_new_router(const std::string& name, static void sg_platf_new_link(simgrid::kernel::routing::LinkCreationArgs* link, const std::string& link_name) { simgrid::kernel::resource::LinkImpl* l = - surf_network_model->create_link(link_name, link->bandwidth, link->latency, link->policy); + surf_network_model->create_link(link_name, link->bandwidths, link->latency, link->policy); if (link->properties) { l->set_properties(*link->properties); @@ -167,6 +173,9 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster 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->properties != nullptr) + 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){ current_as->num_links_per_node_++; @@ -185,9 +194,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}); @@ -209,15 +218,15 @@ 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); simgrid::kernel::routing::LinkCreationArgs link; link.id = tmp_link; - link.bandwidth = cluster->loopback_bw; + link.bandwidths.push_back(cluster->loopback_bw); link.latency = cluster->loopback_lat; link.policy = simgrid::s4u::Link::SharingPolicy::FATPIPE; sg_platf_new_link(&link); @@ -237,7 +246,7 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster simgrid::kernel::routing::LinkCreationArgs link; link.id = tmp_link; - link.bandwidth = cluster->limiter_link; + link.bandwidths.push_back(cluster->limiter_link); link.latency = 0; link.policy = simgrid::s4u::Link::SharingPolicy::SHARED; sg_platf_new_link(&link); @@ -269,10 +278,9 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster //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.bandwidth = cluster->bb_bw; + link.bandwidths.push_back(cluster->bb_bw); link.latency = cluster->bb_lat; link.policy = cluster->bb_sharing_policy; @@ -285,7 +293,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; } @@ -308,14 +316,14 @@ void sg_platf_new_cabinet(simgrid::kernel::routing::CabinetCreationArgs* cabinet 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); simgrid::kernel::routing::LinkCreationArgs link; link.policy = simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX; link.latency = cabinet->lat; - link.bandwidth = cabinet->bw; + link.bandwidths.push_back(cabinet->bw); link.id = "link_" + hostname; sg_platf_new_link(&link); @@ -328,12 +336,23 @@ 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* d = surf_disk_model->createDisk(disk->id, disk->read_bw, disk->write_bw); + if (disk->properties) { + d->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()); - 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; @@ -427,12 +446,12 @@ 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::simix::ActorCodeFactory& factory = SIMIX_get_actor_code_factory(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)); @@ -441,10 +460,9 @@ void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor) simgrid::kernel::actor::ProcessArg* arg = new simgrid::kernel::actor::ProcessArg(actor_name, code, nullptr, host, kill_time, properties, auto_restart); - host->pimpl_->actors_at_boot_.emplace_back(arg); + 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); @@ -482,15 +500,15 @@ void sg_platf_new_peer(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.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->pimpl_netpoint, peer->bw_in, peer->bw_out, peer->coord); + as->set_peer_link(host->get_netpoint(), peer->bw_in, peer->bw_out, peer->coord); /* Change from the defaults */ if (peer->state_trace) - host->pimpl_cpu->set_state_profile(peer->state_trace); + host->set_state_profile(peer->state_trace); if (peer->speed_trace) - host->pimpl_cpu->set_speed_profile(peer->speed_trace); + host->set_speed_profile(peer->speed_trace); } /* Pick the right models for CPU, net and host, and call their model_init_preparse */ @@ -499,6 +517,7 @@ static void surf_config_models_setup() 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 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 */ @@ -527,6 +546,10 @@ static void surf_config_models_setup() XBT_DEBUG("Call vm_model_init"); surf_vm_model_init_HL13(); + 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(); @@ -545,7 +568,7 @@ static void surf_config_models_setup() simgrid::kernel::routing::NetZoneImpl* sg_platf_new_Zone_begin(simgrid::kernel::routing::ZoneCreationArgs* zone) { if (not surf_parse_models_setup_already_called) { - simgrid::s4u::on_platform_creation(); + simgrid::s4u::Engine::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|zone|trace|trace_connect @@ -618,6 +641,14 @@ 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) +{ + xbt_assert(current_routing, "Cannot set properties of the current Zone: none under construction"); + + if (props) + current_routing->set_properties(*props); +} + /** * @brief Specify that the description of the current AS is finished * @@ -635,13 +666,13 @@ void sg_platf_new_Zone_seal() /** @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) { - simgrid::kernel::routing::NetPoint* netpoint = simgrid::s4u::Host::by_name(hostlink->id)->pimpl_netpoint; + 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());