Cosmetics (and please scan-build about potential null surf_action_).

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

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index bc82d2d..37e952b 100644 (file)
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -100,9 +100,9 @@ simgrid::kernel::routing::NetPoint* sg_platf_new_router(std::string name, const
   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 =
-      new simgrid::kernel::routing::NetPoint(name, simgrid::kernel::routing::NetPoint::Type::Router, current_routing);
-  XBT_DEBUG("Router '%s' has the id %u", name.c_str(), netpoint->id());
+  simgrid::kernel::routing::NetPoint* netpoint = new simgrid::kernel::routing::NetPoint(
+      std::move(name), simgrid::kernel::routing::NetPoint::Type::Router, 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);
@@ -111,31 +111,31 @@ simgrid::kernel::routing::NetPoint* sg_platf_new_router(std::string name, const
   return netpoint;
 }
 
-void sg_platf_new_link(simgrid::kernel::routing::LinkCreationArgs* link)
+static void sg_platf_new_link(simgrid::kernel::routing::LinkCreationArgs* link, const std::string& link_name)
 {
-  std::vector<std::string> names;
+  simgrid::kernel::resource::LinkImpl* l =
+      surf_network_model->create_link(link_name, link->bandwidth, link->latency, link->policy);
 
-  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);
+  if (link->properties) {
+    for (auto const& elm : *link->properties)
+      l->set_property(elm.first, elm.second);
   }
-  for (auto const& link_name : names) {
-    simgrid::kernel::resource::LinkImpl* l =
-        surf_network_model->create_link(link_name, link->bandwidth, link->latency, link->policy);
 
-    if (link->properties) {
-      for (auto const& elm : *link->properties)
-        l->set_property(elm.first, elm.second);
-    }
+  if (link->latency_trace)
+    l->set_latency_profile(link->latency_trace);
+  if (link->bandwidth_trace)
+    l->set_bandwidth_profile(link->bandwidth_trace);
+  if (link->state_trace)
+    l->set_state_profile(link->state_trace);
+}
 
-    if (link->latency_trace)
-      l->set_latency_profile(link->latency_trace);
-    if (link->bandwidth_trace)
-      l->set_bandwidth_profile(link->bandwidth_trace);
-    if (link->state_trace)
-      l->set_state_profile(link->state_trace);
+void sg_platf_new_link(simgrid::kernel::routing::LinkCreationArgs* link)
+{
+  if (link->policy == simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX) {
+    sg_platf_new_link(link, link->id + "_UP");
+    sg_platf_new_link(link, link->id + "_DOWN");
+  } else {
+    sg_platf_new_link(link, link->id);
   }
   delete link->properties;
 }