X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cec0cf51c5d81a13988ef5d214359544e4b2099e..53cde8dfb94134348e908b3c2845200ffc582dc7:/src/simdag/sd_task.c

diff --git a/src/simdag/sd_task.c b/src/simdag/sd_task.c
index 9d6affe509..038d46e857 100644
--- a/src/simdag/sd_task.c
+++ b/src/simdag/sd_task.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -8,7 +8,7 @@
 #include "simdag/simdag.h"
 #include "xbt/sysdep.h"
 #include "xbt/dynar.h"
-#include "instr/private.h"
+#include "instr/instr_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_task, sd,
                                 "Logging specific to SimDag (task)");
@@ -16,44 +16,39 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_task, sd,
 static void __SD_task_remove_dependencies(SD_task_t task);
 static void __SD_task_destroy_scheduling_data(SD_task_t task);
 
-/**
- * \brief Creates a new task.
- *
- * \param name the name of the task (can be \c NULL)
- * \param data the user data you want to associate with the task (can be \c NULL)
- * \param amount amount of the task
- * \return the new task
- * \see SD_task_destroy()
- */
-SD_task_t SD_task_create(const char *name, void *data, double amount)
+void* SD_task_new_f(void)
 {
+  SD_task_t task = xbt_new0(s_SD_task_t, 1);
+  task->tasks_before = xbt_dynar_new(sizeof(SD_dependency_t), NULL);
+  task->tasks_after = xbt_dynar_new(sizeof(SD_dependency_t), NULL);
 
-  SD_task_t task;
-  SD_CHECK_INIT_DONE();
+  return task;
+}
 
-  task = xbt_new(s_SD_task_t, 1);
+void SD_task_recycle_f(void *t)
+{
+  SD_task_t task = (SD_task_t) t;
 
-  /* general information */
-  task->data = data;            /* user data */
-  task->name = xbt_strdup(name);
+  /* Reset the content */
   task->kind = SD_TASK_NOT_TYPED;
   task->state_hookup.prev = NULL;
   task->state_hookup.next = NULL;
   task->state_set = sd_global->not_scheduled_task_set;
+  xbt_swag_insert(task, task->state_set);
   task->state = SD_NOT_SCHEDULED;
+  task->return_hookup.prev = NULL;
+  task->return_hookup.next = NULL;
+
   task->marked = 0;
-  xbt_swag_insert(task, task->state_set);
 
-  task->amount = amount;
-  task->remains = amount;
   task->start_time = -1.0;
   task->finish_time = -1.0;
   task->surf_action = NULL;
   task->watch_points = 0;
 
   /* dependencies */
-  task->tasks_before = xbt_dynar_new(sizeof(SD_dependency_t), NULL);
-  task->tasks_after = xbt_dynar_new(sizeof(SD_dependency_t), NULL);
+  xbt_dynar_reset(task->tasks_before);
+  xbt_dynar_reset(task->tasks_after);
   task->unsatisfied_dependencies = 0;
   task->is_not_ready = 0;
 
@@ -63,6 +58,35 @@ SD_task_t SD_task_create(const char *name, void *data, double amount)
   task->computation_amount = NULL;
   task->communication_amount = NULL;
   task->rate = -1;
+}
+
+void SD_task_free_f(void *t)
+{
+  SD_task_t task = (SD_task_t)t;
+
+  xbt_dynar_free(&task->tasks_before);
+  xbt_dynar_free(&task->tasks_after);
+  xbt_free(task);
+}
+
+/**
+ * \brief Creates a new task.
+ *
+ * \param name the name of the task (can be \c NULL)
+ * \param data the user data you want to associate with the task (can be \c NULL)
+ * \param amount amount of the task
+ * \return the new task
+ * \see SD_task_destroy()
+ */
+SD_task_t SD_task_create(const char *name, void *data, double amount)
+{
+  SD_task_t task = xbt_mallocator_get(sd_global->task_mallocator);
+
+  /* general information */
+  task->data = data;            /* user data */
+  task->name = xbt_strdup(name);
+  task->amount = amount;
+  task->remains = amount;
 
   sd_global->task_number++;
 
@@ -73,6 +97,46 @@ SD_task_t SD_task_create(const char *name, void *data, double amount)
   return task;
 }
 
