deduplicate the code creating fullduplex links and regular ones

diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp
index b53f312..6034eae 100644 (file)
--- a/src/surf/network_interface.cpp
+++ b/src/surf/network_interface.cpp
@@ -102,38 +102,25 @@ namespace simgrid {
 }
 
 void netlink_parse_init(sg_platf_link_cbarg_t link){
-  if (link->policy == SURF_LINK_FULLDUPLEX) {
-    char *link_id;
-    link_id = bprintf("%s_UP", link->id);
-    Link *l = surf_network_model->createLink(link_id, link->bandwidth, link->latency,
-        link->policy, link->properties);
-    if (link->latency_trace)
-      l->setLatencyTrace(link->latency_trace);
-    if (link->bandwidth_trace)
-      l->setBandwidthTrace(link->bandwidth_trace);
-    if (link->state_trace)
-      l->setStateTrace(link->state_trace);
+  std::vector<char*> names;
 
-    xbt_free(link_id);
-    link_id = bprintf("%s_DOWN", link->id);
-    l = surf_network_model->createLink(link_id, link->bandwidth, link->latency,
-        link->policy, link->properties);
-    if (link->latency_trace)
-      l->setLatencyTrace(link->latency_trace);
-    if (link->bandwidth_trace)
-      l->setBandwidthTrace(link->bandwidth_trace);
-    if (link->state_trace)
-      l->setStateTrace(link->state_trace);
-    xbt_free(link_id);
+  if (link->policy == SURF_LINK_FULLDUPLEX) {
+    names.push_back(bprintf("%s_UP", link->id));
+    names.push_back(bprintf("%s_DOWN", link->id));
   } else {
-    Link *l=surf_network_model->createLink(link->id, link->bandwidth, link->latency,
-        link->policy, link->properties);
+    names.push_back(xbt_strdup(link->id));
+  }
+  for (auto link_name : names) {
+    Link *l = surf_network_model->createLink(link_name, link->bandwidth, link->latency, link->policy, link->properties);
+
     if (link->latency_trace)
       l->setLatencyTrace(link->latency_trace);
     if (link->bandwidth_trace)
       l->setBandwidthTrace(link->bandwidth_trace);
     if (link->state_trace)
       l->setStateTrace(link->state_trace);
+
+    xbt_free(link_name);
   }
 }