Move the latency computation logic from surf models to the routing module.

[simgrid.git] / src / surf / network.c

diff --git a/src/surf/network.c b/src/surf/network.c
index 5879b62..30792cf 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -144,7 +144,7 @@ static void net_parse_link_init(void)
   e_surf_resource_state_t state_initial_link = SURF_RESOURCE_ON;
   e_surf_link_sharing_policy_t policy_initial_link = SURF_LINK_SHARED;
   tmgr_trace_t state_trace;
-
+  DEBUG0("link_CM02");
   name_link = xbt_strdup(A_surfxml_link_id);
   surf_parse_get_double(&bw_initial, A_surfxml_link_bandwidth);
   bw_trace = tmgr_trace_new(A_surfxml_link_bandwidth_file);
@@ -159,18 +159,33 @@ static void net_parse_link_init(void)
   else if (A_surfxml_link_state == A_surfxml_link_state_OFF)
     state_initial_link = SURF_RESOURCE_OFF;
 
-  if (A_surfxml_link_sharing_policy ==
-      A_surfxml_link_sharing_policy_SHARED)
+  if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_SHARED)
     policy_initial_link = SURF_LINK_SHARED;
-  else if (A_surfxml_link_sharing_policy ==
-           A_surfxml_link_sharing_policy_FATPIPE)
-    policy_initial_link = SURF_LINK_FATPIPE;
+  else
+         {
+         if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FATPIPE)
+                 policy_initial_link = SURF_LINK_FATPIPE;
+         else if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX)
+                 policy_initial_link = SURF_LINK_FULLDUPLEX;
+         }
 
   state_trace = tmgr_trace_new(A_surfxml_link_state_file);
 
-  net_link_new(name_link, bw_initial, bw_trace,
-               lat_initial, lat_trace, state_initial_link, state_trace,
-               policy_initial_link, xbt_dict_new());
+  if(policy_initial_link == SURF_LINK_FULLDUPLEX)
+  {
+         net_link_new(bprintf("%s_UP",name_link), bw_initial, bw_trace,
+                      lat_initial, lat_trace, state_initial_link, state_trace,
+                      policy_initial_link, xbt_dict_new());
+         net_link_new(bprintf("%s_DOWN",name_link), bw_initial, bw_trace,
+                      lat_initial, lat_trace, state_initial_link, state_trace,
+                      policy_initial_link, xbt_dict_new());
+  }
+  else
+  {
+         net_link_new(name_link, bw_initial, bw_trace,
+                      lat_initial, lat_trace, state_initial_link, state_trace,
+                      policy_initial_link, xbt_dict_new());
+  }
 
 }
 
@@ -522,12 +537,14 @@ static surf_action_t net_communicate(const char *src_name,
      Add a link_CM02_t *link and a int link_nb to network_card_CM02_t. It will represent local links for this node
      Use the cluster_id for ->id */
 
-  xbt_dynar_t route = global_routing->get_route(src_name, dst_name);
   xbt_dynar_t back_route = NULL;
   int constraints_per_variable = 0;
+  // I will need this route for some time so let's call get_route_no_cleanup
+  xbt_dynar_t route = global_routing->get_route_no_cleanup(src_name, dst_name);
+
 
   if (sg_network_fullduplex == 1) {
-    back_route = global_routing->get_route(src_name, dst_name);
+    back_route = global_routing->get_route(dst_name, src_name);
   }
 
   /* LARGE PLATFORMS HACK:
@@ -643,6 +660,7 @@ static surf_action_t net_communicate(const char *src_name,
   strncpy(action->dst_name, dst_name, strlen(dst_name) + 1);
 #endif
 
+  xbt_dynar_free(&route);
   XBT_OUT;
 
   return (surf_action_t) action;
@@ -755,7 +773,8 @@ static void surf_network_model_init_internal(void)
                        net_link_new(xbt_strdup("__loopback__"),
                                     498000000, NULL, 0.000015, NULL,
                                     SURF_RESOURCE_ON, NULL,
-                                    SURF_LINK_FATPIPE, NULL));
+                                    SURF_LINK_FATPIPE, NULL),
+                        (double_f_pvoid_t)net_get_link_latency);
 }