X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f55800ad534b79d3ec4d6ba7711f2266e396fc9c..9438858cc5e254b4b2c2a19bcc9b1e93302831ba:/src/surf/cpu_im.c

diff --git a/src/surf/cpu_im.c b/src/surf/cpu_im.c
index f4dfd90967..b5d2f8786c 100644
--- a/src/surf/cpu_im.c
+++ b/src/surf/cpu_im.c
@@ -87,10 +87,6 @@ static cpu_Cas01_im_t cpu_im_new(char *name, double power_peak,
                surf_resource_free);
   cpu->action_set = xbt_swag_new(xbt_swag_offset(action, cpu_list_hookup));
 
-#ifdef HAVE_TRACING
-  TRACE_surf_host_declaration(name, core * power_scale * power_peak);
-#endif
-
   return cpu;
 }
 
@@ -160,8 +156,6 @@ static void cpu_im_add_traces_cpu(void)
 
 static void cpu_im_define_callbacks(const char *file)
 {
-
-  surf_parse_reset_parser();
   surfxml_add_callback(STag_surfxml_host_cb_list, parse_cpu_im_init);
   surfxml_add_callback(ETag_surfxml_platform_cb_list,
                        &cpu_im_add_traces_cpu);
@@ -191,7 +185,7 @@ static int cpu_im_action_unref(surf_action_t action)
     if (action->category)
       xbt_free(action->category);
 #endif
-    free(action);
+    surf_action_free(&action);
     return 1;
   }
   return 0;
@@ -332,23 +326,42 @@ static void cpu_im_update_actions_state(double now, double delta)
     GENERIC_ACTION(action).finish = surf_get_clock();
     /* 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,
-                                    (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);
+    {
+      cpu_Cas01_im_t cpu = ((cpu_Cas01_im_t)(action->cpu));
+      TRACE_surf_host_set_utilization(cpu->generic_resource.name,
+          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
     GENERIC_ACTION(action).remains = 0;
     cpu_im_cpu_action_state_set((surf_action_t) action, SURF_ACTION_DONE);
     cpu_im_update_remains(action->cpu, surf_get_clock());
   }
+#ifdef HAVE_TRACING
+  {
+    //defining the last timestamp that we can safely dump to trace file
+    //without losing the event ascending order (considering all CPU's)
+    cpu_Cas01_im_t cpu;
+    xbt_dict_cursor_t cursor;
+    char *key;
+    double smaller = -1;
+    xbt_dict_foreach(surf_model_resource_set(surf_cpu_model), cursor, key, cpu){
+      if (smaller < 0){
+        smaller = cpu->last_update;
+        continue;
+      }
+      if (cpu->last_update < smaller){
+        smaller = cpu->last_update;
+      }
+    }
+    if (smaller > 0) {
+      TRACE_last_timestamp_to_dump = smaller;
+    }
+  }
+#endif
   return;
 }
 
@@ -522,6 +535,16 @@ static void cpu_im_action_set_priority(surf_action_t action,
   XBT_OUT;
 }
 
+#ifdef HAVE_TRACING
+static void cpu_im_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_im_action_get_remains(surf_action_t action)
 {
   XBT_IN1("(%p)", action);
@@ -560,7 +583,6 @@ static void cpu_im_create_resource(char *name, double power_peak,
                                    tmgr_trace_t state_trace,
                                    xbt_dict_t cpu_properties)
 {
-	xbt_assert0(core==1,"Multi-core not handled with this model yet");
   cpu_im_new(name, power_peak, power_scale, power_trace, core,
              state_initial, state_trace, cpu_properties);
 }
@@ -618,6 +640,9 @@ static void surf_cpu_im_model_init_internal(void)
   surf_cpu_model->is_suspended = cpu_im_action_is_suspended;
   surf_cpu_model->set_max_duration = cpu_im_action_set_max_duration;
   surf_cpu_model->set_priority = cpu_im_action_set_priority;
+#ifdef HAVE_TRACING
+  surf_cpu_model->set_category = cpu_im_action_set_category;
+#endif
   surf_cpu_model->get_remains = cpu_im_action_get_remains;
 
   surf_cpu_model->extension.cpu.execute = cpu_im_execute;