throw signal from seal() directly

[simgrid.git] / src / surf / sg_platf.cpp

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index 613f2a9b7b9a4e74bc42ea26095912a2a1845903..0be5d5243f5503cfd3d349e68df4f43873e06782 100644 (file)
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -44,6 +44,7 @@ static simgrid::kernel::routing::NetZoneImpl* routing_get_current()
 {
   return current_routing;
 }
+static simgrid::s4u::Host* current_host = nullptr;
 
 /** Module management function: creates all internal data structures */
 void sg_platf_init()
@@ -61,40 +62,56 @@ void sg_platf_exit()
 }
 
 /** @brief Add a host to the current NetZone */
-void sg_platf_new_host(const simgrid::kernel::routing::HostCreationArgs* args)
+void sg_platf_new_host_begin(const simgrid::kernel::routing::HostCreationArgs* args)
 {
-  simgrid::s4u::Host* host = routing_get_current()
-                                 ->create_host(args->id, args->speed_per_pstate)
-                                 ->set_coordinates(args->coord)
-                                 ->set_properties(args->properties);
-
-  host->get_impl()->set_disks(args->disks);
+  current_host = routing_get_current()
+                     ->create_host(args->id, args->speed_per_pstate)
+                     ->set_coordinates(args->coord)
+                     ->set_core_count(args->core_amount)
+                     ->set_state_profile(args->state_trace)
+                     ->set_speed_profile(args->speed_trace);
+}
 
-  host->pimpl_cpu->set_core_count(args->core_amount)
-      ->set_state_profile(args->state_trace)
-      ->set_speed_profile(args->speed_trace);
+void sg_platf_new_host_set_properties(const std::unordered_map<std::string, std::string>& props)
+{
+  xbt_assert(current_host, "Cannot set properties of the current host: none under construction");
+  current_host->set_properties(props);
+}
 
-  host->seal();
+void sg_platf_new_host_seal(int pstate)
+{
+  xbt_assert(current_host, "Cannot seal the current Host: none under construction");
+  current_host->seal();
 
   /* 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);
+   * allocation is triggered by the on_creation signal. Then set_pstate must be called after the signal emission */
+
+  if (pstate != 0)
+    current_host->set_pstate(pstate);
+
+  current_host = nullptr;
+}
+
+void sg_platf_new_peer(const simgrid::kernel::routing::PeerCreationArgs* args)
+{
+  auto* zone = dynamic_cast<simgrid::kernel::routing::VivaldiZone*>(current_routing);
+  xbt_assert(zone, "<peer> tag can only be used in Vivaldi netzones.");
+
+  const auto* peer = zone->create_host(args->id, std::vector<double>{args->speed})
+                         ->set_state_profile(args->state_trace)
+                         ->set_speed_profile(args->speed_trace)
+                         ->set_coordinates(args->coord)
+                         ->seal();
+
+  zone->set_peer_link(peer->get_netpoint(), args->bw_in, args->bw_out);
 }
 
 /** @brief Add a "router" to the network element list */
 simgrid::kernel::routing::NetPoint* sg_platf_new_router(const std::string& name, const std::string& coords)
 {
-  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);
-  netpoint->set_englobing_zone(current_routing);
+  auto* netpoint = current_routing->create_router(name)->set_coordinates(coords);
   XBT_DEBUG("Router '%s' has the id %u", netpoint->get_cname(), netpoint->id());
 
-  if (not coords.empty())
-    netpoint->set_coordinates(coords);
-
   return netpoint;
 }
 
@@ -122,6 +139,17 @@ void sg_platf_new_link(const simgrid::kernel::routing::LinkCreationArgs* link)
   }
 }
 
