Add dsend_bounded send_with_timeout_bounded

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

diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c
index d979db3..b10b000 100644 (file)
--- a/src/simdag/sd_global.c
+++ b/src/simdag/sd_global.c
@@ -5,6 +5,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "private.h"
+#include "instr/instr_interface.h"
 #include "xbt/sysdep.h"
 #include "xbt/dynar.h"
 #include "surf/surf.h"
@@ -13,7 +14,6 @@
 #include "xbt/log.h"
 #include "xbt/str.h"
 #include "xbt/config.h"
-#include "instr/instr_private.h"
 #include "surf/surfxml_parse.h"
 #ifdef HAVE_LUA
 #include <lua.h>
@@ -32,7 +32,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_kernel, sd,
 SD_global_t sd_global = NULL;
 
 /**
- * \brief Initialises SD internal data
+ * \brief Initializes SD internal data
  *
  * This function must be called before any other SD function. Then you
  * should call SD_create_environment().
@@ -114,20 +114,34 @@ void SD_application_reinit(void)
 
   s_SD_task_t task;
 
-  XBT_DEBUG("Recreating the swags...");
+  SD_task_t done_task, next_done_task;
+
+   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->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->schedulable_task_set =
       xbt_swag_new(xbt_swag_offset(task, state_hookup));
+  xbt_swag_foreach_safe(done_task, next_done_task, sd_global->done_task_set){
+    if (xbt_dynar_is_empty(done_task->tasks_before)){
+      __SD_task_set_state(done_task, SD_SCHEDULABLE);
+    } else{
+      __SD_task_set_state(done_task, SD_NOT_SCHEDULED);
+      done_task->unsatisfied_dependencies =
+        xbt_dynar_length(done_task->tasks_before);
+      done_task->is_not_ready = done_task->unsatisfied_dependencies;
+    }
+  }
+
+  xbt_swag_free(sd_global->done_task_set);
+
   sd_global->scheduled_task_set =
       xbt_swag_new(xbt_swag_offset(task, state_hookup));
   sd_global->runnable_task_set =
@@ -142,6 +156,7 @@ void SD_application_reinit(void)
       xbt_swag_new(xbt_swag_offset(task, state_hookup));
   sd_global->task_number = 0;
 
+
 #ifdef HAVE_JEDULE
   jedule_sd_cleanup();
   jedule_sd_init();
@@ -151,9 +166,9 @@ void SD_application_reinit(void)
 /**
  * \brief Creates the environment
  *
- * The environment (i.e. the \ref SD_workstation_management "workstations" and the
- * \ref SD_link_management "links") is created with the data stored in the given XML
- * platform file.
+ * The environment (i.e. the \ref SD_workstation_management "workstations"
+ * and the \ref SD_link_management "links") is created with the data stored
+ * in the given XML platform file.
  *
  * \param platform_file name of an XML file describing the environment to create
  * \see SD_workstation_management, SD_link_management
@@ -199,7 +214,7 @@ void SD_create_environment(const char *platform_file)
  * 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
+ * A non-positive 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.
@@ -290,6 +305,10 @@ xbt_swag_t SD_simulate_swag(double how_long) {
           if (dst->is_not_ready > 0)
             dst->is_not_ready--;
 
+          XBT_DEBUG("Released a dependency on %s: %d remain(s). Became schedulable if %d=0",
+             SD_task_get_name(dst), dst->unsatisfied_dependencies,
+             dst->is_not_ready);
+
           if (!(dst->unsatisfied_dependencies)) {
             if (__SD_task_is_scheduled(dst))
               __SD_task_set_state(dst, SD_RUNNABLE);
@@ -297,6 +316,10 @@ xbt_swag_t SD_simulate_swag(double how_long) {
               __SD_task_set_state(dst, SD_SCHEDULABLE);
           }
 
+          if (__SD_task_is_not_scheduled(dst) && !(dst->is_not_ready)) {
+            __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;
@@ -306,6 +329,10 @@ xbt_swag_t SD_simulate_swag(double how_long) {
                 comm_dst->is_not_ready > 0) {
               comm_dst->is_not_ready--;
 
+            XBT_DEBUG("%s is a transfer, %s may be ready now if %d=0",
+               SD_task_get_name(dst), SD_task_get_name(comm_dst),
+               comm_dst->is_not_ready);
+
               if (!(comm_dst->is_not_ready)) {
                 __SD_task_set_state(comm_dst, SD_SCHEDULABLE);
               }
@@ -374,15 +401,15 @@ double SD_get_clock(void) {
 /**
  * \brief Destroys all SD internal data
  *
- * This function should be called when the simulation is over. Don't forget also to destroy
- * the tasks.
+ * This function should be called when the simulation is over. Don't forget
+ * to destroy too.
  *
  * \see SD_init(), SD_task_destroy()
  */
 void SD_exit(void)
 {
 #ifdef HAVE_TRACING
-  TRACE_surf_release();
+  TRACE_surf_resource_utilization_release();
 #endif
 
   xbt_mallocator_free(sd_global->task_mallocator);
@@ -418,24 +445,3 @@ void SD_exit(void)
   jedule_sd_cleanup();
 #endif
 }
-
-/**
- * \brief 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;
-}