+/**
+ * \brief Destroys a task.
+ *
+ * The user data (if any) should have been destroyed first.
+ *
+ * \param task the task you want to destroy
+ * \see SD_task_create()
+ */
+void SD_task_destroy(SD_task_t task)
+{
+  XBT_DEBUG("Destroying task %s...", SD_task_get_name(task));
+
+  __SD_task_remove_dependencies(task);
+  /* if the task was scheduled or runnable we have to free the scheduling parameters */
+  if (__SD_task_is_scheduled_or_runnable(task))
+    __SD_task_destroy_scheduling_data(task);
+  if (task->state_set != NULL) /* would be null if just created */
+    xbt_swag_remove(task, task->state_set);
+
+  xbt_swag_remove(task, sd_global->return_set);
+
+  xbt_free(task->name);
+
+  if (task->surf_action != NULL)
+    surf_workstation_model->action_unref(task->surf_action);
+
+  xbt_free(task->workstation_list);
+  xbt_free(task->communication_amount);
+  xbt_free(task->computation_amount);
+
+  xbt_mallocator_release(sd_global->task_mallocator,task);
+  sd_global->task_number--;
+
+#ifdef HAVE_TRACING
+  TRACE_sd_task_destroy(task);
+#endif
+
+  XBT_DEBUG("Task destroyed.");
+}
+
 /**
  * \brief Returns the user data of a task
  *
@@ -82,8 +146,6 @@ SD_task_t SD_task_create(const char *name, void *data, double amount)
  */
 void *SD_task_get_data(SD_task_t task)
 {
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(task != NULL, "Invalid parameter");
   return task->data;
 }
 
@@ -99,8 +161,6 @@ void *SD_task_get_data(SD_task_t task)
  */
 void SD_task_set_data(SD_task_t task, void *data)
 {
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(task != NULL, "Invalid parameter");
   task->data = data;
 }
 
@@ -114,8 +174,6 @@ void SD_task_set_data(SD_task_t task, void *data)
  */
 e_SD_task_state_t SD_task_get_state(SD_task_t task)
 {
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(task != NULL, "Invalid parameter");
   return task->state;
 }
 
@@ -150,18 +208,21 @@ void __SD_task_set_state(SD_task_t task, e_SD_task_state_t new_state)
     task->finish_time =
         surf_workstation_model->action_get_finish_time(task->surf_action);
     task->remains = 0;
+#ifdef HAVE_JEDULE
+    jedule_log_sd_event(task);
+#endif
     break;
   case SD_FAILED:
     task->state_set = sd_global->failed_task_set;
     break;
   default:
-    xbt_assert0(0, "Invalid state");
+    xbt_die( "Invalid state");
   }
   xbt_swag_insert(task, task->state_set);
   task->state = new_state;
 
   if (task->watch_points & new_state) {
-    VERB1("Watch point reached with task '%s'!", SD_task_get_name(task));
+    XBT_VERB("Watch point reached with task '%s'!", SD_task_get_name(task));
     sd_global->watch_point_reached = 1;
     SD_task_unwatch(task, new_state);   /* remove the watch point */
   }
@@ -175,8 +236,6 @@ void __SD_task_set_state(SD_task_t task, e_SD_task_state_t new_state)
  */
 const char *SD_task_get_name(SD_task_t task)
 {
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(task != NULL, "Invalid parameter");
   return task->name;
 }
 
