get trace category from surf_action instead of smx_action when tracing categorized...

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

diff --git a/src/surf/cpu_im.c b/src/surf/cpu_im.c
index f1b2b8c..4950f77 100644 (file)
--- a/src/surf/cpu_im.c
+++ b/src/surf/cpu_im.c
@@ -120,14 +120,11 @@ static void cpu_im_add_traces_cpu(void)
 {
   xbt_dict_cursor_t cursor = NULL;
   char *trace_name, *elm;
-
   static int called = 0;
-
   if (called)
     return;
   called = 1;
 
-
   /* connect all traces relative to hosts */
   xbt_dict_foreach(trace_connect_list_host_avail, cursor, trace_name, elm) {
     tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
@@ -178,6 +175,9 @@ static int cpu_im_action_unref(surf_action_t action)
     xbt_swag_remove(action,
                     ((cpu_Cas01_im_t) ACTION_GET_CPU(action))->action_set);
     xbt_swag_insert(ACTION_GET_CPU(action), cpu_im_modified_cpu);
+#ifdef HAVE_TRACING
+    if (action->category) xbt_free (action->category);
+#endif
     free(action);
     return 1;
   }
@@ -229,7 +229,7 @@ static void cpu_im_update_remains(cpu_Cas01_im_t cpu, double now)
                                                                 cpu->last_update));
 #ifdef HAVE_TRACING
       TRACE_surf_host_set_utilization (cpu->generic_resource.name,
-                action->generic_lmm_action.generic_action.data, lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable), cpu->last_update, now-cpu->last_update);
+                action->generic_lmm_action.generic_action.data, (surf_action_t)action, lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable), cpu->last_update, now-cpu->last_update);
 #endif
       DEBUG2("Update action(%p) remains %lf", action,
              GENERIC_ACTION(action).remains);
@@ -311,7 +311,7 @@ static void cpu_im_update_actions_state(double now, double delta)
     /* set the remains to 0 due to precision problems when updating the remaining amount */
 #ifdef HAVE_TRACING
     TRACE_surf_host_set_utilization (((cpu_Cas01_im_t)(action->cpu))->generic_resource.name,
-              action->generic_lmm_action.generic_action.data, lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable), ((cpu_Cas01_im_t)(action->cpu))->last_update, now-((cpu_Cas01_im_t)(action->cpu))->last_update);
+              action->generic_lmm_action.generic_action.data, (surf_action_t)action, lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable), ((cpu_Cas01_im_t)(action->cpu))->last_update, now-((cpu_Cas01_im_t)(action->cpu))->last_update);
 #endif
     GENERIC_ACTION(action).remains = 0;
     cpu_im_cpu_action_state_set((surf_action_t) action, SURF_ACTION_DONE);
@@ -325,7 +325,6 @@ static void cpu_im_update_resource_state(void *id,
                                   double value, double date)
 {
   cpu_Cas01_im_t cpu = id;
-
   if (event_type == cpu->power_event) {
     cpu->power_scale = value;
     lmm_update_constraint_bound(cpu_im_maxmin_system, cpu->constraint,
@@ -504,6 +503,16 @@ static void cpu_im_action_update_index_heap(void *action, int i)
 {
   ((surf_action_cpu_Cas01_im_t) action)->index_heap = i;
 }
+static void cpu_im_create_resource(char *name, double power_peak,
+        double power_scale,
+        tmgr_trace_t power_trace,
+        e_surf_resource_state_t state_initial,
+        tmgr_trace_t state_trace,
+        xbt_dict_t cpu_properties)
+{
+       cpu_im_new(name,power_peak,power_scale,power_trace,
+                                         state_initial,state_trace,cpu_properties);
+}
 
 static void cpu_im_finalize(void)
 {
@@ -563,6 +572,8 @@ static void surf_cpu_im_model_init_internal(void)
   surf_cpu_model->extension.cpu.get_state = cpu_im_get_state;
   surf_cpu_model->extension.cpu.get_speed = cpu_im_get_speed;
   surf_cpu_model->extension.cpu.get_available_speed = cpu_im_get_available_speed;
+  surf_cpu_model->extension.cpu.create_resource = cpu_im_create_resource;
+  surf_cpu_model->extension.cpu.add_traces = cpu_im_add_traces_cpu;
 
   if (!cpu_im_maxmin_system) {
     sg_maxmin_selective_update = 1;
@@ -596,28 +607,3 @@ void surf_cpu_model_init_Cas01_im(const char *filename)
   cpu_im_define_callbacks(filename);
   xbt_dynar_push(model_list, &surf_cpu_model);
 }
-
-void surf_cpu_im_init_bypass(char* id,double power)
-{
-       /* FIXME
-        * the hard coded value must be passed as argument of the lua function
-        * depending on the number of arguments the user pass to function
-        * we'd affect it to the corresponding value
-        */
-       double power_peak = 0.0;
-       double power_scale = 0.0;
-       tmgr_trace_t power_trace = NULL;
-       //FIXME : hard coded value
-       e_surf_resource_state_t state_initial = SURF_RESOURCE_ON;
-       tmgr_trace_t state_trace = NULL;
-       power_peak = power;
-       //FIXME : hard coded value !!!
-       surf_parse_get_double(&power_scale, "1.0");
-       power_trace = tmgr_trace_new("");
-
-       //state_trace = tmgr_trace_new(A_surfxml_host_state_file);
-       current_property_set = xbt_dict_new();
-       cpu_im_new(xbt_strdup(id), power_peak, power_scale,
-                                              power_trace, state_initial, state_trace, current_property_set);
-
-       }