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 d7d1d07..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)");
@@ -53,6 +54,8 @@ SD_task_t SD_task_create(const char *name, void *data, double amount)
   task->tasks_before = xbt_dynar_new(sizeof(SD_dependency_t), NULL);
   task->tasks_after = xbt_dynar_new(sizeof(SD_dependency_t), NULL);
   task->unsatisfied_dependencies=0;
+  task->is_not_ready=0;
+
   /* scheduling parameters */
   task->workstation_nb = 0;
   task->workstation_list = NULL;
@@ -62,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;
 }
 
@@ -293,7 +300,7 @@ void SD_task_dump(SD_task_t task)
   char *statename;
 
   INFO1("Displaying task %s",SD_task_get_name(task));
-  statename=bprintf("%s %s %s %s %s %s %s",
+  statename=bprintf("%s %s %s %s %s %s %s %s",
       (task->state&SD_NOT_SCHEDULED?"not scheduled":""),
       (task->state&SD_SCHEDULABLE?"schedulable":""),
       (task->state&SD_SCHEDULED?"scheduled":""),
@@ -432,6 +439,7 @@ void SD_task_dependency_add(const char *name, void *data, SD_task_t src,
   xbt_dynar_push(dst->tasks_before, &dependency);
 
   dst->unsatisfied_dependencies++;
+  dst->is_not_ready++;
 
   /* if the task was runnable, then dst->tasks_before is not empty anymore,
      so we must go back to state SD_SCHEDULED */
@@ -524,6 +532,7 @@ void SD_task_dependency_remove(SD_task_t src, SD_task_t dst)
       xbt_dynar_remove_at(dynar, i, NULL);
       __SD_task_dependency_destroy(dependency);
       dst->unsatisfied_dependencies--;
+      dst->is_not_ready--;
       found = 1;
     }
   }
@@ -541,6 +550,10 @@ void SD_task_dependency_remove(SD_task_t src, SD_task_t dst)
           else
                   __SD_task_set_state(dst, SD_SCHEDULABLE);
    }
+
+   if (dst->is_not_ready == 0)
+          __SD_task_set_state(dst, SD_SCHEDULABLE);
+
   /*  __SD_print_dependencies(src);
      __SD_print_dependencies(dst); */
 }
@@ -795,7 +808,7 @@ void SD_task_unschedule(SD_task_t task)
   task->start_time = -1.0;
 }
 
-/* Destroys the data memorised by SD_task_schedule. Task state must be SD_SCHEDULED or SD_RUNNABLE.
+/* Destroys the data memorized by SD_task_schedule. Task state must be SD_SCHEDULED or SD_RUNNABLE.
  */
 static void __SD_task_destroy_scheduling_data(SD_task_t task)
 {
@@ -913,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",
@@ -1211,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);
@@ -1315,7 +1336,9 @@ void SD_task_schedulev(SD_task_t task, int count, const SD_workstation_t*list) {
       SD_task_t before = dep->src;
       if (before->kind == SD_TASK_COMM_E2E) {
         before->workstation_list[1] = task->workstation_list[0];
-        if (before->workstation_list[0] && __SD_task_is_schedulable(before)) {
+
+        if (before->workstation_list[0] &&
+                       (__SD_task_is_schedulable(before) || __SD_task_is_not_scheduled(before))) {
           SD_task_do_schedule(before);
           VERB4("Auto-Schedule comm task %s between %s -> %s. It costs %.f bytes",
               SD_task_get_name(before),
@@ -1328,8 +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)?
         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),