+void sg_platf_new_disk(const simgrid::kernel::routing::DiskCreationArgs* disk)
+{
+  const simgrid::s4u::Disk* new_disk = routing_get_current()
+                                           ->create_disk(disk->id, disk->read_bw, disk->write_bw)
+                                           ->set_host(current_host)
+                                           ->set_properties(disk->properties)
+                                           ->seal();
+
+  current_host->add_disk(new_disk);
+}
+
 void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster)
 {
   using simgrid::kernel::routing::ClusterZone;
@@ -183,33 +211,34 @@ 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* loopback = nullptr;
     if (cluster->loopback_bw > 0 || cluster->loopback_lat > 0) {
       std::string loopback_name = link_id + "_loopback";
       XBT_DEBUG("<loopback\tid=\"%s\"\tbw=\"%f\"/>", loopback_name.c_str(), cluster->loopback_bw);
 
-      auto* loopback = current_zone->create_link(loopback_name, std::vector<double>{cluster->loopback_bw})
-                           ->set_sharing_policy(simgrid::s4u::Link::SharingPolicy::FATPIPE)
-                           ->set_latency(cluster->loopback_lat)
-                           ->seal()
-                           ->get_impl();
+      loopback = current_zone->create_link(loopback_name, std::vector<double>{cluster->loopback_bw})
+                     ->set_sharing_policy(simgrid::s4u::Link::SharingPolicy::FATPIPE)
+                     ->set_latency(cluster->loopback_lat)
+                     ->seal()
+                     ->get_impl();
 
       current_zone->add_private_link_at(current_zone->node_pos(rankId), {loopback, loopback});
     }
 
     // add a limiter link (shared link to account for maximal bandwidth of the node)
+    simgrid::kernel::resource::LinkImpl* limiter = nullptr;
     if (cluster->limiter_link > 0) {
       std::string limiter_name = std::string(link_id) + "_limiter";
       XBT_DEBUG("<limiter\tid=\"%s\"\tbw=\"%f\"/>", limiter_name.c_str(), cluster->limiter_link);
 
-      auto* limiter =
-          current_zone->create_link(limiter_name, std::vector<double>{cluster->limiter_link})->seal()->get_impl();
+      limiter = current_zone->create_link(limiter_name, std::vector<double>{cluster->limiter_link})->seal()->get_impl();
 
       current_zone->add_private_link_at(current_zone->node_pos_with_loopback(rankId), {limiter, limiter});
     }
 
     // call the cluster function that adds the others links
     if (cluster->topology == simgrid::kernel::routing::ClusterTopology::FAT_TREE) {
-      static_cast<FatTreeZone*>(current_zone)->add_processing_node(i);
+      static_cast<FatTreeZone*>(current_zone)->add_processing_node(i, limiter, loopback);
     } else {
       current_zone->create_links_for_node(cluster, i, rankId, current_zone->node_pos_with_loopback_limiter(rankId));
     }
@@ -221,7 +250,7 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster
   XBT_DEBUG("<router id=\"%s\"/>", cluster->router_id.c_str());
   if (cluster->router_id.empty())
     cluster->router_id = std::string(cluster->prefix) + cluster->id + "_router" + cluster->suffix;
-  current_zone->set_router(sg_platf_new_router(cluster->router_id, ""));
+  current_zone->set_router(current_zone->create_router(cluster->router_id));
 
   // Make the backbone
   if ((cluster->bb_bw > 0) || (cluster->bb_lat > 0)) {
@@ -232,8 +261,9 @@ void sg_platf_new_cluster(simgrid::kernel::routing::ClusterCreationArgs* cluster
     auto* backbone = current_zone->create_link(bb_name, std::vector<double>{cluster->bb_bw})
                          ->set_sharing_policy(cluster->bb_sharing_policy)
                          ->set_latency(cluster->bb_lat)
-                         ->seal();
-    current_zone->set_backbone(backbone->get_impl());
+                         ->seal()
+                         ->get_impl();
+    current_zone->set_backbone(backbone);
   }
 
   XBT_DEBUG("</zone>");
@@ -253,34 +283,23 @@ void routing_cluster_add_backbone(simgrid::kernel::resource::LinkImpl* bb)
   XBT_DEBUG("Add a backbone to zone '%s'", current_routing->get_cname());
 }
 
-void sg_platf_new_cabinet(const simgrid::kernel::routing::CabinetCreationArgs* cabinet)
+void sg_platf_new_cabinet(const simgrid::kernel::routing::CabinetCreationArgs* args)
 {
   auto* zone = static_cast<simgrid::kernel::routing::ClusterZone*>(routing_get_current());
-  for (int const& radical : cabinet->radicals) {
-    std::string id           = cabinet->prefix + std::to_string(radical) + cabinet->suffix;
-    simgrid::s4u::Host* host = zone->create_host(id, std::vector<double>{cabinet->speed})->seal();
+  for (int const& radical : args->radicals) {
+    std::string id   = args->prefix + std::to_string(radical) + args->suffix;
+    auto const* host = zone->create_host(id, std::vector<double>{args->speed})->seal();
 
-    simgrid::s4u::Link* link_up =
-        zone->create_link("link_" + id + "_UP", std::vector<double>{cabinet->bw})->set_latency(cabinet->lat)->seal();
-    simgrid::s4u::Link* link_down =
-        zone->create_link("link_" + id + "_DOWN", std::vector<double>{cabinet->bw})->set_latency(cabinet->lat)->seal();
+    const auto* link_up =
+        zone->create_link("link_" + id + "_UP", std::vector<double>{args->bw})->set_latency(args->lat)->seal();
+
+    const auto* link_down =
+        zone->create_link("link_" + id + "_DOWN", std::vector<double>{args->bw})->set_latency(args->lat)->seal();
 
     zone->add_private_link_at(host->get_netpoint()->id(), {link_up->get_impl(), link_down->get_impl()});
   }
 }
 
-simgrid::kernel::resource::DiskImpl* sg_platf_new_disk(const simgrid::kernel::routing::DiskCreationArgs* disk)
-{
-  simgrid::kernel::resource::DiskImpl* pimpl = routing_get_current()
-                                                   ->create_disk(disk->id, disk->read_bw, disk->write_bw)
-                                                   ->set_properties(disk->properties)
-                                                   ->get_impl();
-
-  pimpl->seal();
-  simgrid::s4u::Disk::on_creation(*pimpl->get_iface());
-  return pimpl;
-}
-
 void sg_platf_new_route(simgrid::kernel::routing::RouteCreationArgs* route)
 {
   routing_get_current()->add_route(route->src, route->dst, route->gw_src, route->gw_dst, route->link_list,
@@ -336,8 +355,9 @@ void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor)
 
     XBT_DEBUG("Process %s@%s will be started at time %f", arg->name.c_str(), arg->host->get_cname(), start_time);
     simgrid::simix::Timer::set(start_time, [arg, auto_restart]() {
-      simgrid::kernel::actor::ActorImplPtr new_actor = simgrid::kernel::actor::ActorImpl::create(
-          arg->name.c_str(), arg->code, arg->data, arg->host, arg->properties, nullptr);
+      simgrid::kernel::actor::ActorImplPtr new_actor =
+          simgrid::kernel::actor::ActorImpl::create(arg->name.c_str(), arg->code, arg->data, arg->host, nullptr);
+      new_actor->set_properties(arg->properties);
       if (arg->kill_time >= 0)
         new_actor->set_kill_time(arg->kill_time);
       if (auto_restart)
@@ -349,8 +369,8 @@ void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor)
 
     try {
       simgrid::kernel::actor::ActorImplPtr new_actor = nullptr;
-      new_actor =
-          simgrid::kernel::actor::ActorImpl::create(arg->name.c_str(), code, nullptr, host, arg->properties, nullptr);
+      new_actor = simgrid::kernel::actor::ActorImpl::create(arg->name.c_str(), code, nullptr, host, nullptr);
+      new_actor->set_properties(arg->properties);
       /* The actor creation will fail if the host is currently dead, but that's fine */
       if (arg->kill_time >= 0)
         new_actor->set_kill_time(arg->kill_time);
@@ -362,19 +382,6 @@ void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor)
   }
 }
 
-void sg_platf_new_peer(const simgrid::kernel::routing::PeerCreationArgs* peer)
-{
-  auto* zone = dynamic_cast<simgrid::kernel::routing::VivaldiZone*>(current_routing);
-  xbt_assert(zone, "<peer> tag can only be used in Vivaldi netzones.");
-
-  simgrid::s4u::Host* host = zone->create_host(peer->id, std::vector<double>{peer->speed})
-                                 ->set_state_profile(peer->state_trace)
-                                 ->set_speed_profile(peer->speed_trace)
-                                 ->set_coordinates(peer->coord)
-                                 ->seal();
-
-  zone->set_peer_link(host->get_netpoint(), peer->bw_in, peer->bw_out);
-}
 /**
  * @brief Auxiliary function to build the object NetZoneImpl
  *
@@ -461,9 +468,8 @@ void sg_platf_new_Zone_set_properties(const std::unordered_map<std::string, std:
  */
 void sg_platf_new_Zone_seal()
 {
-  xbt_assert(current_routing, "Cannot seal the current Zone: zone under construction");
+  xbt_assert(current_routing, "Cannot seal the current Zone: none under construction");
   current_routing->seal();
-  simgrid::s4u::NetZone::on_seal(*current_routing->get_iface());
   current_routing = current_routing->get_parent();
 }
 
@@ -490,15 +496,15 @@ void sg_platf_new_hostlink(const simgrid::kernel::routing::HostLinkCreationArgs*
   cluster_zone->add_private_link_at(netpoint->id(), {linkUp->get_impl(), linkDown->get_impl()});
 }
 
-void sg_platf_new_trace(simgrid::kernel::routing::ProfileCreationArgs* profile)
+void sg_platf_new_trace(simgrid::kernel::routing::ProfileCreationArgs* args)
 {
-  simgrid::kernel::profile::Profile* mgr_profile;
-  if (not profile->file.empty()) {
-    mgr_profile = simgrid::kernel::profile::Profile::from_file(profile->file);
+  simgrid::kernel::profile::Profile* profile;
+  if (not args->file.empty()) {
+    profile = simgrid::kernel::profile::Profile::from_file(args->file);
   } else {
-    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);
+    xbt_assert(not args->pc_data.empty(), "Trace '%s' must have either a content, or point to a file on disk.",
+               args->id.c_str());
+    profile = simgrid::kernel::profile::Profile::from_string(args->id, args->pc_data, args->periodicity);
   }
-  traces_set_list.insert({profile->id, mgr_profile});
+  traces_set_list.insert({args->id, profile});
 }