@@ -198,8 +257,6 @@ xbt_dynar_t SD_task_get_parents(SD_task_t task)
   unsigned int i;
   xbt_dynar_t parents;
   SD_dependency_t dep;
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(task != NULL, "Invalid parameter");
 
   parents = xbt_dynar_new(sizeof(SD_task_t), NULL);
   xbt_dynar_foreach(task->tasks_before, i, dep) {
@@ -218,8 +275,6 @@ xbt_dynar_t SD_task_get_children(SD_task_t task)
   unsigned int i;
   xbt_dynar_t children;
   SD_dependency_t dep;
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(task != NULL, "Invalid parameter");
 
   children = xbt_dynar_new(sizeof(SD_task_t), NULL);
   xbt_dynar_foreach(task->tasks_after, i, dep) {
@@ -236,10 +291,6 @@ xbt_dynar_t SD_task_get_children(SD_task_t task)
  */
 int SD_task_get_workstation_count(SD_task_t task)
 {
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(task != NULL, "Invalid parameter");
-  //  xbt_assert1( task->state_set != sd_global->scheduled_task_set, 
-  //           "Unscheduled task %s", task->name);
   return task->workstation_nb;
 }
 
@@ -251,10 +302,6 @@ int SD_task_get_workstation_count(SD_task_t task)
  */
 SD_workstation_t *SD_task_get_workstation_list(SD_task_t task)
 {
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(task != NULL, "Invalid parameter");
-  //xbt_assert1( task->state_set != sd_global->scheduled_task_set, 
-  //           "Unscheduled task %s", task->name);
   return task->workstation_list;
 }
 
@@ -267,8 +314,6 @@ SD_workstation_t *SD_task_get_workstation_list(SD_task_t task)
  */
 double SD_task_get_amount(SD_task_t task)
 {
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(task != NULL, "Invalid parameter");
   return task->amount;
 }
 
@@ -281,9 +326,6 @@ double SD_task_get_amount(SD_task_t task)
  */
 double SD_task_get_remaining_amount(SD_task_t task)
 {
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(task != NULL, "Invalid parameter");
-
   if (task->surf_action)
     return surf_workstation_model->get_remains(task->surf_action);
   else
@@ -302,7 +344,7 @@ void SD_task_dump(SD_task_t task)
   SD_dependency_t dependency;
   char *statename;
 
-  INFO1("Displaying task %s", SD_task_get_name(task));
+  XBT_INFO("Displaying task %s", SD_task_get_name(task));
   statename = bprintf("%s %s %s %s %s %s %s %s",
                       (task->state & SD_NOT_SCHEDULED ? "not scheduled" :
                        ""),
@@ -314,33 +356,33 @@ void SD_task_dump(SD_task_t task)
                       (task->state & SD_RUNNING ? "running" : ""),
                       (task->state & SD_DONE ? "done" : ""),
                       (task->state & SD_FAILED ? "failed" : ""));
-  INFO1("  - state: %s", statename);
+  XBT_INFO("  - state: %s", statename);
   free(statename);
 
   if (task->kind != 0) {
     switch (task->kind) {
     case SD_TASK_COMM_E2E:
-      INFO0("  - kind: end-to-end communication");
+      XBT_INFO("  - kind: end-to-end communication");
       break;
     case SD_TASK_COMP_SEQ:
-      INFO0("  - kind: sequential computation");
+      XBT_INFO("  - kind: sequential computation");
       break;
     default:
-      INFO1("  - (unknown kind %d)", task->kind);
+      XBT_INFO("  - (unknown kind %d)", task->kind);
     }
   }
-  INFO1("  - amount: %.0f", SD_task_get_amount(task));
-  INFO1("  - Dependencies to satisfy: %d", task->unsatisfied_dependencies);
-  if (xbt_dynar_length(task->tasks_before)) {
-    INFO0("  - pre-dependencies:");
+  XBT_INFO("  - amount: %.0f", SD_task_get_amount(task));
+  XBT_INFO("  - Dependencies to satisfy: %u", task->unsatisfied_dependencies);
+  if (!xbt_dynar_is_empty(task->tasks_before)) {
+    XBT_INFO("  - pre-dependencies:");
     xbt_dynar_foreach(task->tasks_before, counter, dependency) {
-      INFO1("    %s", SD_task_get_name(dependency->src));
+      XBT_INFO("    %s", SD_task_get_name(dependency->src));
     }
   }
-  if (xbt_dynar_length(task->tasks_after)) {
-    INFO0("  - post-dependencies:");
+  if (!xbt_dynar_is_empty(task->tasks_after)) {
+    XBT_INFO("  - post-dependencies:");
     xbt_dynar_foreach(task->tasks_after, counter, dependency) {
-      INFO1("    %s", SD_task_get_name(dependency->dst));
+      XBT_INFO("    %s", SD_task_get_name(dependency->dst));
     }
   }
 }
@@ -371,8 +413,7 @@ void SD_task_dotty(SD_task_t task, void *out)
  */
 static void __SD_task_dependency_destroy(void *dependency)
 {
-  if (((SD_dependency_t) dependency)->name != NULL)
-    xbt_free(((SD_dependency_t) dependency)->name);
+  xbt_free(((SD_dependency_t)dependency)->name);
   xbt_free(dependency);
 }
 
@@ -397,40 +438,37 @@ void SD_task_dependency_add(const char *name, void *data, SD_task_t src,
   int i;
   SD_dependency_t dependency;
 
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(src != NULL && dst != NULL, "Invalid parameter");
-
   dynar = src->tasks_after;
   length = xbt_dynar_length(dynar);
 
   if (src == dst)
-    THROW1(arg_error, 0,
+    THROWF(arg_error, 0,
            "Cannot add a dependency between task '%s' and itself",
            SD_task_get_name(src));
 
   if (!__SD_task_is_not_scheduled(src) && !__SD_task_is_schedulable(src)
       && !__SD_task_is_scheduled_or_runnable(src))
-    THROW1(arg_error, 0,
+    THROWF(arg_error, 0,
            "Task '%s' must be SD_NOT_SCHEDULED, SD_SCHEDULABLE, SD_SCHEDULED or SD_RUNNABLE",
            SD_task_get_name(src));
 
   if (!__SD_task_is_not_scheduled(dst) && !__SD_task_is_schedulable(dst)
       && !__SD_task_is_scheduled_or_runnable(dst))
-    THROW1(arg_error, 0,
+    THROWF(arg_error, 0,
            "Task '%s' must be SD_NOT_SCHEDULED, SD_SCHEDULABLE, SD_SCHEDULED or SD_RUNNABLE",
            SD_task_get_name(dst));
 
-  DEBUG2("SD_task_dependency_add: src = %s, dst = %s",
+  XBT_DEBUG("SD_task_dependency_add: src = %s, dst = %s",
          SD_task_get_name(src), SD_task_get_name(dst));
   for (i = 0; i < length && !found; i++) {
     xbt_dynar_get_cpy(dynar, i, &dependency);
     found = (dependency->dst == dst);
-    DEBUG2("Dependency %d: dependency->dst = %s", i,
+    XBT_DEBUG("Dependency %d: dependency->dst = %s", i,
            SD_task_get_name(dependency->dst));
   }
 
   if (found)
-    THROW2(arg_error, 0,
+    THROWF(arg_error, 0,
            "A dependency already exists between task '%s' and task '%s'",
            SD_task_get_name(src), SD_task_get_name(dst));
 
@@ -451,7 +489,7 @@ void SD_task_dependency_add(const char *name, void *data, SD_task_t src,
   /* if the task was runnable, then dst->tasks_before is not empty anymore,
      so we must go back to state SD_SCHEDULED */
   if (__SD_task_is_runnable(dst)) {
-    DEBUG1
+    XBT_DEBUG
         ("SD_task_dependency_add: %s was runnable and becomes scheduled!",
          SD_task_get_name(dst));
     __SD_task_set_state(dst, SD_SCHEDULED);
@@ -475,8 +513,7 @@ int SD_task_dependency_exists(SD_task_t src, SD_task_t dst)
   unsigned int counter;
   SD_dependency_t dependency;
 
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(src != NULL
+  xbt_assert(src != NULL
               || dst != NULL,
               "Invalid parameter: both src and dst are NULL");
 
@@ -511,9 +548,6 @@ void SD_task_dependency_remove(SD_task_t src, SD_task_t dst)
   int i;
   SD_dependency_t dependency;
 
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(src != NULL && dst != NULL, "Invalid parameter");
-
   /* remove the dependency from src->tasks_after */
   dynar = src->tasks_after;
   length = xbt_dynar_length(dynar);
@@ -526,7 +560,7 @@ void SD_task_dependency_remove(SD_task_t src, SD_task_t dst)
     }
   }
   if (!found)
-    THROW4(arg_error, 0,
+    THROWF(arg_error, 0,
            "No dependency found between task '%s' and '%s': task '%s' is not a successor of task '%s'",
            SD_task_get_name(src), SD_task_get_name(dst),
            SD_task_get_name(dst), SD_task_get_name(src));
@@ -547,7 +581,7 @@ void SD_task_dependency_remove(SD_task_t src, SD_task_t dst)
     }
   }
   /* should never happen... */
-  xbt_assert4(found,
+  xbt_assert(found,
               "SimDag error: task '%s' is a successor of '%s' but task '%s' is not a predecessor of task '%s'",
               SD_task_get_name(dst), SD_task_get_name(src),
               SD_task_get_name(src), SD_task_get_name(dst));
@@ -585,10 +619,6 @@ void *SD_task_dependency_get_data(SD_task_t src, SD_task_t dst)
   int i;
   SD_dependency_t dependency;
 
-
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(src != NULL && dst != NULL, "Invalid parameter");
-
   dynar = src->tasks_after;
   length = xbt_dynar_length(dynar);
 
@@ -597,7 +627,7 @@ void *SD_task_dependency_get_data(SD_task_t src, SD_task_t dst)
     found = (dependency->dst == dst);
   }
   if (!found)
-    THROW2(arg_error, 0, "No dependency found between task '%s' and '%s'",
+    THROWF(arg_error, 0, "No dependency found between task '%s' and '%s'",
            SD_task_get_name(src), SD_task_get_name(dst));
   return dependency->data;
 }
@@ -615,13 +645,13 @@ static void __SD_print_watch_points(SD_task_t task)
   };
   int i;
 
-  INFO2("Task '%s' watch points (%x): ", SD_task_get_name(task),
+  XBT_INFO("Task '%s' watch points (%x): ", SD_task_get_name(task),
         task->watch_points);
 
 
   for (i = 0; i < 5; i++) {
     if (task->watch_points & state_masks[i])
-      INFO1("%s ", state_names[i]);
+      XBT_INFO("%s ", state_names[i]);
   }
 }
 
@@ -639,11 +669,8 @@ static void __SD_print_watch_points(SD_task_t task)
  */
 void SD_task_watch(SD_task_t task, e_SD_task_state_t state)
 {
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(task != NULL, "Invalid parameter");
-
   if (state & SD_NOT_SCHEDULED)
-    THROW0(arg_error, 0,
+    THROWF(arg_error, 0,
            "Cannot add a watch point for state SD_NOT_SCHEDULED");
 
   task->watch_points = task->watch_points | state;
@@ -659,9 +686,7 @@ void SD_task_watch(SD_task_t task, e_SD_task_state_t state)
  */
 void SD_task_unwatch(SD_task_t task, e_SD_task_state_t state)
 {
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(task != NULL, "Invalid parameter");
-  xbt_assert0(state != SD_NOT_SCHEDULED,
+  xbt_assert(state != SD_NOT_SCHEDULED,
               "SimDag error: Cannot have a watch point for state SD_NOT_SCHEDULED");
 
   task->watch_points = task->watch_points & ~state;
@@ -690,9 +715,7 @@ double SD_task_get_execution_time(SD_task_t task,
 {
   double time, max_time = 0.0;
   int i, j;
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(task != NULL && workstation_nb > 0
-              && workstation_list != NULL, "Invalid parameter");
+  xbt_assert(workstation_nb > 0, "Invalid parameter");
 
   /* the task execution time is the maximum execution time of the parallel tasks */
 
@@ -722,10 +745,8 @@ double SD_task_get_execution_time(SD_task_t task,
 
 static XBT_INLINE void SD_task_do_schedule(SD_task_t task)
 {
-  SD_CHECK_INIT_DONE();
-
   if (!__SD_task_is_not_scheduled(task) && !__SD_task_is_schedulable(task))
-    THROW1(arg_error, 0, "Task '%s' has already been scheduled",
+    THROWF(arg_error, 0, "Task '%s' has already been scheduled",
            SD_task_get_name(task));
 
   /* update the task state */
@@ -743,7 +764,7 @@ static XBT_INLINE void SD_task_do_schedule(SD_task_t task)
  * i.e. when its dependencies are satisfied.
  *
  * \param task the task you want to schedule
- * \param workstation_nb number of workstations on which the task will be executed
+ * \param workstation_count number of workstations on which the task will be executed
  * \param workstation_list the workstations on which the task will be executed
  * \param computation_amount computation amount for each workstation
  * \param communication_amount communication amount between each pair of workstations
@@ -758,7 +779,7 @@ void SD_task_schedule(SD_task_t task, int workstation_count,
   int communication_nb;
   task->workstation_nb = 0;
   task->rate = -1;
-  xbt_assert0(workstation_count > 0, "workstation_nb must be positive");
+  xbt_assert(workstation_count > 0, "workstation_nb must be positive");
 
   task->workstation_nb = workstation_count;
   task->rate = rate;
@@ -805,14 +826,11 @@ void SD_task_schedule(SD_task_t task, int workstation_count,
  */
 void SD_task_unschedule(SD_task_t task)
 {
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(task != NULL, "Invalid parameter");
-
   if (task->state_set != sd_global->scheduled_task_set &&
       task->state_set != sd_global->runnable_task_set &&
       task->state_set != sd_global->running_task_set &&
       task->state_set != sd_global->failed_task_set)
-    THROW1(arg_error, 0,
+    THROWF(arg_error, 0,
            "Task %s: the state must be SD_SCHEDULED, SD_RUNNABLE, SD_RUNNING or SD_FAILED",
            SD_task_get_name(task));
 
@@ -836,10 +854,9 @@ void SD_task_unschedule(SD_task_t task)
  */
 static void __SD_task_destroy_scheduling_data(SD_task_t task)
 {
-  SD_CHECK_INIT_DONE();
   if (!__SD_task_is_scheduled_or_runnable(task)
       && !__SD_task_is_in_fifo(task))
-    THROW1(arg_error, 0,
+    THROWF(arg_error, 0,
            "Task '%s' must be SD_SCHEDULED, SD_RUNNABLE or SD_IN_FIFO",
            SD_task_get_name(task));
 
@@ -858,30 +875,28 @@ void __SD_task_really_run(SD_task_t task)
   int i;
   void **surf_workstations;
 
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(task != NULL, "Invalid parameter");
-  xbt_assert2(__SD_task_is_runnable_or_in_fifo(task),
+  xbt_assert(__SD_task_is_runnable_or_in_fifo(task),
               "Task '%s' is not runnable or in a fifo! Task state: %d",
-              SD_task_get_name(task), SD_task_get_state(task));
-  xbt_assert1(task->workstation_list != NULL,
+             SD_task_get_name(task), (int)SD_task_get_state(task));
+  xbt_assert(task->workstation_list != NULL,
               "Task '%s': workstation_list is NULL!",
               SD_task_get_name(task));
 
 
 
-  DEBUG1("Really running task '%s'", SD_task_get_name(task));
+  XBT_DEBUG("Really running task '%s'", SD_task_get_name(task));
 
   /* set this task as current task for the workstations in sequential mode */
   for (i = 0; i < task->workstation_nb; i++) {
     if (SD_workstation_get_access_mode(task->workstation_list[i]) ==
         SD_WORKSTATION_SEQUENTIAL_ACCESS) {
       task->workstation_list[i]->current_task = task;
-      xbt_assert0(__SD_workstation_is_busy(task->workstation_list[i]),
+      xbt_assert(__SD_workstation_is_busy(task->workstation_list[i]),
                   "The workstation should be busy now");
     }
   }
 
-  DEBUG1("Task '%s' set as current task for its workstations",
+  XBT_DEBUG("Task '%s' set as current task for its workstations",
          SD_task_get_name(task));
 
   /* start the task */
@@ -954,7 +969,7 @@ void __SD_task_really_run(SD_task_t task)
 
   surf_workstation_model->action_data_set(task->surf_action, task);
 
-  DEBUG1("surf_action = %p", task->surf_action);
+  XBT_DEBUG("surf_action = %p", task->surf_action);
 
 #ifdef HAVE_TRACING
   if (task->category)
@@ -963,8 +978,8 @@ void __SD_task_really_run(SD_task_t task)
 
   __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",
-              SD_task_get_name(task), SD_task_get_state(task));
+  xbt_assert(__SD_task_is_running(task), "Bad state of task '%s': %d",
+             SD_task_get_name(task), (int)SD_task_get_state(task));
 
 }
 
@@ -981,11 +996,9 @@ int __SD_task_try_to_run(SD_task_t task)
   int i;
   SD_workstation_t workstation;
 
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(task != NULL, "Invalid parameter");
-  xbt_assert2(__SD_task_is_runnable(task),
+  xbt_assert(__SD_task_is_runnable(task),
               "Task '%s' is not runnable! Task state: %d",
-              SD_task_get_name(task), SD_task_get_state(task));
+             SD_task_get_name(task), (int)SD_task_get_state(task));
 
 
   for (i = 0; i < task->workstation_nb; i++) {
@@ -993,22 +1006,22 @@ int __SD_task_try_to_run(SD_task_t task)
         !__SD_workstation_is_busy(task->workstation_list[i]);
   }
 
-  DEBUG2("Task '%s' can start: %d", SD_task_get_name(task), can_start);
+  XBT_DEBUG("Task '%s' can start: %d", SD_task_get_name(task), can_start);
 
   if (!can_start) {             /* if the task cannot start and is not in the fifos yet */
     for (i = 0; i < task->workstation_nb; i++) {
       workstation = task->workstation_list[i];
       if (workstation->access_mode == SD_WORKSTATION_SEQUENTIAL_ACCESS) {
-        DEBUG2("Pushing task '%s' in the fifo of workstation '%s'",
+        XBT_DEBUG("Pushing task '%s' in the fifo of workstation '%s'",
                SD_task_get_name(task),
                SD_workstation_get_name(workstation));
         xbt_fifo_push(workstation->task_fifo, task);
       }
     }
     __SD_task_set_state(task, SD_IN_FIFO);
-    xbt_assert2(__SD_task_is_in_fifo(task), "Bad state of task '%s': %d",
-                SD_task_get_name(task), SD_task_get_state(task));
-    DEBUG1("Task '%s' state is now SD_IN_FIFO", SD_task_get_name(task));
+    xbt_assert(__SD_task_is_in_fifo(task), "Bad state of task '%s': %d",
+               SD_task_get_name(task), (int)SD_task_get_state(task));
+    XBT_DEBUG("Task '%s' state is now SD_IN_FIFO", SD_task_get_name(task));
   } else {
     __SD_task_really_run(task);
   }
@@ -1031,12 +1044,10 @@ void __SD_task_just_done(SD_task_t task)
   SD_task_t *candidates;
   int can_start = 1;
 
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(task != NULL, "Invalid parameter");
-  xbt_assert1(__SD_task_is_running(task),
+  xbt_assert(__SD_task_is_running(task),
               "The task must be running! Task state: %d",
-              SD_task_get_state(task));
-  xbt_assert1(task->workstation_list != NULL,
+              (int)SD_task_get_state(task));
+  xbt_assert(task->workstation_list != NULL,
               "Task '%s': workstation_list is NULL!",
               SD_task_get_name(task));
 
@@ -1047,19 +1058,19 @@ void __SD_task_just_done(SD_task_t task)
   surf_workstation_model->action_unref(task->surf_action);
   task->surf_action = NULL;
 
-  DEBUG0("Looking for candidates");
+  XBT_DEBUG("Looking for candidates");
 
   /* if the task was executed on sequential workstations,
      maybe we can execute the next task of the fifo for each workstation */
   for (i = 0; i < task->workstation_nb; i++) {
     workstation = task->workstation_list[i];
-    DEBUG2("Workstation '%s': access_mode = %d",
-           SD_workstation_get_name(workstation), workstation->access_mode);
+    XBT_DEBUG("Workstation '%s': access_mode = %d",
+              SD_workstation_get_name(workstation), (int)workstation->access_mode);
     if (workstation->access_mode == SD_WORKSTATION_SEQUENTIAL_ACCESS) {
-      xbt_assert1(workstation->task_fifo != NULL,
+      xbt_assert(workstation->task_fifo != NULL,
                   "Workstation '%s' has sequential access but no fifo!",
                   SD_workstation_get_name(workstation));
-      xbt_assert2(workstation->current_task =
+      xbt_assert(workstation->current_task =
                   task, "Workstation '%s': current task should be '%s'",
                   SD_workstation_get_name(workstation),
                   SD_task_get_name(task));
@@ -1067,20 +1078,20 @@ void __SD_task_just_done(SD_task_t task)
       /* the task is over so we can release the workstation */
       workstation->current_task = NULL;
 
-      DEBUG0("Getting candidate in fifo");
+      XBT_DEBUG("Getting candidate in fifo");
       candidate =
           xbt_fifo_get_item_content(xbt_fifo_get_first_item
                                     (workstation->task_fifo));
 
       if (candidate != NULL) {
-        DEBUG1("Candidate: '%s'", SD_task_get_name(candidate));
-        xbt_assert2(__SD_task_is_in_fifo(candidate),
+        XBT_DEBUG("Candidate: '%s'", SD_task_get_name(candidate));
+        xbt_assert(__SD_task_is_in_fifo(candidate),
                     "Bad state of candidate '%s': %d",
                     SD_task_get_name(candidate),
-                    SD_task_get_state(candidate));
+                    (int)SD_task_get_state(candidate));
       }
 
-      DEBUG1("Candidate in fifo: %p", candidate);
+      XBT_DEBUG("Candidate in fifo: %p", candidate);
 
       /* if there was a task waiting for my place */
       if (candidate != NULL) {
@@ -1104,7 +1115,7 @@ void __SD_task_just_done(SD_task_t task)
     }
   }
 
-  DEBUG1("Candidates found: %d", candidate_nb);
+  XBT_DEBUG("Candidates found: %d", candidate_nb);
 
   /* now we check every candidate task */
   for (i = 0; i < candidate_nb; i++) {
@@ -1114,9 +1125,9 @@ void __SD_task_just_done(SD_task_t task)
       continue;                 /* we have already evaluated that task */
     }
 
-    xbt_assert2(__SD_task_is_in_fifo(candidate),
+    xbt_assert(__SD_task_is_in_fifo(candidate),
                 "Bad state of candidate '%s': %d",
-                SD_task_get_name(candidate), SD_task_get_state(candidate));
+               SD_task_get_name(candidate), (int)SD_task_get_state(candidate));
 
     for (j = 0; j < candidate->workstation_nb && can_start; j++) {
       workstation = candidate->workstation_list[j];
@@ -1129,7 +1140,7 @@ void __SD_task_just_done(SD_task_t task)
                                     (workstation->task_fifo));
     }
 
-    DEBUG2("Candidate '%s' can start: %d", SD_task_get_name(candidate),
+    XBT_DEBUG("Candidate '%s' can start: %d", SD_task_get_name(candidate),
            can_start);
 
     /* now we are sure that I can start! */
@@ -1140,28 +1151,28 @@ void __SD_task_just_done(SD_task_t task)
         /* update the fifo */
         if (workstation->access_mode == SD_WORKSTATION_SEQUENTIAL_ACCESS) {
           candidate = xbt_fifo_shift(workstation->task_fifo);   /* the return value is stored just for debugging */
-          DEBUG1("Head of the fifo: '%s'",
+          XBT_DEBUG("Head of the fifo: '%s'",
                  (candidate !=
                   NULL) ? SD_task_get_name(candidate) : "NULL");
-          xbt_assert0(candidate == candidates[i],
+          xbt_assert(candidate == candidates[i],
                       "Error in __SD_task_just_done: bad first task in the fifo");
         }
       }                         /* for each workstation */
 
       /* finally execute the task */
-      DEBUG2("Task '%s' state: %d", SD_task_get_name(candidate),
-             SD_task_get_state(candidate));
+      XBT_DEBUG("Task '%s' state: %d", SD_task_get_name(candidate),
+             (int)SD_task_get_state(candidate));
       __SD_task_really_run(candidate);
 
-      DEBUG4
+      XBT_DEBUG
           ("Calling __SD_task_is_running: task '%s', state set: %p, running_task_set: %p, is running: %d",
            SD_task_get_name(candidate), candidate->state_set,
            sd_global->running_task_set, __SD_task_is_running(candidate));
-      xbt_assert2(__SD_task_is_running(candidate),
+      xbt_assert(__SD_task_is_running(candidate),
                   "Bad state of task '%s': %d",
                   SD_task_get_name(candidate),
-                  SD_task_get_state(candidate));
-      DEBUG0("Okay, the task is running.");
+                 (int)SD_task_get_state(candidate));
+      XBT_DEBUG("Okay, the task is running.");
 
     }                           /* can start */
     candidate->fifo_checked = 1;
@@ -1177,12 +1188,12 @@ static void __SD_task_remove_dependencies(SD_task_t task)
   /* we must destroy the dependencies carefuly (with SD_dependency_remove)
      because each one is stored twice */
   SD_dependency_t dependency;
-  while (xbt_dynar_length(task->tasks_before) > 0) {
+  while (!xbt_dynar_is_empty(task->tasks_before)) {
     xbt_dynar_get_cpy(task->tasks_before, 0, &dependency);
     SD_task_dependency_remove(dependency->src, dependency->dst);
   }
 
-  while (xbt_dynar_length(task->tasks_after) > 0) {
+  while (!xbt_dynar_is_empty(task->tasks_after)) {
     xbt_dynar_get_cpy(task->tasks_after, 0, &dependency);
     SD_task_dependency_remove(dependency->src, dependency->dst);
   }
@@ -1198,8 +1209,6 @@ static void __SD_task_remove_dependencies(SD_task_t task)
  */
 double SD_task_get_start_time(SD_task_t task)
 {
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(task != NULL, "Invalid parameter");
   if (task->surf_action)
     return surf_workstation_model->
         action_get_start_time(task->surf_action);
@@ -1220,9 +1229,6 @@ double SD_task_get_start_time(SD_task_t task)
  */
 double SD_task_get_finish_time(SD_task_t task)
 {
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(task != NULL, "Invalid parameter");
-
   if (task->surf_action)        /* should never happen as actions are destroyed right after their completion */
     return surf_workstation_model->
         action_get_finish_time(task->surf_action);
@@ -1230,56 +1236,6 @@ double SD_task_get_finish_time(SD_task_t task)
     return task->finish_time;
 }
 
-/**
- * \brief Destroys a task.
- *
- * The user data (if any) should have been destroyed first.
- *
- * \param task the task you want to destroy
- * \see SD_task_create()
- */
-void SD_task_destroy(SD_task_t task)
-{
-  SD_CHECK_INIT_DONE();
-  xbt_assert0(task != NULL, "Invalid parameter");
-
-  DEBUG1("Destroying task %s...", SD_task_get_name(task));
-
-  __SD_task_remove_dependencies(task);
-  /* if the task was scheduled or runnable we have to free the scheduling parameters */
-  if (__SD_task_is_scheduled_or_runnable(task))
-    __SD_task_destroy_scheduling_data(task);
-  xbt_swag_remove(task, task->state_set);
-
-  if (task->name != NULL)
-    xbt_free(task->name);
-
-  if (task->surf_action != NULL)
-    surf_workstation_model->action_unref(task->surf_action);
-
-  if (task->workstation_list != NULL)
-    xbt_free(task->workstation_list);
-
-  if (task->communication_amount)
-    xbt_free(task->communication_amount);
-
-  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);
-
-  sd_global->task_number--;
-
-  DEBUG0("Task destroyed.");
-}
-
-
 static XBT_INLINE SD_task_t SD_task_create_sized(const char *name,
                                                  void *data, double amount,
                                                  int ws_count)
@@ -1355,23 +1311,23 @@ void SD_task_schedulev(SD_task_t task, int count,
   int i;
   SD_dependency_t dep;
   unsigned int cpt;
-  xbt_assert1(task->kind != 0,
+  xbt_assert(task->kind != 0,
               "Task %s is not typed. Cannot automatically schedule it.",
               SD_task_get_name(task));
   switch (task->kind) {
   case SD_TASK_COMM_E2E:
   case SD_TASK_COMP_SEQ:
-    xbt_assert(task->workstation_nb == count);
+    xbt_assert(task->workstation_nb == count,"Got %d locations, but were expecting %d locations",count,task->workstation_nb);
     for (i = 0; i < count; i++)
       task->workstation_list[i] = list[i];
     SD_task_do_schedule(task);
     break;
   default:
-    xbt_die(bprintf("Kind of task %s not supported by SD_task_schedulev()",
-                    SD_task_get_name(task)));
+    xbt_die("Kind of task %s not supported by SD_task_schedulev()",
+            SD_task_get_name(task));
   }
   if (task->kind == SD_TASK_COMM_E2E) {
-    VERB4("Schedule comm task %s between %s -> %s. It costs %.f bytes",
+    XBT_VERB("Schedule comm task %s between %s -> %s. It costs %.f bytes",
           SD_task_get_name(task),
           SD_workstation_get_name(task->workstation_list[0]),
           SD_workstation_get_name(task->workstation_list[1]),
@@ -1380,7 +1336,7 @@ void SD_task_schedulev(SD_task_t task, int count,
   }
   /* Iterate over all childs and parent being COMM_E2E to say where I am located (and start them if runnable) */
   if (task->kind == SD_TASK_COMP_SEQ) {
-    VERB3("Schedule computation task %s on %s. It costs %.f flops",
+    XBT_VERB("Schedule computation task %s on %s. It costs %.f flops",
           SD_task_get_name(task),
           SD_workstation_get_name(task->workstation_list[0]),
           task->computation_amount[0]);
@@ -1394,7 +1350,7 @@ void SD_task_schedulev(SD_task_t task, int count,
             (__SD_task_is_schedulable(before)
              || __SD_task_is_not_scheduled(before))) {
           SD_task_do_schedule(before);
-          VERB4
+          XBT_VERB
               ("Auto-Schedule comm task %s between %s -> %s. It costs %.f bytes",
                SD_task_get_name(before),
                SD_workstation_get_name(before->workstation_list[0]),
@@ -1412,7 +1368,7 @@ void SD_task_schedulev(SD_task_t task, int count,
             && (__SD_task_is_not_scheduled(after)
                 || __SD_task_is_schedulable(after))) {
           SD_task_do_schedule(after);
-          VERB4
+          XBT_VERB
               ("Auto-Schedule comm task %s between %s -> %s. It costs %.f bytes",
                SD_task_get_name(after),
                SD_workstation_get_name(after->workstation_list[0]),