SimDag instrumentation for categorized resource utilization

[simgrid.git] / src / simdag / sd_task.c

diff --git a/src/simdag/sd_task.c b/src/simdag/sd_task.c
index 0b0c4cb..261a59f 100644 (file)
--- a/src/simdag/sd_task.c
+++ b/src/simdag/sd_task.c
@@ -8,6 +8,7 @@
 #include "simdag/simdag.h"
 #include "xbt/sysdep.h"
 #include "xbt/dynar.h"
+#include "instr/private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_task, sd,
                                 "Logging specific to SimDag (task)");
@@ -64,6 +65,10 @@ SD_task_t SD_task_create(const char *name, void *data, double amount)
 
   sd_global->task_number++;
 
+#ifdef HAVE_TRACING
+  TRACE_sd_task_create (task);
+#endif
+
   return task;
 }
 
@@ -921,6 +926,10 @@ void __SD_task_really_run(SD_task_t task)
 
   DEBUG1("surf_action = %p", task->surf_action);
 
+#ifdef HAVE_TRACING
+  if (task->category) TRACE_surf_action(task->surf_action, task->category);
+#endif
+
   __SD_task_destroy_scheduling_data(task);      /* now the scheduling data are not useful anymore */
   __SD_task_set_state(task, SD_RUNNING);
   xbt_assert2(__SD_task_is_running(task), "Bad state of task '%s': %d",
@@ -1219,6 +1228,10 @@ void SD_task_destroy(SD_task_t task)
   if (task->computation_amount)
     xbt_free(task->computation_amount);
 
+#ifdef HAVE_TRACING
+  TRACE_sd_task_destroy (task);
+#endif
+
   xbt_dynar_free(&task->tasks_before);
   xbt_dynar_free(&task->tasks_after);
   xbt_free(task);
@@ -1338,9 +1351,9 @@ void SD_task_schedulev(SD_task_t task, int count, const SD_workstation_t*list) {
       SD_task_t after = dep->dst;
       if (after->kind == SD_TASK_COMM_E2E) {
         after->workstation_list[0] = task->workstation_list[0];
-                               //J-N : Why did you comment on these line (this comment add a bug I think)?
+        //J-N : Why did you comment on these line (this comment add a bug I think)?
         if (after->workstation_list[1] && (__SD_task_is_not_scheduled(after) ||
-                       __SD_task_is_schedulable(after))) {
+                                           __SD_task_is_schedulable(after))) {
           SD_task_do_schedule(after);
           VERB4("Auto-Schedule comm task %s between %s -> %s. It costs %.f bytes",
               SD_task_get_name(after),