Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Add levels to lib host_lib, link_lib and as_router_lib
[simgrid.git] / src / simdag / sd_global.c
index df22d65..2481b2c 100644 (file)
+/* Copyright (c) 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
 #include "private.h"
 #include "xbt/sysdep.h"
 #include "xbt/dynar.h"
 #include "surf/surf.h"
 #include "xbt/ex.h"
 #include "xbt/log.h"
+#include "xbt/str.h"
 #include "xbt/config.h"
-
-XBT_LOG_NEW_CATEGORY(sd,"Logging specific to SimDag");
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_kernel,sd,
-                               "Logging specific to SimDag (kernel)");
+#include "instr/instr_private.h"
+#include "surf/surfxml_parse.h"
+#ifdef HAVE_LUA
+#include <lua.h>
+#include <lauxlib.h>
+#include <lualib.h>
+#endif
+
+#ifdef HAVE_JEDULE
+#include "instr/jedule/jedule_sd_binding.h"
+#endif
+
+XBT_LOG_NEW_CATEGORY(sd, "Logging specific to SimDag");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_kernel, sd,
+                                "Logging specific to SimDag (kernel)");
 
 SD_global_t sd_global = NULL;
 
-/* $Id$ */
-
-/* Copyright (c) 2007 Arnaud Legrand.
-   All rights reserved.                                          */
-
-/* This program is free software; you can redistribute it and/or modify it
- * under the terms of the license (GNU LGPL) which comes with this package. */
-
-static int _sd_init_status = 0;        /* 0: beginning of time; 
-                                  1: pre-inited (cfg_set created); 
-                                  2: inited (running) */
-static xbt_cfg_t _sd_cfg_set = NULL;
-
-/* callback of the workstation_model variable */
-static void _sd_cfg_cb__workstation_model(const char *name, int pos)
-{
-  char *val;
-
-  xbt_assert0(_sd_init_status < 2,
-             "Cannot change the model after the initialization");
-
-  val = xbt_cfg_get_string(_sd_cfg_set, name);
-  find_model_description(surf_workstation_model_description,
-                           surf_workstation_model_description_size,
-                           val);
-}
-
-/* callback of the cpu_model variable */
-static void _sd_cfg_cb__cpu_model(const char *name, int pos)
-{
-  char *val;
-
-  xbt_assert0(_sd_init_status < 2,
-             "Cannot change the model after the initialization");
-
-  val = xbt_cfg_get_string(_sd_cfg_set, name);
-  find_model_description(surf_cpu_model_description,
-                           surf_cpu_model_description_size, val);
-}
-
-/* callback of the workstation_model variable */
-static void _sd_cfg_cb__network_model(const char *name, int pos)
-{
-  char *val;
-
-  xbt_assert0(_sd_init_status < 2,
-             "Cannot change the model after the initialization");
-
-  val = xbt_cfg_get_string(_sd_cfg_set, name);
-  find_model_description(surf_network_model_description,
-                           surf_network_model_description_size, val);
-}
-
-/* create the config set and register what should be */
-static void sd_config_init(void)
-{
-
-  if (_sd_init_status)
-    return;                    /* Already inited, nothing to do */
-
-  _sd_init_status = 1;
-  _sd_cfg_set = xbt_cfg_new();
-
-  xbt_cfg_register(_sd_cfg_set,
-                  "workstation_model", xbt_cfgelm_string, 1, 1,
-                  &_sd_cfg_cb__workstation_model, NULL);
-
-  xbt_cfg_register(_sd_cfg_set,
-                  "cpu_model", xbt_cfgelm_string, 1, 1,
-                  &_sd_cfg_cb__cpu_model, NULL);
-  xbt_cfg_register(_sd_cfg_set,
-                  "network_model", xbt_cfgelm_string, 1, 1,
-                  &_sd_cfg_cb__network_model, NULL);
-
-  xbt_cfg_set_string(_sd_cfg_set, "workstation_model", "ptask_L07");
-}
-
-static void sd_config_finalize(void)
-{
-
-  if (!_sd_init_status)
-    return;                    /* Not initialized yet. Nothing to do */
-
-  xbt_cfg_free(&_sd_cfg_set);
-  _sd_init_status = 0;
-}
-
-static void sd_config(const char *name, va_list pa)
-{
-  if (!_sd_init_status) {
-    sd_config_init();
-  }
-  xbt_cfg_set_vargs(_sd_cfg_set, name, pa);
-}
-
-
-static void __sd_config_helper(const char *name, ...)
-{
-  va_list pa;
-  va_start(pa, name);
-
-  sd_config(name, pa);
-
-  va_end(pa);
-}
-
-static void sd_cfg_control_set(const char *control_string)
-{
-  /* To split the string in commands, and the cursors */
-  xbt_dynar_t set_strings;
-  char *str;
-  unsigned int cpt;
-
-  if (!control_string)
-    return;
-  DEBUG1("Parse log settings '%s'", control_string);
-
-  /* split the string, and remove empty entries */
-  set_strings = xbt_str_split_quoted(control_string);
-
-  if (xbt_dynar_length(set_strings) == 0) {    /* vicious user! */
-    xbt_dynar_free(&set_strings);
-    return;
-  }
-  /* Parse each entry and either use it right now (if the category was already
-     created), or store it for further use */
-  xbt_dynar_foreach(set_strings, cpt, str) {
-    char *control_string, *control_string_sav, *name, *value;
-
-
-    control_string = control_string_sav = strdup(str);
-    control_string += strspn(control_string, " ");
-    name = control_string;
-    control_string += strcspn(str, ":=");
-    value = control_string;
-    *value = 0;
-    value++;
-
-    xbt_assert1(strlen(name) != 0, "Invalid name for configuration: '%s'",
-               name);
-    xbt_assert1(strlen(value) != 0,
-               "Invalid value for configuration: '%s'", value);
-    INFO2("setting '%s' to '%s'", name, value);
-
-    __sd_config_helper(name, value);
-
-    free(control_string_sav);
-  }
-  xbt_dynar_free(&set_strings);
-}
-
-static void sd_cfg_init(int *argc, char **argv)
-{
-  int i, j;
-  char *opt;
-
-  for (i = 1; i < *argc; i++) {
-    if (!strncmp(argv[i], "--cfg=", strlen("--cfg="))) {
-      opt = strchr(argv[i], '=');
-      opt++;
-
-      sd_cfg_control_set(opt);
-      DEBUG1("Did apply '%s' as config setting", opt);
-      /*remove this from argv */
-
-      for (j = i + 1; j < *argc; j++) {
-       argv[j - 1] = argv[j];
-      }
-
-      argv[j - 1] = NULL;
-      (*argc)--;
-      i--;                     /* compensate effect of next loop incrementation */
-    }
-  }
-}
+XBT_LOG_EXTERNAL_CATEGORY(sd_kernel);
+XBT_LOG_EXTERNAL_CATEGORY(sd_task);
+XBT_LOG_EXTERNAL_CATEGORY(sd_workstation);
 
 /**
  * \brief Initialises SD internal data
@@ -198,11 +44,21 @@ static void sd_cfg_init(int *argc, char **argv)
  * \param argv argument list
  * \see SD_create_environment(), SD_exit()
  */
