X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ed62e57b88a7b804d2dcd3eae08d26671fd0cff2..4504b542f9d6cb7a6ee10762e9b779a049684428:/src/surf/sg_platf.cpp

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index 809225f15d..c71b8b2dda 100644
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -54,7 +54,8 @@ void sg_platf_init()
 }
 
 /** Module management function: frees all internal data structures */
-void sg_platf_exit() {
+void sg_platf_exit()
+{
   simgrid::kernel::routing::on_cluster_creation.disconnect_slots();
   simgrid::s4u::Engine::on_platform_created.disconnect_slots();
 
@@ -66,16 +67,13 @@ void sg_platf_exit() {
 /** @brief Add a host to the current AS */
 void sg_platf_new_host(const simgrid::kernel::routing::HostCreationArgs* args)
 {
-  std::unordered_map<std::string, std::string> props;
+  simgrid::s4u::Host* host = routing_get_current()->create_host(args->id, args->speed_per_pstate, args->core_amount);
+
   if (args->properties) {
-    for (auto const& elm : *args->properties)
-      props.insert({elm.first, elm.second});
+    host->set_properties(*args->properties);
     delete args->properties;
   }
 
-  simgrid::s4u::Host* host =
-      routing_get_current()->create_host(args->id, args->speed_per_pstate, args->core_amount, &props);
-
   host->pimpl_->set_disks(args->disks, host);
 
   /* Change from the defaults */
@@ -83,10 +81,15 @@ void sg_platf_new_host(const simgrid::kernel::routing::HostCreationArgs* args)
     host->set_state_profile(args->state_trace);
   if (args->speed_trace)
     host->set_speed_profile(args->speed_trace);
-  if (args->pstate != 0)
-    host->set_pstate(args->pstate);
   if (not args->coord.empty())
     new simgrid::kernel::routing::vivaldi::Coords(host->get_netpoint(), args->coord);
+
+  simgrid::s4u::Host::on_creation(*host); // notify the signal
+
+  /* When energy plugin is activated, changing the pstate requires to already have the HostEnergy extension whose
+   * allocation is triggered by the on_creation signal. Then set_pstate must be called after the signal emition */
+  if (args->pstate != 0)
+    host->set_pstate(args->pstate);
 }
 
 /** @brief Add a "router" to the network element list */
@@ -97,26 +100,24 @@ simgrid::kernel::routing::NetPoint* sg_platf_new_router(const std::string& 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());
 
-  auto* netpoint =
-      new simgrid::kernel::routing::NetPoint(name, simgrid::kernel::routing::NetPoint::Type::Router, current_routing);
+  auto* netpoint = new simgrid::kernel::routing::NetPoint(name, simgrid::kernel::routing::NetPoint::Type::Router);
+  netpoint->set_englobing_zone(current_routing);
   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);
 
-
   return netpoint;
 }
 
 static void sg_platf_new_link(const simgrid::kernel::routing::LinkCreationArgs* args, const std::string& link_name)
 {
-  std::unordered_map<std::string, std::string> props;
-  if (args->properties)
-    for (auto const& elm : *args->properties)
-      props.insert({elm.first, elm.second});
+  simgrid::s4u::Link* link = routing_get_current()->create_link(link_name, args->bandwidths, args->policy);
+  if (args->policy != simgrid::s4u::Link::SharingPolicy::WIFI)
+    link->get_impl()->set_latency(args->latency);
 
-  const simgrid::s4u::Link* link =
-      routing_get_current()->create_link(link_name, args->bandwidths, args->latency, args->policy, &props);
+  if (args->properties)
+    link->set_properties(*args->properties);
 
   simgrid::kernel::resource::LinkImpl* l = link->get_impl();
   if (args->latency_trace)
@@ -125,6 +126,8 @@ static void sg_platf_new_link(const simgrid::kernel::routing::LinkCreationArgs*
     l->set_bandwidth_profile(args->bandwidth_trace);
   if (args->state_trace)
     l->set_state_profile(args->state_trace);
+
+  link->seal();
 }
 
 void sg_platf_new_link(const simgrid::kernel::routing::LinkCreationArgs* link)
@@ -145,7 +148,7 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster
   using simgrid::kernel::routing::FatTreeZone;
   using simgrid::kernel::routing::TorusZone;
 
-  int rankId=0;
+  int rankId = 0;
 
   // What an inventive way of initializing the AS that I have as ancestor :-(
   simgrid::kernel::routing::ZoneCreationArgs zone;
@@ -171,12 +174,12 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster
     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){
+  if (cluster->loopback_bw > 0 || cluster->loopback_lat > 0) {
     current_as->num_links_per_node_++;
     current_as->has_loopback_ = true;
   }
 
-  if(cluster->limiter_link > 0){
+  if (cluster->limiter_link > 0) {
     current_as->num_links_per_node_++;
     current_as->has_limiter_ = true;
   }
@@ -197,9 +200,9 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster
     }
 
     host.speed_per_pstate = cluster->speeds;
-    host.pstate = 0;
-    host.core_amount = cluster->core_amount;
-    host.coord = "";
+    host.pstate           = 0;
+    host.core_amount      = cluster->core_amount;
+    host.coord            = "";
     sg_platf_new_host(&host);
     XBT_DEBUG("</host>");
 
@@ -211,18 +214,18 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster
     // the second column may store a limiter link if p_has_limiter is set
     // other columns are to store one or more link for the node
 
-    //add a loopback link
+    // add a loopback link
     const simgrid::s4u::Link* linkUp   = nullptr;
     const simgrid::s4u::Link* linkDown = nullptr;
-    if(cluster->loopback_bw > 0 || cluster->loopback_lat > 0){
+    if (cluster->loopback_bw > 0 || cluster->loopback_lat > 0) {
       std::string tmp_link = link_id + "_loopback";
       XBT_DEBUG("<loopback\tid=\"%s\"\tbw=\"%f\"/>", tmp_link.c_str(), cluster->loopback_bw);
 
       simgrid::kernel::routing::LinkCreationArgs link;
-      link.id        = tmp_link;
+      link.id = tmp_link;
       link.bandwidths.push_back(cluster->loopback_bw);
-      link.latency   = cluster->loopback_lat;
-      link.policy    = simgrid::s4u::Link::SharingPolicy::FATPIPE;
+      link.latency = cluster->loopback_lat;
+      link.policy  = simgrid::s4u::Link::SharingPolicy::FATPIPE;
       sg_platf_new_link(&link);
       linkUp   = simgrid::s4u::Link::by_name_or_null(tmp_link);
       linkDown = simgrid::s4u::Link::by_name_or_null(tmp_link);
@@ -231,18 +234,18 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster
       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)
+    // add a limiter link (shared link to account for maximal bandwidth of the node)
     linkUp   = nullptr;
     linkDown = nullptr;
-    if(cluster->limiter_link > 0){
+    if (cluster->limiter_link > 0) {
       std::string tmp_link = std::string(link_id) + "_limiter";
       XBT_DEBUG("<limiter\tid=\"%s\"\tbw=\"%f\"/>", tmp_link.c_str(), cluster->limiter_link);
 
       simgrid::kernel::routing::LinkCreationArgs link;
-      link.id        = tmp_link;
+      link.id = tmp_link;
       link.bandwidths.push_back(cluster->limiter_link);
       link.latency = 0;
-      link.policy    = simgrid::s4u::Link::SharingPolicy::SHARED;
+      link.policy  = simgrid::s4u::Link::SharingPolicy::SHARED;
       sg_platf_new_link(&link);
       linkDown = simgrid::s4u::Link::by_name_or_null(tmp_link);
       linkUp   = linkDown;
@@ -250,7 +253,7 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster
           {current_as->node_pos_with_loopback(rankId), {linkUp->get_impl(), linkDown->get_impl()}});
     }
 
-    //call the cluster function that adds the others links
+    // call the cluster function that adds the others links
     if (cluster->topology == simgrid::kernel::routing::ClusterTopology::FAT_TREE) {
       static_cast<FatTreeZone*>(current_as)->add_processing_node(i);
     } else {
@@ -267,13 +270,13 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster
     cluster->router_id = std::string(cluster->prefix) + cluster->id + "_router" + cluster->suffix;
   current_as->router_ = sg_platf_new_router(cluster->router_id, nullptr);
 
-  //Make the backbone
+  // 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.id = std::string(cluster->id) + "_backbone";
     link.bandwidths.push_back(cluster->bb_bw);
-    link.latency   = cluster->bb_lat;
-    link.policy    = cluster->bb_sharing_policy;
+    link.latency = cluster->bb_lat;
+    link.policy  = cluster->bb_sharing_policy;
 
     XBT_DEBUG("<link\tid=\"%s\" bw=\"%f\" lat=\"%f\"/>", link.id.c_str(), cluster->bb_bw, cluster->bb_lat);
     sg_platf_new_link(&link);
@@ -304,17 +307,17 @@ void sg_platf_new_cabinet(const simgrid::kernel::routing::CabinetCreationArgs* c
   for (int const& radical : *cabinet->radicals) {
     std::string hostname = cabinet->prefix + std::to_string(radical) + cabinet->suffix;
     simgrid::kernel::routing::HostCreationArgs host;
-    host.pstate           = 0;
-    host.core_amount      = 1;
-    host.id               = hostname;
+    host.pstate      = 0;
+    host.core_amount = 1;
+    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.policy  = simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX;
+    link.latency = cabinet->lat;
     link.bandwidths.push_back(cabinet->bw);
-    link.id        = "link_" + hostname;
+    link.id = "link_" + hostname;
     sg_platf_new_link(&link);
 
     simgrid::kernel::routing::HostLinkCreationArgs host_link;
@@ -328,13 +331,17 @@ void sg_platf_new_cabinet(const simgrid::kernel::routing::CabinetCreationArgs* c
 
 simgrid::kernel::resource::DiskImpl* sg_platf_new_disk(const simgrid::kernel::routing::DiskCreationArgs* disk)
 {
-  simgrid::kernel::resource::DiskImpl* d = surf_disk_model->createDisk(disk->id, disk->read_bw, disk->write_bw);
+  simgrid::kernel::resource::DiskImpl* pimpl =
+      routing_get_current()->create_disk(disk->id, disk->read_bw, disk->write_bw)->get_impl();
+
   if (disk->properties) {
-    d->set_properties(*disk->properties);
+    pimpl->set_properties(*disk->properties);
     delete disk->properties;
   }
-  simgrid::s4u::Disk::on_creation(*d->get_iface());
-  return d;
+
+  pimpl->seal();
+  simgrid::s4u::Disk::on_creation(*pimpl->get_iface());
+  return pimpl;
 }
 
 void sg_platf_new_route(simgrid::kernel::routing::RouteCreationArgs* route)
@@ -378,7 +385,7 @@ void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor)
   double kill_time  = actor->kill_time;
   bool auto_restart = actor->restart_on_failure;
 
-  std::string actor_name     = actor->args[0];
+  std::string actor_name                 = actor->args[0];
   simgrid::kernel::actor::ActorCode code = factory(std::move(actor->args));
   std::shared_ptr<std::unordered_map<std::string, std::string>> properties(actor->properties);
 
@@ -400,7 +407,7 @@ void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor)
         new_actor->set_auto_restart(auto_restart);
       delete arg;
     });
-  } else {                      // start_time <= SIMIX_get_clock()
+  } else { // start_time <= SIMIX_get_clock()
     XBT_DEBUG("Starting Process %s(%s) right now", arg->name.c_str(), host->get_cname());
 
     try {
@@ -425,7 +432,7 @@ void sg_platf_new_peer(const simgrid::kernel::routing::PeerCreationArgs* peer)
 
   std::vector<double> speed_per_pstate;
   speed_per_pstate.push_back(peer->speed);
-  simgrid::s4u::Host* host = as->create_host(peer->id, speed_per_pstate, 1, nullptr);
+  simgrid::s4u::Host* host = as->create_host(peer->id, speed_per_pstate, 1);
 
   as->set_peer_link(host->get_netpoint(), peer->bw_in, peer->bw_out, peer->coord);
 
@@ -434,6 +441,7 @@ void sg_platf_new_peer(const simgrid::kernel::routing::PeerCreationArgs* peer)
     host->set_state_profile(peer->state_trace);
   if (peer->speed_trace)
     host->set_speed_profile(peer->speed_trace);
+  simgrid::s4u::Host::on_creation(*host); // notify the signal
 }
 
 /* Pick the right models for CPU, net and host, and call their model_init_preparse */
@@ -475,6 +483,64 @@ static void surf_config_models_setup()
   surf_disk_model_description[disk_id].model_init_preparse();
 }
 
+/**
+ * @brief Auxiliary function to build the object NetZoneImpl
+ *
+ * Builds the objects, setting its father properties and root netzone if needed
+ * @param zone the parameters defining the Zone to build.
+ * @return Pointer to recently created netzone
+ */
+static simgrid::kernel::routing::NetZoneImpl*
+sg_platf_create_zone(const simgrid::kernel::routing::ZoneCreationArgs* zone)
+{
+  /* search the routing model */
+  simgrid::kernel::routing::NetZoneImpl* new_zone = nullptr;
+
+  if (strcasecmp(zone->routing.c_str(), "Cluster") == 0) {
+    new_zone = new simgrid::kernel::routing::ClusterZone(zone->id);
+  } else if (strcasecmp(zone->routing.c_str(), "ClusterDragonfly") == 0) {
+    new_zone = new simgrid::kernel::routing::DragonflyZone(zone->id);
+  } else if (strcasecmp(zone->routing.c_str(), "ClusterTorus") == 0) {
+    new_zone = new simgrid::kernel::routing::TorusZone(zone->id);
+  } else if (strcasecmp(zone->routing.c_str(), "ClusterFatTree") == 0) {
+    new_zone = new simgrid::kernel::routing::FatTreeZone(zone->id);
+  } else if (strcasecmp(zone->routing.c_str(), "Dijkstra") == 0) {
+    new_zone = new simgrid::kernel::routing::DijkstraZone(zone->id, false);
+  } else if (strcasecmp(zone->routing.c_str(), "DijkstraCache") == 0) {
+    new_zone = new simgrid::kernel::routing::DijkstraZone(zone->id, true);
+  } else if (strcasecmp(zone->routing.c_str(), "Floyd") == 0) {
+    new_zone = new simgrid::kernel::routing::FloydZone(zone->id);
+  } else if (strcasecmp(zone->routing.c_str(), "Full") == 0) {
+    new_zone = new simgrid::kernel::routing::FullZone(zone->id);
+  } else if (strcasecmp(zone->routing.c_str(), "None") == 0) {
+    new_zone = new simgrid::kernel::routing::EmptyZone(zone->id);
+  } else if (strcasecmp(zone->routing.c_str(), "Vivaldi") == 0) {
+    new_zone = new simgrid::kernel::routing::VivaldiZone(zone->id);
+  } else if (strcasecmp(zone->routing.c_str(), "Wifi") == 0) {
+    new_zone = new simgrid::kernel::routing::WifiZone(zone->id);
+  } else {
+    xbt_die("Not a valid model!");
+  }
+  new_zone->set_parent(current_routing);
+
+  if (current_routing == nullptr) { /* it is the first one */
+    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->get_children()->push_back(new_zone);
+    /* set models from parent netzone */
+    new_zone->set_network_model(current_routing->get_network_model());
+    new_zone->set_cpu_pm_model(current_routing->get_cpu_pm_model());
+    new_zone->set_cpu_vm_model(current_routing->get_cpu_vm_model());
+    new_zone->set_disk_model(current_routing->get_disk_model());
+    new_zone->set_host_model(current_routing->get_host_model());
+  }
+  return new_zone;
+}
+
 /**
  * @brief Add a Zone to the platform
  *
@@ -487,6 +553,12 @@ static void surf_config_models_setup()
  */
 simgrid::kernel::routing::NetZoneImpl* sg_platf_new_Zone_begin(const simgrid::kernel::routing::ZoneCreationArgs* zone)
 {
+  /* First create the zone.
+   * This order is important to assure that root netzone is set when models are setting
+   * the default mode for each resource (CPU, network, etc)
+   */
+  auto* new_zone = sg_platf_create_zone(zone);
+
   if (not surf_parse_models_setup_already_called) {
     simgrid::s4u::Engine::on_platform_creation();
 
@@ -504,46 +576,6 @@ simgrid::kernel::routing::NetZoneImpl* sg_platf_new_Zone_begin(const simgrid::ke
   _sg_cfg_init_status = 2; /* HACK: direct access to the global controlling the level of configuration to prevent
                             * any further config now that we created some real content */
 
-  /* 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_;
-  if (strcasecmp(zone->routing.c_str(), "Cluster") == 0) {
-      new_zone = new simgrid::kernel::routing::ClusterZone(current_routing, zone->id, netmodel);
-  } else if (strcasecmp(zone->routing.c_str(),"ClusterDragonfly") == 0) {
-      new_zone = new simgrid::kernel::routing::DragonflyZone(current_routing, zone->id, netmodel);
-  } else if (strcasecmp(zone->routing.c_str(),"ClusterTorus") == 0) {
-      new_zone = new simgrid::kernel::routing::TorusZone(current_routing, zone->id, netmodel);
-  } else if (strcasecmp(zone->routing.c_str(),"ClusterFatTree") == 0) {
-      new_zone = new simgrid::kernel::routing::FatTreeZone(current_routing, zone->id, netmodel);
-  } else if (strcasecmp(zone->routing.c_str(),"Dijkstra") == 0) {
-      new_zone = new simgrid::kernel::routing::DijkstraZone(current_routing, zone->id, netmodel, false);
-  } else if (strcasecmp(zone->routing.c_str(),"DijkstraCache") == 0) {
-      new_zone = new simgrid::kernel::routing::DijkstraZone(current_routing, zone->id, netmodel, true);
-  } else if (strcasecmp(zone->routing.c_str(),"Floyd") == 0) {
-      new_zone = new simgrid::kernel::routing::FloydZone(current_routing, zone->id, netmodel);
-  } else if (strcasecmp(zone->routing.c_str(),"Full") == 0) {
-      new_zone = new simgrid::kernel::routing::FullZone(current_routing, zone->id, netmodel);
-  } else if (strcasecmp(zone->routing.c_str(),"None") == 0) {
-      new_zone = new simgrid::kernel::routing::EmptyZone(current_routing, zone->id, netmodel);
-  } else if (strcasecmp(zone->routing.c_str(),"Vivaldi") == 0) {
-      new_zone = new simgrid::kernel::routing::VivaldiZone(current_routing, zone->id, netmodel);
-  } else if (strcasecmp(zone->routing.c_str(), "Wifi") == 0) {
-    new_zone = new simgrid::kernel::routing::WifiZone(current_routing, zone->id, netmodel);
-  } else {
-    xbt_die("Not a valid model!");
-  }
-
-  if (current_routing == nullptr) { /* it is the first one */
-    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->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->get_iface()); // notify the signal
@@ -560,26 +592,26 @@ void sg_platf_new_Zone_set_properties(const std::unordered_map<std::string, std:
 }
 
 /**
- * @brief Specify that the description of the current AS is finished
+ * @brief Specify that the description of the current Zone is finished
  *
- * Once you've declared all the content of your AS, you have to seal
- * it with this call. Your AS is not usable until you call this function.
+ * Once you've declared all the content of your Zone, you have to seal
+ * it with this call. Your Zone is not usable until you call this function.
  */
 void sg_platf_new_Zone_seal()
 {
-  xbt_assert(current_routing, "Cannot seal the current AS: none under construction");
+  xbt_assert(current_routing, "Cannot seal the current Zone: zone under construction");
   current_routing->seal();
   simgrid::s4u::NetZone::on_seal(*current_routing->get_iface());
   current_routing = current_routing->get_father();
 }
 
-/** @brief Add a link connecting a host to the rest of its AS (which must be cluster or vivaldi) */
+/** @brief Add a link connecting a host to the rest of its Zone (which must be cluster or vivaldi) */
 void sg_platf_new_hostlink(const simgrid::kernel::routing::HostLinkCreationArgs* hostlink)
 {
   const 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<simgrid::kernel::routing::ClusterZone*>(current_routing),
-             "Only hosts from Cluster and Vivaldi ASes can get a host_link.");
+             "Only hosts from Cluster and Vivaldi Zones can get a host_link.");
 
   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);