X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/96cedde3cdbc0b8ffc3f096a1b65d021b0226f99..bde09a7b53c62986d6f22b10de50dec039b4f96a:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 4e5a096b60..6247def36c 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -3,6 +3,7 @@ /* 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/Exception.hpp" #include "simgrid/kernel/routing/ClusterZone.hpp" #include "simgrid/kernel/routing/DijkstraZone.hpp" #include "simgrid/kernel/routing/DragonflyZone.hpp" @@ -18,7 +19,8 @@ #include "src/include/simgrid/sg_config.hpp" #include "src/include/surf/surf.hpp" #include "src/kernel/EngineImpl.hpp" -#include "src/simix/smx_host_private.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" #include "src/surf/xml/platf_private.hpp" @@ -27,18 +29,19 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse); -XBT_PRIVATE std::map mount_list; +XBT_PRIVATE std::map mount_list; 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; +std::map storage_types; /** The current AS in the parsing */ static simgrid::kernel::routing::NetZoneImpl* current_routing = nullptr; @@ -50,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; @@ -74,27 +77,29 @@ 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); + routing_get_current()->create_host(args->id, args->speed_per_pstate, args->core_amount, &props); 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_trace(args->state_trace); + host->set_state_profile(args->state_trace); if (args->speed_trace) - host->pimpl_cpu->set_speed_trace(args->speed_trace); + host->set_speed_profile(args->speed_trace); if (args->pstate != 0) - host->pimpl_cpu->set_pstate(args->pstate); - if (args->coord && strcmp(args->coord, "")) - new simgrid::kernel::routing::vivaldi::Coords(host->pimpl_netpoint, args->coord); + host->set_pstate(args->pstate); + if (not args->coord.empty()) + new simgrid::kernel::routing::vivaldi::Coords(host->get_netpoint(), args->coord); } /** @brief Add a "router" to the network element list */ -simgrid::kernel::routing::NetPoint* sg_platf_new_router(std::string name, const char* coords) +simgrid::kernel::routing::NetPoint* sg_platf_new_router(const 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::get_instance()->netpoint_by_name_or_null(name), @@ -102,7 +107,7 @@ simgrid::kernel::routing::NetPoint* sg_platf_new_router(std::string name, const 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 %u", name.c_str(), netpoint->id()); + XBT_DEBUG("Router '%s' has the id %u", netpoint->get_cname(), netpoint->id()); if (coords && strcmp(coords, "")) new simgrid::kernel::routing::vivaldi::Coords(netpoint, coords); @@ -111,31 +116,30 @@ simgrid::kernel::routing::NetPoint* sg_platf_new_router(std::string name, const return netpoint; } -void sg_platf_new_link(simgrid::kernel::routing::LinkCreationArgs* link) +static void sg_platf_new_link(simgrid::kernel::routing::LinkCreationArgs* link, const std::string& link_name) { - std::vector names; + simgrid::kernel::resource::LinkImpl* l = + surf_network_model->create_link(link_name, link->bandwidths, link->latency, link->policy); - if (link->policy == simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX) { - names.push_back(link->id+ "_UP"); - names.push_back(link->id+ "_DOWN"); - } else { - names.push_back(link->id); + if (link->properties) { + l->set_properties(*link->properties); } - for (auto const& link_name : names) { - simgrid::kernel::resource::LinkImpl* l = - surf_network_model->create_link(link_name, link->bandwidth, link->latency, link->policy); - if (link->properties) { - for (auto const& elm : *link->properties) - l->set_property(elm.first, elm.second); - } + if (link->latency_trace) + l->set_latency_profile(link->latency_trace); + if (link->bandwidth_trace) + l->set_bandwidth_profile(link->bandwidth_trace); + if (link->state_trace) + l->set_state_profile(link->state_trace); +} - if (link->latency_trace) - l->set_latency_trace(link->latency_trace); - if (link->bandwidth_trace) - l->set_bandwidth_trace(link->bandwidth_trace); - if (link->state_trace) - l->set_state_trace(link->state_trace); +void sg_platf_new_link(simgrid::kernel::routing::LinkCreationArgs* link) +{ + if (link->policy == simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX) { + sg_platf_new_link(link, link->id + "_UP"); + sg_platf_new_link(link, link->id + "_DOWN"); + } else { + sg_platf_new_link(link, link->id); } delete link->properties; } @@ -169,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_++; @@ -187,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}); @@ -211,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); @@ -239,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); @@ -271,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; @@ -287,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; } @@ -310,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); @@ -330,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::surf::StorageType* stype; + const simgrid::kernel::resource::StorageType* stype; auto st = storage_types.find(storage->type_id); if (st != storage_types.end()) { stype = st->second; @@ -364,8 +381,7 @@ void sg_platf_new_storage(simgrid::kernel::routing::StorageCreationArgs* storage auto s = surf_storage_model->createStorage(storage->id, stype->id, storage->content, storage->attach); if (storage->properties) { - for (auto const& elm : *storage->properties) - s->set_property(elm.first, elm.second); + s->set_properties(*storage->properties); delete storage->properties; } } @@ -375,9 +391,9 @@ void sg_platf_new_storage_type(simgrid::kernel::routing::StorageTypeCreationArgs 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()); - 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); + simgrid::kernel::resource::StorageType* 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()); @@ -419,8 +435,8 @@ void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor) std::vector list = simgrid::s4u::Engine::get_instance()->get_all_hosts(); - for (auto const& host : list) { - msg += host->get_name(); + for (auto const& some_host : list) { + msg += some_host->get_name(); msg += "', '"; if (msg.length() > 1024) { msg.pop_back(); // remove trailing quote @@ -430,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)); @@ -444,34 +460,35 @@ 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); - SIMIX_timer_set(start_time, [arg, auto_restart]() { - smx_actor_t actor = SIMIX_process_create(arg->name.c_str(), std::move(arg->code), arg->data, arg->host, - arg->properties.get(), nullptr); + 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); if (arg->kill_time >= 0) - simcall_process_set_kill_time(actor, arg->kill_time); + new_actor->set_kill_time(arg->kill_time); if (auto_restart) - actor->set_auto_restart(auto_restart); + new_actor->set_auto_restart(auto_restart); delete arg; }); } else { // start_time <= SIMIX_get_clock() XBT_DEBUG("Starting Process %s(%s) right now", arg->name.c_str(), host->get_cname()); - smx_actor_t actor = - SIMIX_process_create(arg->name.c_str(), std::move(code), nullptr, host, arg->properties.get(), nullptr); - - /* The actor creation will fail if the host is currently dead, but that's fine */ - if (actor != nullptr) { + try { + simgrid::kernel::actor::ActorImplPtr new_actor = nullptr; + new_actor = simgrid::kernel::actor::ActorImpl::create(arg->name.c_str(), std::move(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) - simcall_process_set_kill_time(actor, arg->kill_time); + new_actor->set_kill_time(arg->kill_time); if (auto_restart) - actor->set_auto_restart(auto_restart); + new_actor->set_auto_restart(auto_restart); + } catch (simgrid::HostFailureException const&) { + XBT_WARN("Deployment includes some initially turned off Hosts ... nevermind."); } } } @@ -481,17 +498,17 @@ 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->create_host(peer->id.c_str(), &speedPerPstate, 1, nullptr); + 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); - 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_trace(peer->state_trace); + host->set_state_profile(peer->state_trace); if (peer->speed_trace) - host->pimpl_cpu->set_speed_trace(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 */ @@ -500,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 */ @@ -528,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(); @@ -546,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 @@ -619,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 * @@ -636,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 = sg_host_by_name(hostlink->id.c_str())->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()); @@ -656,15 +686,15 @@ void sg_platf_new_hostlink(simgrid::kernel::routing::HostLinkCreationArgs* hostl as_cluster->private_links_.insert({netpoint->id(), {linkUp->get_impl(), linkDown->get_impl()}}); } -void sg_platf_new_trace(simgrid::kernel::routing::TraceCreationArgs* trace) +void sg_platf_new_trace(simgrid::kernel::routing::ProfileCreationArgs* profile) { - tmgr_trace_t tmgr_trace; - if (not trace->file.empty()) { - tmgr_trace = tmgr_trace_new_from_file(trace->file); + simgrid::kernel::profile::Profile* mgr_profile; + if (not profile->file.empty()) { + mgr_profile = simgrid::kernel::profile::Profile::from_file(profile->file); } else { - 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_assert(not profile->pc_data.empty(), "Trace '%s' must have either a content, or point to a file on disk.", + profile->id.c_str()); + mgr_profile = simgrid::kernel::profile::Profile::from_string(profile->id, profile->pc_data, profile->periodicity); } - traces_set_list.insert({trace->id, tmgr_trace}); + traces_set_list.insert({profile->id, mgr_profile}); }