-void SD_init(int *argc, char **argv) {
+void SD_init(int *argc, char **argv)
+{
+#ifdef HAVE_TRACING
+  TRACE_global_init(argc, argv);
+#endif
 
   s_SD_task_t task;
-  
-  xbt_assert0( !SD_INITIALISED() , "SD_init() already called");
+
+  xbt_assert0(!SD_INITIALISED(), "SD_init() already called");
+
+  /* Connect our log channels: that must be done manually under windows */
+  XBT_LOG_CONNECT(sd_kernel, sd);
+  XBT_LOG_CONNECT(sd_task, sd);
+  XBT_LOG_CONNECT(sd_workstation, sd);
+
 
   sd_global = xbt_new(s_SD_global_t, 1);
   sd_global->workstations = xbt_dict_new();
@@ -214,55 +70,95 @@ void SD_init(int *argc, char **argv) {
   sd_global->recyclable_route = NULL;
   sd_global->watch_point_reached = 0;
 
-  sd_global->not_scheduled_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
-  sd_global->scheduled_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
-  sd_global->ready_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
-  sd_global->in_fifo_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
-  sd_global->running_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
-  sd_global->done_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
-  sd_global->failed_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
+  sd_global->not_scheduled_task_set =
+      xbt_swag_new(xbt_swag_offset(task, state_hookup));
+  sd_global->schedulable_task_set =
+      xbt_swag_new(xbt_swag_offset(task, state_hookup));
+  sd_global->scheduled_task_set =
+      xbt_swag_new(xbt_swag_offset(task, state_hookup));
+  sd_global->runnable_task_set =
+      xbt_swag_new(xbt_swag_offset(task, state_hookup));
+  sd_global->in_fifo_task_set =
+      xbt_swag_new(xbt_swag_offset(task, state_hookup));
+  sd_global->running_task_set =
+      xbt_swag_new(xbt_swag_offset(task, state_hookup));
+  sd_global->done_task_set =
+      xbt_swag_new(xbt_swag_offset(task, state_hookup));
+  sd_global->failed_task_set =
+      xbt_swag_new(xbt_swag_offset(task, state_hookup));
   sd_global->task_number = 0;
 
   surf_init(argc, argv);
-  sd_cfg_init(argc, argv);
+
+  xbt_cfg_setdefault_string(_surf_cfg_set, "workstation/model",
+                            "ptask_L07");
+
+#ifdef HAVE_TRACING
+  TRACE_start ();
+#endif
+
+#ifdef HAVE_JEDULE
+  jedule_sd_init();
+#endif
+
+  XBT_DEBUG("ADD SD LEVELS");
+  SD_HOST_LEVEL = xbt_lib_add_level(host_lib,free);
+  SD_LINK_LEVEL = xbt_lib_add_level(link_lib,free);
 }
 
 /**
  * \brief Reinits the application part of the simulation (experimental feature)
- * 
- * This function allows you to run several simulations on the same platform 
- * by resetting the part describing the application. 
- * 
+ *
+ * This function allows you to run several simulations on the same platform
+ * by resetting the part describing the application.
+ *
  * @warning: this function is still experimental and not perfect. For example,
  * the simulation clock (and traces usage) is not reset. So, do not use it if
  * you use traces in your simulation, and do not use absolute timing after using it.
  * That being said, this function is still precious if you want to compare a bunch of
  * heuristics on the same platforms.
  */
-void SD_application_reinit(void) {
-   
+void SD_application_reinit(void)
+{
+
   s_SD_task_t task;
-   
+
   if (SD_INITIALISED()) {
-    DEBUG0("Recreating the swags...");
+    XBT_DEBUG("Recreating the swags...");
     xbt_swag_free(sd_global->not_scheduled_task_set);
+    xbt_swag_free(sd_global->schedulable_task_set);
     xbt_swag_free(sd_global->scheduled_task_set);
-    xbt_swag_free(sd_global->ready_task_set);
+    xbt_swag_free(sd_global->runnable_task_set);
     xbt_swag_free(sd_global->in_fifo_task_set);
     xbt_swag_free(sd_global->running_task_set);
     xbt_swag_free(sd_global->done_task_set);
     xbt_swag_free(sd_global->failed_task_set);
 
-    sd_global->not_scheduled_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
-    sd_global->scheduled_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
-    sd_global->ready_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
-    sd_global->in_fifo_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
-    sd_global->running_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
-    sd_global->done_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
-    sd_global->failed_task_set = xbt_swag_new(xbt_swag_offset(task, state_hookup));
+    sd_global->not_scheduled_task_set =
+        xbt_swag_new(xbt_swag_offset(task, state_hookup));
+    sd_global->schedulable_task_set =
+        xbt_swag_new(xbt_swag_offset(task, state_hookup));
+    sd_global->scheduled_task_set =
+        xbt_swag_new(xbt_swag_offset(task, state_hookup));
+    sd_global->runnable_task_set =
+        xbt_swag_new(xbt_swag_offset(task, state_hookup));
+    sd_global->in_fifo_task_set =
+        xbt_swag_new(xbt_swag_offset(task, state_hookup));
+    sd_global->running_task_set =
+        xbt_swag_new(xbt_swag_offset(task, state_hookup));
+    sd_global->done_task_set =
+        xbt_swag_new(xbt_swag_offset(task, state_hookup));
+    sd_global->failed_task_set =
+        xbt_swag_new(xbt_swag_offset(task, state_hookup));
     sd_global->task_number = 0;
+
+#ifdef HAVE_JEDULE
+    jedule_sd_cleanup();
+    jedule_sd_init();
+#endif
+
   } else {
-    WARN0("SD_application_reinit called before initialization of SimDag");
+    XBT_WARN("SD_application_reinit called before initialization of SimDag");
     /* we cannot use exceptions here because xbt is not running! */
   }
 
@@ -280,260 +176,203 @@ void SD_application_reinit(void) {
  *
  * The XML file follows this DTD:
  *
- *     \include surfxml.dtd
+ *     \include simgrid.dtd
  *
- * Here is a small example of such a platform: 
+ * Here is a small example of such a platform:
  *
  *     \include small_platform.xml
  */
-void SD_create_environment(const char *platform_file) {
+void SD_create_environment(const char *platform_file)
+{
   xbt_dict_cursor_t cursor = NULL;
   char *name = NULL;
   void *surf_workstation = NULL;
   void *surf_link = NULL;
-  char *workstation_model_name;
-  int workstation_id = -1;
-
-  SD_CHECK_INIT_DONE();
 
-  DEBUG0("SD_create_environment");
-
-  sd_config_init();
-  surf_timer_model_init(platform_file);
-
-  workstation_model_name =
-      xbt_cfg_get_string(_sd_cfg_set, "workstation_model");
-
-  DEBUG1("Model : %s", workstation_model_name);
-  workstation_id =
-      find_model_description(surf_workstation_model_description,
-                               surf_workstation_model_description_size,
-                               workstation_model_name);
-  if (!strcmp(workstation_model_name, "compound")) {
-    xbt_ex_t e;
-    char *network_model_name = NULL;
-    char *cpu_model_name = NULL;
-    int network_id = -1;
-    int cpu_id = -1;
-
-    TRY {
-      cpu_model_name = xbt_cfg_get_string(_sd_cfg_set, "cpu_model");
-    } CATCH(e) {
-      if (e.category == bound_error) {
-       xbt_assert0(0,
-                   "Set a cpu model to use with the 'compound' workstation model");
-       xbt_ex_free(e);
-      } else {
-       RETHROW;
-      }
-    }
-
-    TRY {
-      network_model_name =
-         xbt_cfg_get_string(_sd_cfg_set, "network_model");
-    }
-    CATCH(e) {
-      if (e.category == bound_error) {
-       xbt_assert0(0,
-                   "Set a network model to use with the 'compound' workstation model");
-       xbt_ex_free(e);
-      } else {
-       RETHROW;
-      }
-    }
-
-    network_id =
-       find_model_description(surf_network_model_description,
-                                 surf_network_model_description_size,
-                                 network_model_name);
-    cpu_id =
-       find_model_description(surf_cpu_model_description,
-                                 surf_cpu_model_description_size,
-                                 cpu_model_name);
-
-    surf_cpu_model_description[cpu_id].model_init(platform_file);
-    surf_network_model_description[network_id].model_init(platform_file);
-  }
-
-  DEBUG0("Call workstation_model_init");
-  surf_workstation_model_description[workstation_id].
-      model_init(platform_file);
+  platform_filename = bprintf("%s",platform_file);
 
+  // Reset callbacks
+  surf_parse_reset_callbacks();
+  // Add config callbacks
+  surf_parse_add_callback_config();
+  SD_CHECK_INIT_DONE();
   parse_platform_file(platform_file);
-
-  _sd_init_status = 2;
+  surf_config_models_create_elms();
 
   /* now let's create the SD wrappers for workstations and links */
-  xbt_dict_foreach(workstation_set, cursor, name, surf_workstation) {
+  xbt_dict_foreach(surf_model_resource_set(surf_workstation_model), cursor,
+                   name, surf_workstation) {
     __SD_workstation_create(surf_workstation, NULL);
   }
 
-  xbt_dict_foreach(link_set, cursor, name, surf_link) {
+  xbt_dict_foreach(surf_model_resource_set(surf_network_model), cursor,
+                   name, surf_link) {
     __SD_link_create(surf_link, NULL);
   }
 
-  DEBUG2("Workstation number: %d, link number: %d", SD_workstation_get_number(), SD_link_get_number());
+  XBT_DEBUG("Workstation number: %d, link number: %d",
+         SD_workstation_get_number(), SD_link_get_number());
+#ifdef HAVE_JEDULE
+  jedule_setup_platform();
+#endif
 }
 
 /**
  * \brief Launches the simulation.
  *
- * The function will execute the \ref SD_READY ready tasks.
- * The simulation will be stopped when its time reaches \a how_long,
- * when a watch point is reached, or when no more task can be executed.
+ * The function will execute the \ref SD_RUNNABLE runnable tasks.
+ * If \a how_long is positive, then the simulation will be stopped either
+ * when time reaches \a how_long or when a watch point is reached.
+ * A nonpositive value for \a how_long means no time limit, in which case
+ * the simulation will be stopped either when a watch point is reached or
+ * when no more task can be executed.
  * Then you can call SD_simulate() again.
- * 
+ *
  * \param how_long maximum duration of the simulation (a negative value means no time limit)
  * \return a NULL-terminated array of \ref SD_task_t whose state has changed.
  * \see SD_task_schedule(), SD_task_watch()
  */
-SD_task_t* SD_simulate(double how_long)
+xbt_dynar_t SD_simulate(double how_long)
 {
-  double total_time = 0.0; /* we stop the simulation when total_time >= how_long */
+  double total_time = 0.0;      /* we stop the simulation when total_time >= how_long */
   double elapsed_time = 0.0;
-  SD_task_t task, dst;
+  SD_task_t task, task_safe, dst;
   SD_dependency_t dependency;
   surf_action_t action;
-  SD_task_t *changed_tasks = NULL;
-  int changed_task_number = 0;
-  int changed_task_capacity = sd_global->task_number + 1;
-  unsigned int iter;
+  xbt_dynar_t changed_tasks = xbt_dynar_new(sizeof(SD_task_t), NULL);
+  unsigned int iter, depcnt;
   static int first_time = 1;
 
   SD_CHECK_INIT_DONE();
 
-  INFO0("Starting simulation...");
+   if (first_time) {
+    XBT_VERB("Starting simulation...");
 
-  /* create the array that will be returned */
-  changed_tasks = xbt_new(SD_task_t, changed_task_capacity);
-  changed_tasks[0] = NULL;
-
-  if (first_time) {
-    surf_solve(); /* Takes traces into account. Returns 0.0 */
+    surf_presolve();            /* Takes traces into account */
     first_time = 0;
   }
 
-  if(how_long>0) {
-    surf_timer_model->extension_public->set(surf_get_clock()+how_long,
-                                              NULL,NULL);
-  }
   sd_global->watch_point_reached = 0;
 
-  /* explore the ready tasks */
-  xbt_swag_foreach(task, sd_global->ready_task_set) {
-    INFO1("Executing task '%s'", SD_task_get_name(task));
-    if ((task->state_changed = __SD_task_try_to_run(task))) {
-      changed_tasks[changed_task_number++] = task; /* replace NULL by the task */
-      /*
-      if (changed_task_number == changed_task_capacity) {
-       changed_task_capacity *= 2;
-       changed_tasks = xbt_realloc(changed_tasks, sizeof(SD_task_t) * changed_task_capacity);
-      }
-      */
-      changed_tasks[changed_task_number] = NULL;
-    }
+  /* explore the runnable tasks */
+  xbt_swag_foreach_safe(task, task_safe, sd_global->runnable_task_set) {
+    XBT_VERB("Executing task '%s'", SD_task_get_name(task));
+    if (__SD_task_try_to_run(task)
+        && !xbt_dynar_member(changed_tasks, &task))
+      xbt_dynar_push(changed_tasks, &task);
   }
 
   /* main loop */
   elapsed_time = 0.0;
   while (elapsed_time >= 0.0 &&
-        (how_long < 0.0 || total_time < how_long) &&
-        !sd_global->watch_point_reached) {
+         (how_long < 0.0 || total_time < how_long) &&
+         !sd_global->watch_point_reached) {
     surf_model_t model = NULL;
     /* dumb variables */
-    void *fun = NULL;
-    void *arg = NULL;
 
 
-    DEBUG1("Total time: %f", total_time);
+    XBT_DEBUG("Total time: %f", total_time);
 
-    elapsed_time = surf_solve();
-    DEBUG1("surf_solve() returns %f", elapsed_time);
+    elapsed_time = surf_solve(how_long > 0 ? surf_get_clock() + how_long : -1.0);
+    XBT_DEBUG("surf_solve() returns %f", elapsed_time);
     if (elapsed_time > 0.0)
       total_time += elapsed_time;
 
     /* let's see which tasks are done */
     xbt_dynar_foreach(model_list, iter, model) {
-      while ((action = xbt_swag_extract(model->common_public->
-                                       states.done_action_set))) {
-       task = action->data;
-       INFO1("Task '%s' done", SD_task_get_name(task));
-       DEBUG0("Calling __SD_task_just_done");
-       __SD_task_just_done(task);
-       DEBUG1("__SD_task_just_done called on task '%s'", SD_task_get_name(task));
-       
-       /* the state has changed */
-       if (!task->state_changed) {
-         task->state_changed = 1;
-         changed_tasks[changed_task_number++] = task;
-         /*
-           if (changed_task_number == changed_task_capacity) {
-           changed_task_capacity *= 2;
-           changed_tasks = xbt_realloc(changed_tasks, sizeof(SD_task_t) * changed_task_capacity);
-           }
-         */
-         changed_tasks[changed_task_number] = NULL;
-       }
-
-       /* remove the dependencies after this task */
-       while (xbt_dynar_length(task->tasks_after) > 0) {
-         xbt_dynar_get_cpy(task->tasks_after, 0, &dependency);
-         dst = dependency->dst;
-         SD_task_dependency_remove(task, dst);
-         
-         /* is dst ready now? */
-         if (__SD_task_is_ready(dst) && !sd_global->watch_point_reached) {
-           INFO1("Executing task '%s'", SD_task_get_name(dst));
-           if (__SD_task_try_to_run(dst)) {
-             changed_tasks[changed_task_number++] = dst;
-             /*
-               if (changed_task_number == changed_task_capacity) {
-               changed_task_capacity *= 2;
-               changed_tasks = xbt_realloc(changed_tasks, sizeof(SD_task_t) * changed_task_capacity);
-               }
-             */
-             changed_tasks[changed_task_number] = NULL;
-           }
-         }
-       }
+      while ((action = xbt_swag_extract(model->states.done_action_set))) {
+        task = action->data;
+        task->start_time =
+            surf_workstation_model->
+            action_get_start_time(task->surf_action);
+        task->finish_time = surf_get_clock();
+        XBT_VERB("Task '%s' done", SD_task_get_name(task));
+        XBT_DEBUG("Calling __SD_task_just_done");
+        __SD_task_just_done(task);
+        XBT_DEBUG("__SD_task_just_done called on task '%s'",
+               SD_task_get_name(task));
+
+        /* the state has changed */
+        if (!xbt_dynar_member(changed_tasks, &task))
+          xbt_dynar_push(changed_tasks, &task);
+
+        /* remove the dependencies after this task */
+        xbt_dynar_foreach(task->tasks_after, depcnt, dependency) {
+          dst = dependency->dst;
+          if (dst->unsatisfied_dependencies > 0)
+            dst->unsatisfied_dependencies--;
+          if (dst->is_not_ready > 0)
+            dst->is_not_ready--;
+
+          if (!(dst->unsatisfied_dependencies)) {
+            if (__SD_task_is_scheduled(dst))
+              __SD_task_set_state(dst, SD_RUNNABLE);
+            else
+              __SD_task_set_state(dst, SD_SCHEDULABLE);
+          }
+
+          if (SD_task_get_kind(dst) == SD_TASK_COMM_E2E) {
+            SD_dependency_t comm_dep;
+            SD_task_t comm_dst;
+            xbt_dynar_get_cpy(dst->tasks_after, 0, &comm_dep);
+            comm_dst = comm_dep->dst;
+            if (__SD_task_is_not_scheduled(comm_dst) &&
+                comm_dst->is_not_ready > 0) {
+              comm_dst->is_not_ready--;
+
+              if (!(comm_dst->is_not_ready)) {
+                __SD_task_set_state(comm_dst, SD_SCHEDULABLE);
+              }
+            }
+          }
+
+          /* is dst runnable now? */
+          if (__SD_task_is_runnable(dst)
+              && !sd_global->watch_point_reached) {
+            XBT_VERB("Executing task '%s'", SD_task_get_name(dst));
+            if (__SD_task_try_to_run(dst) &&
+                !xbt_dynar_member(changed_tasks, &task))
+              xbt_dynar_push(changed_tasks, &task);
+          }
+        }
       }
 
       /* let's see which tasks have just failed */
-      while ((action = xbt_swag_extract(model->common_public->states.failed_action_set))) {
-       task = action->data;
-       INFO1("Task '%s' failed", SD_task_get_name(task));
-       __SD_task_set_state(task, SD_FAILED);
-       surf_workstation_model->common_public->action_free(action);
-       task->surf_action = NULL;
-       
-       if (!task->state_changed) {
-         task->state_changed = 1;
-         changed_tasks[changed_task_number++] = task;
-         /*
-           if (changed_task_number == changed_task_capacity) {
-           changed_task_capacity *= 2;
-           changed_tasks = xbt_realloc(changed_tasks, sizeof(SD_task_t) * changed_task_capacity);
-           }
-         */
-         changed_tasks[changed_task_number] = NULL;
-       }
+      while ((action = xbt_swag_extract(model->states.failed_action_set))) {
+        task = action->data;
+        task->start_time =
+            surf_workstation_model->
+            action_get_start_time(task->surf_action);
+        task->finish_time = surf_get_clock();
+        XBT_VERB("Task '%s' failed", SD_task_get_name(task));
+        __SD_task_set_state(task, SD_FAILED);
+        surf_workstation_model->action_unref(action);
+        task->surf_action = NULL;
+
+        if (!xbt_dynar_member(changed_tasks, &task))
+          xbt_dynar_push(changed_tasks, &task);
       }
     }
-
-    while (surf_timer_model->extension_public->get(&fun,(void*)&arg)) {
-    }
   }
 
-  /* we must reset every task->state_changed */
-  iter = 0;
-  while (changed_tasks[iter] != NULL) {
-    changed_tasks[iter]->state_changed = 0;
-    iter++;
+  if (!sd_global->watch_point_reached && how_long<0){
+    if (xbt_swag_size(sd_global->done_task_set) < sd_global->task_number){
+        XBT_WARN("Simulation is finished but some tasks are still not done");
+       xbt_swag_foreach_safe (task, task_safe,sd_global->not_scheduled_task_set){
+                XBT_WARN("%s is in SD_NOT_SCHEDULED state", SD_task_get_name(task));
+               }
+       xbt_swag_foreach_safe (task, task_safe,sd_global->schedulable_task_set){
+                XBT_WARN("%s is in SD_SCHEDULABLE state", SD_task_get_name(task));
+       }
+       xbt_swag_foreach_safe (task, task_safe,sd_global->scheduled_task_set){
+                XBT_WARN("%s is in SD_SCHEDULED state", SD_task_get_name(task));
+               }
+    }
   }
 
-  INFO0("Simulation finished");
-  DEBUG3("elapsed_time = %f, total_time = %f, watch_point_reached = %d", elapsed_time, total_time, sd_global->watch_point_reached);
-  DEBUG1("current time = %f", surf_get_clock());
+  XBT_DEBUG("elapsed_time = %f, total_time = %f, watch_point_reached = %d",
+         elapsed_time, total_time, sd_global->watch_point_reached);
+  XBT_DEBUG("current time = %f", surf_get_clock());
 
   return changed_tasks;
 }
@@ -543,7 +382,8 @@ SD_task_t* SD_simulate(double how_long)
  *
  * \return the current clock, in second
  */
-double SD_get_clock(void) {
+double SD_get_clock(void)
+{
   SD_CHECK_INIT_DONE();
 
   return surf_get_clock();
@@ -557,13 +397,17 @@ double SD_get_clock(void) {
  *
  * \see SD_init(), SD_task_destroy()
  */
-void SD_exit(void) {
+void SD_exit(void)
+{
+#ifdef HAVE_TRACING
+  TRACE_surf_release();
+#endif
   if (SD_INITIALISED()) {
-    DEBUG0("Destroying workstation and link dictionaries...");
+    XBT_DEBUG("Destroying workstation and link dictionaries...");
     xbt_dict_free(&sd_global->workstations);
     xbt_dict_free(&sd_global->links);
 
-    DEBUG0("Destroying workstation and link arrays if necessary...");
+    XBT_DEBUG("Destroying workstation and link arrays if necessary...");
     if (sd_global->workstation_list != NULL)
       xbt_free(sd_global->workstation_list);
 
@@ -573,10 +417,11 @@ void SD_exit(void) {
     if (sd_global->recyclable_route != NULL)
       xbt_free(sd_global->recyclable_route);
 
-    DEBUG0("Destroying the swags...");
+    XBT_DEBUG("Destroying the swags...");
     xbt_swag_free(sd_global->not_scheduled_task_set);
+    xbt_swag_free(sd_global->schedulable_task_set);
     xbt_swag_free(sd_global->scheduled_task_set);
-    xbt_swag_free(sd_global->ready_task_set);
+    xbt_swag_free(sd_global->runnable_task_set);
     xbt_swag_free(sd_global->in_fifo_task_set);
     xbt_swag_free(sd_global->running_task_set);
     xbt_swag_free(sd_global->done_task_set);
@@ -585,11 +430,39 @@ void SD_exit(void) {
     xbt_free(sd_global);
     sd_global = NULL;
 
-    DEBUG0("Exiting Surf...");
+#ifdef HAVE_TRACING
+  TRACE_end();
+#endif
+#ifdef HAVE_JEDULE
+  jedule_sd_dump();
+  jedule_sd_cleanup();
+#endif
+
+    XBT_DEBUG("Exiting Surf...");
     surf_exit();
-  }
-  else {
-    WARN0("SD_exit() called, but SimDag is not running");
+  } else {
+    XBT_WARN("SD_exit() called, but SimDag is not running");
     /* we cannot use exceptions here because xbt is not running! */
   }
 }
+
+/**
+ * \bried load script file
+ */
+
+void SD_load_environment_script(const char *script_file)
+{
+#ifdef HAVE_LUA
+  lua_State *L = lua_open();
+  luaL_openlibs(L);
+
+  if (luaL_loadfile(L, script_file) || lua_pcall(L, 0, 0, 0)) {
+    printf("error: %s\n", lua_tostring(L, -1));
+    return;
+  }
+#else
+  xbt_die
+      ("Lua is not available!! to call SD_load_environment_script, lua should be available...");
+#endif
+  return;
+}