use more consistently the resource create of models, killing some useless/borken...

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

diff --git a/src/surf/network.c b/src/surf/network.c
index bbdd940..f1b96a1 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -153,7 +153,7 @@ static double (*bandwidth_constraint_callback) (double, double, double) =
     &constant_bandwidth_constraint;
 
 
-static link_CM02_t net_link_new(char *name,
+static void* net_create_resource(char *name,
                                 double bw_initial,
                                 tmgr_trace_t bw_trace,
                                 double lat_initial,
@@ -229,38 +229,22 @@ static void net_parse_link_init(void)
 
   if(policy_initial_link == SURF_LINK_FULLDUPLEX)
   {
-         net_link_new(bprintf("%s_UP",name_link), bw_initial, bw_trace,
+    net_create_resource(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,
+    net_create_resource(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,
+    net_create_resource(name_link, bw_initial, bw_trace,
                       lat_initial, lat_trace, state_initial_link, state_trace,
                       policy_initial_link, xbt_dict_new());
   }
 
 }
 
-static void net_create_resource(char *name,
-                                double bw_initial,
-                                tmgr_trace_t bw_trace,
-                                double lat_initial,
-                                tmgr_trace_t lat_trace,
-                                e_surf_resource_state_t
-                                state_initial,
-                                tmgr_trace_t state_trace,
-                                e_surf_link_sharing_policy_t policy,
-                                xbt_dict_t properties)
-{
-  net_link_new(name, bw_initial, bw_trace,
-               lat_initial, lat_trace, state_initial, state_trace,
-               policy, xbt_dict_new());
-}
-
 static void net_add_traces(void)
 {
   xbt_dict_cursor_t cursor = NULL;
@@ -437,7 +421,7 @@ static void net_update_actions_state(double now, double delta)
                                    action->weight);
     }
 #ifdef HAVE_TRACING
-    if (TRACE_is_active()) {
+    if (TRACE_is_enabled()) {
       xbt_dynar_t route = global_routing->get_route(action->src_name,
                                                     action->dst_name);
       link_CM02_t link;
@@ -610,9 +594,9 @@ static surf_action_t net_communicate(const char *src_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);
-
+  xbt_dynar_t route;
+  // I will need this route for some time so require for no cleanup
+  global_routing->get_route_latency(src_name, dst_name, &route, &latency, 0);
 
   if (sg_network_fullduplex == 1) {
     back_route = global_routing->get_route(dst_name, src_name);
@@ -624,7 +608,6 @@ static surf_action_t net_communicate(const char *src_name,
   XBT_IN("(%s,%s,%g,%g)", src_name, dst_name, size, rate);
   /* LARGE PLATFORMS HACK:
      assert on total_route_size */
-  latency = global_routing->get_latency(src_name,dst_name);
   xbt_assert(xbt_dynar_length(route) || latency,
               "You're trying to send data from %s to %s but there is no connection at all between these two hosts.",
               src_name, dst_name);
@@ -733,7 +716,7 @@ static surf_action_t net_communicate(const char *src_name,
   /* LARGE PLATFORMS HACK:
      expand also with src->link and dst->link */
 #ifdef HAVE_TRACING
-  if (TRACE_is_active()) {
+  if (TRACE_is_enabled()) {
     action->src_name = xbt_strdup(src_name);
     action->dst_name = xbt_strdup(dst_name);
   } else {
@@ -861,11 +844,11 @@ static void surf_network_model_init_internal(void)
     network_maxmin_system = lmm_system_new();
 
   routing_model_create(sizeof(link_CM02_t),
-                       net_link_new(xbt_strdup("__loopback__"),
-                                    498000000, NULL, 0.000015, NULL,
-                                    SURF_RESOURCE_ON, NULL,
-                                    SURF_LINK_FATPIPE, NULL),
-                      net_get_link_latency);
+      net_create_resource(xbt_strdup("__loopback__"),
+          498000000, NULL, 0.000015, NULL,
+            SURF_RESOURCE_ON, NULL,
+            SURF_LINK_FATPIPE, NULL),
+            net_get_link_latency);
 }
 
 
@@ -912,7 +895,7 @@ void surf_network_model_init_LegrandVelho(const char *filename)
   xbt_cfg_setdefault_double(_surf_cfg_set, "network/weight_S", 8775);
 
   update_model_description(surf_network_model_description,
-                           "LV08", surf_network_model);
+                           "LV08_fullupdate", surf_network_model);
 }
 
 /***************************************************************************/