X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0fa053f89a0b5f34a050f4790925d9d63ac11073..9da45f53bdedff9ac9320a7a3c2ac1d5b9184ce2:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index c8057adcbb..24def5ed79 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -48,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; @@ -79,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); } @@ -95,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 = @@ -113,7 +114,7 @@ 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 { @@ -125,15 +126,15 @@ void sg_platf_new_link(simgrid::kernel::routing::LinkCreationArgs* link) 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) - l->setLatencyTrace(link->latency_trace); + l->set_latency_trace(link->latency_trace); if (link->bandwidth_trace) - l->setBandwidthTrace(link->bandwidth_trace); + l->set_bandwidth_trace(link->bandwidth_trace); if (link->state_trace) - l->setStateTrace(link->state_trace); + l->set_state_trace(link->state_trace); } delete link->properties; } @@ -187,7 +188,7 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster simgrid::kernel::routing::HostCreationArgs host; host.id = host_id.c_str(); if ((cluster->properties != nullptr) && (not cluster->properties->empty())) { - host.properties = new std::map; + host.properties = new std::unordered_map; for (auto const& elm : *cluster->properties) host.properties->insert({elm.first, elm.second}); @@ -209,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::kernel::resource::LinkImpl* linkUp = nullptr; - simgrid::kernel::resource::LinkImpl* linkDown = nullptr; + simgrid::s4u::Link* linkUp = nullptr; + 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); @@ -219,13 +220,13 @@ 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::kernel::resource::LinkImpl::byName(tmp_link); - linkDown = simgrid::kernel::resource::LinkImpl::byName(tmp_link); + 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); - as_cluster->private_links_.insert({as_cluster->node_pos(rankId), {linkUp, linkDown}}); + 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) @@ -239,11 +240,12 @@ 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::kernel::resource::LinkImpl::byName(tmp_link); + linkDown = simgrid::s4u::Link::by_name_or_null(tmp_link); linkUp = linkDown; - current_as->private_links_.insert({current_as->node_pos_with_loopback(rankId), {linkUp, linkDown}}); + current_as->private_links_.insert( + {current_as->node_pos_with_loopback(rankId), {linkUp->get_impl(), linkDown->get_impl()}}); } //call the cluster function that adds the others links @@ -278,7 +280,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::kernel::resource::LinkImpl::byName(link.id)); + routing_cluster_add_backbone(simgrid::s4u::Link::by_name(link.id)->get_impl()); } XBT_DEBUG(""); @@ -312,7 +314,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; @@ -362,7 +364,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; } } @@ -391,7 +393,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)->get_impl()}); } void sg_platf_new_route(simgrid::kernel::routing::RouteCreationArgs* route) @@ -414,7 +416,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(); @@ -436,7 +438,7 @@ void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor) std::string actor_name = actor->args[0]; std::function code = factory(std::move(actor->args)); - std::shared_ptr> properties(actor->properties); + std::shared_ptr> properties(actor->properties); simgrid::kernel::actor::ProcessArg* arg = new simgrid::kernel::actor::ProcessArg(actor_name, code, nullptr, host, kill_time, properties, auto_restart); @@ -486,30 +488,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()); @@ -549,6 +545,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 * @@ -602,22 +600,18 @@ 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) current_routing->hierarchy_ = simgrid::kernel::routing::NetZoneImpl::RoutingMode::recursive; /* add to the sons dictionary */ - current_routing->getChildren()->push_back(static_cast(new_zone)); + current_routing->get_children()->push_back(static_cast(new_zone)); } /* set the new current component of the tree */ current_routing = new_zone; - - simgrid::s4u::NetZone::onCreation(*new_zone); // notify the signal + simgrid::s4u::NetZone::on_creation(*new_zone); // notify the signal return new_zone; } @@ -632,8 +626,8 @@ void sg_platf_new_Zone_seal() { xbt_assert(current_routing, "Cannot seal the current AS: none under construction"); current_routing->seal(); - simgrid::s4u::NetZone::onSeal(*current_routing); - current_routing = static_cast(current_routing->getFather()); + simgrid::s4u::NetZone::on_seal(*current_routing); + current_routing = static_cast(current_routing->get_father()); } /** @brief Add a link connecting an host to the rest of its AS (which must be cluster or vivaldi) */ @@ -644,8 +638,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::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); + 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); 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,7 +650,7 @@ void sg_platf_new_hostlink(simgrid::kernel::routing::HostLinkCreationArgs* hostl surf_parse_error(std::string("Host_link for '") + hostlink->id.c_str() + "' is already defined!"); XBT_DEBUG("Push Host_link for host '%s' to position %u", netpoint->get_cname(), netpoint->id()); - as_cluster->private_links_.insert({netpoint->id(), {linkUp, linkDown}}); + as_cluster->private_links_.insert({netpoint->id(), {linkUp->get_impl(), linkDown->get_impl()}}); } void sg_platf_new_trace(simgrid::kernel::routing::TraceCreationArgs* trace)