X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d1428a44b2e13f8c22afcb04c3315b6adbe6be85..fc8be6494932e66a359ae5d47103a566cc8234f4:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 6498e13057..a5ce276ac8 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -16,6 +16,7 @@ #include "simgrid/kernel/routing/VivaldiZone.hpp" #include "simgrid/s4u/Engine.hpp" #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/simix/smx_private.hpp" @@ -54,8 +55,8 @@ void sg_platf_init() /** Module management function: frees all internal data structures */ void sg_platf_exit() { - simgrid::surf::on_cluster.disconnectSlots(); - simgrid::s4u::on_platform_created.disconnectSlots(); + simgrid::surf::on_cluster.disconnect_slots(); + simgrid::s4u::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; @@ -122,7 +123,7 @@ void sg_platf_new_link(simgrid::kernel::routing::LinkCreationArgs* link) } for (auto const& link_name : names) { simgrid::kernel::resource::LinkImpl* l = - surf_network_model->createLink(link_name, link->bandwidth, link->latency, link->policy); + surf_network_model->create_link(link_name, link->bandwidth, link->latency, link->policy); if (link->properties) { for (auto const& elm : *link->properties) @@ -188,7 +189,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}); @@ -437,13 +438,13 @@ void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor) bool auto_restart = actor->on_failure != simgrid::kernel::routing::ActorOnFailure::DIE; std::string actor_name = actor->args[0]; - std::function code = factory(std::move(actor->args)); - std::shared_ptr> properties(actor->properties); + simgrid::simix::ActorCode code = factory(std::move(actor->args)); + 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); - host->extension()->boot_processes.push_back(arg); + host->pimpl_->boot_processes_.push_back(arg); if (start_time > SIMIX_get_clock()) { @@ -456,7 +457,7 @@ void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor) if (arg->kill_time >= 0) simcall_process_set_kill_time(actor, arg->kill_time); if (auto_restart) - SIMIX_process_auto_restart_set(actor, auto_restart); + actor->set_auto_restart(auto_restart); delete arg; }); } else { // start_time <= SIMIX_get_clock() @@ -470,7 +471,7 @@ void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor) if (arg->kill_time >= 0) simcall_process_set_kill_time(actor, arg->kill_time); if (auto_restart) - SIMIX_process_auto_restart_set(actor, auto_restart); + actor->set_auto_restart(auto_restart); } } } @@ -484,7 +485,7 @@ void sg_platf_new_peer(simgrid::kernel::routing::PeerCreationArgs* peer) speedPerPstate.push_back(peer->speed); simgrid::s4u::Host* host = as->create_host(peer->id.c_str(), &speedPerPstate, 1, nullptr); - as->setPeerLink(host->pimpl_netpoint, peer->bw_in, peer->bw_out, peer->coord); + as->set_peer_link(host->pimpl_netpoint, peer->bw_in, peer->bw_out, peer->coord); /* Change from the defaults */ if (peer->state_trace) @@ -542,17 +543,17 @@ static void surf_config_models_setup() * * @param zone the parameters defining the Zone to build. */ -simgrid::s4u::NetZone* sg_platf_new_Zone_begin(simgrid::kernel::routing::ZoneCreationArgs* zone) +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(); /* 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 + * That is, after the last tag, if any, and before the first of cluster|peer|zone|trace|trace_connect * * I'm not sure for and , there may be a bug here * (FIXME: check it out by creating a file beginning with one of these tags) - * but cluster and peer create ASes internally, so putting the code in there is ok. + * but cluster and peer come down to zone creations, so putting this verification here is correct. */ surf_parse_models_setup_already_called = 1; surf_config_models_setup(); @@ -563,36 +564,38 @@ simgrid::s4u::NetZone* sg_platf_new_Zone_begin(simgrid::kernel::routing::ZoneCre /* search the routing model */ simgrid::kernel::routing::NetZoneImpl* new_zone = nullptr; + simgrid::kernel::resource::NetworkModel* netmodel = + current_routing == nullptr ? surf_network_model : current_routing->network_model_; switch (zone->routing) { case A_surfxml_AS_routing_Cluster: - new_zone = new simgrid::kernel::routing::ClusterZone(current_routing, zone->id); + new_zone = new simgrid::kernel::routing::ClusterZone(current_routing, zone->id, netmodel); break; case A_surfxml_AS_routing_ClusterDragonfly: - new_zone = new simgrid::kernel::routing::DragonflyZone(current_routing, zone->id); + new_zone = new simgrid::kernel::routing::DragonflyZone(current_routing, zone->id, netmodel); break; case A_surfxml_AS_routing_ClusterTorus: - new_zone = new simgrid::kernel::routing::TorusZone(current_routing, zone->id); + new_zone = new simgrid::kernel::routing::TorusZone(current_routing, zone->id, netmodel); break; case A_surfxml_AS_routing_ClusterFatTree: - new_zone = new simgrid::kernel::routing::FatTreeZone(current_routing, zone->id); + new_zone = new simgrid::kernel::routing::FatTreeZone(current_routing, zone->id, netmodel); break; case A_surfxml_AS_routing_Dijkstra: - new_zone = new simgrid::kernel::routing::DijkstraZone(current_routing, zone->id, false); + new_zone = new simgrid::kernel::routing::DijkstraZone(current_routing, zone->id, netmodel, false); break; case A_surfxml_AS_routing_DijkstraCache: - new_zone = new simgrid::kernel::routing::DijkstraZone(current_routing, zone->id, true); + new_zone = new simgrid::kernel::routing::DijkstraZone(current_routing, zone->id, netmodel, true); break; case A_surfxml_AS_routing_Floyd: - new_zone = new simgrid::kernel::routing::FloydZone(current_routing, zone->id); + new_zone = new simgrid::kernel::routing::FloydZone(current_routing, zone->id, netmodel); break; case A_surfxml_AS_routing_Full: - new_zone = new simgrid::kernel::routing::FullZone(current_routing, zone->id); + new_zone = new simgrid::kernel::routing::FullZone(current_routing, zone->id, netmodel); break; case A_surfxml_AS_routing_None: - new_zone = new simgrid::kernel::routing::EmptyZone(current_routing, zone->id); + new_zone = new simgrid::kernel::routing::EmptyZone(current_routing, zone->id, netmodel); break; case A_surfxml_AS_routing_Vivaldi: - new_zone = new simgrid::kernel::routing::VivaldiZone(current_routing, zone->id); + new_zone = new simgrid::kernel::routing::VivaldiZone(current_routing, zone->id, netmodel); break; default: xbt_die("Not a valid model!"); @@ -600,18 +603,18 @@ simgrid::s4u::NetZone* sg_platf_new_Zone_begin(simgrid::kernel::routing::ZoneCre } if (current_routing == nullptr) { /* it is the first one */ - simgrid::s4u::Engine::get_instance()->set_netzone_root(new_zone); + simgrid::s4u::Engine::get_instance()->set_netzone_root(new_zone->get_iface()); } 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(new_zone); } /* set the new current component of the tree */ current_routing = new_zone; - simgrid::s4u::NetZone::on_creation(*new_zone); // notify the signal + simgrid::s4u::NetZone::on_creation(*new_zone->get_iface()); // notify the signal return new_zone; } @@ -626,7 +629,7 @@ 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); + simgrid::s4u::NetZone::on_seal(*current_routing->get_iface()); current_routing = static_cast(current_routing->get_father()); }