placing instrumentation of network utilization on better place

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

diff --git a/src/surf/workstation_ptask_L07.c b/src/surf/workstation_ptask_L07.c
index fd5607e..e011175 100644 (file)
--- a/src/surf/workstation_ptask_L07.c
+++ b/src/surf/workstation_ptask_L07.c
@@ -759,35 +759,20 @@ static void ptask_parse_link_init(void)
            current_property_set);
 }
 
-/**
- * FIXME : still improvable
- */
-void workstation_link_create_resource(char *name,
-        double initial_bandwidth,double initial_latency)
-{
-
-       char* name_link;
-       double bw_initial;
-       tmgr_trace_t bw_trace;
-       double lat_initial;
-       tmgr_trace_t lat_trace;
-       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;
-
-       name_link = xbt_strdup(name);
-       bw_initial = initial_bandwidth;
-       bw_trace = tmgr_trace_new("");
-       lat_initial = initial_latency;
-       lat_trace = tmgr_trace_new("");
-       // FIXME Hard Coded Values
-       //state_initial_link = SURF_RESOURCE_ON;
-       //policy_initial_link = SURF_LINK_SHARED;
-       state_trace = tmgr_trace_new("");
-
-       ptask_link_new(name_link, bw_initial, bw_trace,
-                  lat_initial, lat_trace, state_initial_link, state_trace,
-                  policy_initial_link, xbt_dict_new());
+static void ptask_link_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)
+{
+
+       ptask_link_new(name, bw_initial, bw_trace,
+                  lat_initial, lat_trace, state_initial, state_trace,policy, xbt_dict_new());
 }
 
 
@@ -911,7 +896,7 @@ static void ptask_model_init_internal(void)
   surf_workstation_model->extension.workstation.get_properties =
     surf_resource_properties;
   surf_workstation_model->extension.workstation.link_create_resource =
-       workstation_link_create_resource;
+       ptask_link_create_resource;
   surf_workstation_model->extension.workstation.cpu_create_resource =
        ptask_cpu_create_resource;
   surf_workstation_model->extension.workstation.add_traces = ptask_add_traces;