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 e22c2b6..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;
@@ -860,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);
 }