X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f3a267e5ba376a0f0313767a12d518ffdeaa7196..51c23076e2b42ff07dc167dea1cb0e3a4ab3cf68:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 10f6747be9..cff7f9e696 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -15,13 +15,11 @@ #include "simgrid/kernel/routing/TorusZone.hpp" #include "simgrid/kernel/routing/VivaldiZone.hpp" #include "simgrid/s4u/Engine.hpp" -#include "simgrid/s4u/Storage.hpp" #include "src/include/simgrid/sg_config.hpp" #include "src/kernel/EngineImpl.hpp" +#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/surf/xml/platf_private.hpp" #include @@ -50,13 +48,14 @@ static simgrid::kernel::routing::NetZoneImpl* routing_get_current() /** Module management function: creates all internal data structures */ void sg_platf_init() -{ /* Do nothing: just for symmetry of user code */ +{ + 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.disconnectSlots(); - simgrid::s4u::onPlatformCreated.disconnectSlots(); + simgrid::s4u::on_platform_created.disconnectSlots(); /* make sure that we will reinit the models while loading the platf once reinited */ surf_parse_models_setup_already_called = 0; @@ -81,11 +80,11 @@ void sg_platf_new_host(simgrid::kernel::routing::HostCreationArgs* args) /* 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->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); } @@ -97,7 +96,7 @@ simgrid::kernel::routing::NetPoint* sg_platf_new_router(std::string name, const 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::getInstance()->getNetpointByNameOrNull(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 = @@ -115,19 +114,19 @@ void sg_platf_new_link(simgrid::kernel::routing::LinkCreationArgs* link) { std::vector names; - if (link->policy == SURF_LINK_SPLITDUPLEX) { + 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); } for (auto const& link_name : names) { - simgrid::surf::LinkImpl* l = + simgrid::kernel::resource::LinkImpl* l = surf_network_model->createLink(link_name, link->bandwidth, link->latency, link->policy); if (link->properties) { for (auto const& elm : *link->properties) - l->setProperty(elm.first, elm.second); + l->set_property(elm.first, elm.second); } if (link->latency_trace) @@ -211,8 +210,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::surf::LinkImpl* linkUp = nullptr; - simgrid::surf::LinkImpl* linkDown = nullptr; + simgrid::kernel::resource::LinkImpl* linkUp = nullptr; + simgrid::kernel::resource::LinkImpl* 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); @@ -221,10 +220,10 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster 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 = simgrid::surf::LinkImpl::byName(tmp_link); - linkDown = simgrid::surf::LinkImpl::byName(tmp_link); + linkUp = simgrid::kernel::resource::LinkImpl::byName(tmp_link); + linkDown = simgrid::kernel::resource::LinkImpl::byName(tmp_link); auto* as_cluster = static_cast(current_as); as_cluster->private_links_.insert({as_cluster->node_pos(rankId), {linkUp, linkDown}}); @@ -241,9 +240,9 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster 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); - linkDown = simgrid::surf::LinkImpl::byName(tmp_link); + linkDown = simgrid::kernel::resource::LinkImpl::byName(tmp_link); linkUp = linkDown; current_as->private_links_.insert({current_as->node_pos_with_loopback(rankId), {linkUp, linkDown}}); } @@ -280,7 +279,7 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster XBT_DEBUG("", link.id.c_str(), cluster->bb_bw, cluster->bb_lat); sg_platf_new_link(&link); - routing_cluster_add_backbone(simgrid::surf::LinkImpl::byName(link.id)); + routing_cluster_add_backbone(simgrid::kernel::resource::LinkImpl::byName(link.id)); } XBT_DEBUG(""); @@ -290,7 +289,7 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* 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); @@ -314,7 +313,7 @@ void sg_platf_new_cabinet(simgrid::kernel::routing::CabinetCreationArgs* cabinet sg_platf_new_host(&host); simgrid::kernel::routing::LinkCreationArgs link; - link.policy = SURF_LINK_SPLITDUPLEX; + link.policy = simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX; link.latency = cabinet->lat; link.bandwidth = cabinet->bw; link.id = "link_" + hostname; @@ -364,7 +363,7 @@ void sg_platf_new_storage(simgrid::kernel::routing::StorageCreationArgs* storage if (storage->properties) { for (auto const& elm : *storage->properties) - s->setProperty(elm.first, elm.second); + s->set_property(elm.first, elm.second); delete storage->properties; } } @@ -393,7 +392,7 @@ void sg_platf_new_mount(simgrid::kernel::routing::MountCreationArgs* mount) if (mount_list.empty()) XBT_DEBUG("Create a Mount list for %s", A_surfxml_host_id); - mount_list.insert({mount->name, simgrid::s4u::Engine::getInstance()->storageByName(mount->storageId)->getImpl()}); + mount_list.insert({mount->name, simgrid::s4u::Engine::get_instance()->storage_by_name(mount->storageId)->getImpl()}); } void sg_platf_new_route(simgrid::kernel::routing::RouteCreationArgs* route) @@ -416,7 +415,7 @@ void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor) std::string msg = std::string("Cannot create actor '") + actor->function + "': host '" + actor->host + "' does not exist\nExisting hosts: '"; - std::vector list = simgrid::s4u::Engine::getInstance()->getAllHosts(); + std::vector list = simgrid::s4u::Engine::get_instance()->get_all_hosts(); for (auto const& host : list) { msg += host->get_name(); @@ -488,30 +487,24 @@ void sg_platf_new_peer(simgrid::kernel::routing::PeerCreationArgs* peer) /* 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->set_speed_trace(peer->speed_trace); } -void sg_platf_begin() { /* Do nothing: just for symmetry of user code */ } - -void sg_platf_end() { - simgrid::s4u::onPlatformCreated(); -} - /* Pick the right models for CPU, net and host, and call their model_init_preparse */ static void surf_config_models_setup() { - std::string host_model_name = xbt_cfg_get_string("host/model"); - std::string network_model_name = xbt_cfg_get_string("network/model"); - std::string cpu_model_name = xbt_cfg_get_string("cpu/model"); - std::string 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 ((not xbt_cfg_is_default_value("network/model") || not 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.c_str()); + simgrid::config::set_value("host/model", host_model_name); } XBT_DEBUG("host model: %s", host_model_name.c_str()); @@ -551,6 +544,8 @@ static void surf_config_models_setup() simgrid::s4u::NetZone* sg_platf_new_Zone_begin(simgrid::kernel::routing::ZoneCreationArgs* zone) { 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 * @@ -604,10 +599,7 @@ simgrid::s4u::NetZone* sg_platf_new_Zone_begin(simgrid::kernel::routing::ZoneCre } if (current_routing == nullptr) { /* it is the first one */ - xbt_assert(simgrid::s4u::Engine::getInstance()->pimpl->netRoot_ == nullptr, - "All defined components must belong to a networking zone."); - simgrid::s4u::Engine::getInstance()->pimpl->netRoot_ = new_zone; - + 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) @@ -618,7 +610,6 @@ simgrid::s4u::NetZone* sg_platf_new_Zone_begin(simgrid::kernel::routing::ZoneCre /* set the new current component of the tree */ current_routing = new_zone; - simgrid::s4u::NetZone::onCreation(*new_zone); // notify the signal return new_zone; @@ -646,8 +637,8 @@ void sg_platf_new_hostlink(simgrid::kernel::routing::HostLinkCreationArgs* hostl xbt_assert(dynamic_cast(current_routing), "Only hosts from Cluster and Vivaldi ASes can get an host_link."); - simgrid::surf::LinkImpl* linkUp = simgrid::surf::LinkImpl::byName(hostlink->link_up); - simgrid::surf::LinkImpl* linkDown = simgrid::surf::LinkImpl::byName(hostlink->link_down); + simgrid::kernel::resource::LinkImpl* linkUp = simgrid::kernel::resource::LinkImpl::byName(hostlink->link_up); + simgrid::kernel::resource::LinkImpl* linkDown = simgrid::kernel::resource::LinkImpl::byName(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());