Use a mallocator for the Surf actions

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

diff --git a/src/surf/cpu.c b/src/surf/cpu.c
index d900720..dc1165f 100644 (file)
--- a/src/surf/cpu.c
+++ b/src/surf/cpu.c
@@ -63,13 +63,10 @@ static cpu_Cas01_t cpu_new(char *name, double power_peak,
 
   cpu->constraint =
       lmm_constraint_new(cpu_maxmin_system, cpu,
-                         cpu->power_scale * cpu->power_peak);
+                         cpu->core * cpu->power_scale * cpu->power_peak);
 
   xbt_dict_set(surf_model_resource_set(surf_cpu_model), name, cpu,
                surf_resource_free);
-#ifdef HAVE_TRACING
-  TRACE_surf_host_declaration(name, cpu->power_scale * cpu->power_peak);
-#endif
 
   return cpu;
 }
@@ -142,7 +139,6 @@ static void add_traces_cpu(void)
 
 static void cpu_define_callbacks(const char *file)
 {
-  surf_parse_reset_parser();
   surfxml_add_callback(STag_surfxml_host_cb_list, parse_cpu_init);
   surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_traces_cpu);
 }
@@ -165,7 +161,7 @@ static int cpu_action_unref(surf_action_t action)
     if (action->category)
       xbt_free(action->category);
 #endif
-    free(action);
+    surf_action_free(&action);
     return 1;
   }
   return 0;
@@ -217,6 +213,7 @@ static void cpu_update_actions_state(double now, double delta)
                                     lmm_variable_getvalue
                                     (action->variable), now - delta,
                                     delta);
+    TRACE_last_timestamp_to_dump = now-delta;
 #endif
     double_update(&(action->generic_action.remains),
                   lmm_variable_getvalue(action->variable) * delta);
@@ -241,15 +238,23 @@ static void cpu_update_resource_state(void *id,
                                       double value, double date)
 {
   cpu_Cas01_t cpu = id;
+  lmm_variable_t var = NULL;
+  lmm_element_t elem = NULL;
 
   if (event_type == cpu->power_event) {
     cpu->power_scale = value;
     lmm_update_constraint_bound(cpu_maxmin_system, cpu->constraint,
-                                cpu->power_scale * cpu->power_peak);
+                                cpu->core * cpu->power_scale * cpu->power_peak);
 #ifdef HAVE_TRACING
     TRACE_surf_host_set_power(date, cpu->generic_resource.name,
-                              cpu->power_scale * cpu->power_peak);
+                              cpu->core * cpu->power_scale * cpu->power_peak);
 #endif
+    while ((var = lmm_get_var_from_cnst
+            (cpu_maxmin_system, cpu->constraint, &elem))) {
+       surf_action_cpu_Cas01_t action = lmm_variable_id(var);
+       lmm_update_variable_bound(cpu_maxmin_system, action->variable,
+                                  cpu->power_scale * cpu->power_peak);
+    }
     if (tmgr_trace_event_free(event_type))
       cpu->power_event = NULL;
   } else if (event_type == cpu->state_event) {
@@ -300,7 +305,7 @@ static surf_action_t cpu_execute(void *cpu, double size)
 
   action->variable = lmm_variable_new(cpu_maxmin_system, action,
                                       action->generic_action.priority,
-                                      -1.0, 1);
+                                      CPU->power_scale * CPU->power_peak, 1);
   lmm_expand(cpu_maxmin_system, CPU->constraint, action->variable, 1.0);
   XBT_OUT;
   return (surf_action_t) action;
@@ -379,6 +384,15 @@ static void cpu_action_set_priority(surf_action_t action, double priority)
   XBT_OUT;
 }
 
+#ifdef HAVE_TRACING
+static void cpu_action_set_category(surf_action_t action, const char *category)
+{
+  XBT_IN2("(%p,%s)", action, category);
+  action->category = xbt_strdup (category);
+  XBT_OUT;
+}
+#endif
+
 static double cpu_action_get_remains(surf_action_t action)
 {
   XBT_IN1("(%p)", action);
@@ -454,6 +468,9 @@ static void surf_cpu_model_init_internal(void)
   surf_cpu_model->is_suspended = cpu_action_is_suspended;
   surf_cpu_model->set_max_duration = cpu_action_set_max_duration;
   surf_cpu_model->set_priority = cpu_action_set_priority;
+#ifdef HAVE_TRACING
+  surf_cpu_model->set_category = cpu_action_set_category;
+#endif
   surf_cpu_model->get_remains = cpu_action_get_remains;
 
   surf_cpu_model->extension.cpu.execute = cpu_execute;