X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c90cc240c7dbfd5d20deff83f6a45914bc253474..4353e376f88e2261155e107d7e6d7619954f6425:/src/simdag/sd_global.cpp

diff --git a/src/simdag/sd_global.cpp b/src/simdag/sd_global.cpp
index 0687a02847..6fe06bd4b6 100644
--- a/src/simdag/sd_global.cpp
+++ b/src/simdag/sd_global.cpp
@@ -24,7 +24,7 @@
 #endif
 
 #ifdef HAVE_JEDULE
-#include "instr/jedule/jedule_sd_binding.h"
+#include "simgrid/jedule/jedule_sd_binding.h"
 #endif
 
 XBT_LOG_NEW_CATEGORY(sd, "Logging specific to SimDag");
@@ -47,8 +47,6 @@ void SD_init(int *argc, char **argv)
 {
   TRACE_global_init(argc, argv);
 
-  s_SD_task_t task;
-
   xbt_assert(sd_global == NULL, "SD_init() already called");
 
   sd_global = xbt_new(s_SD_global_t, 1);
@@ -57,14 +55,15 @@ void SD_init(int *argc, char **argv)
   sd_global->recyclable_route = NULL;
   sd_global->watch_point_reached = 0;
 
-  sd_global->task_mallocator=xbt_mallocator_new(65536, SD_task_new_f,SD_task_free_f,SD_task_recycle_f);
+  sd_global->task_mallocator=xbt_mallocator_new(65536, SD_task_new_f,
+                                                SD_task_free_f,
+                                                SD_task_recycle_f);
 
   sd_global->initial_task_set = xbt_dynar_new(sizeof(SD_task_t), NULL);
   sd_global->executable_task_set = xbt_dynar_new(sizeof(SD_task_t), NULL);
   sd_global->completed_task_set = xbt_dynar_new(sizeof(SD_task_t), NULL);
+  sd_global->return_set = xbt_dynar_new(sizeof(SD_task_t), NULL);
 
-  sd_global->return_set =
-      xbt_swag_new(xbt_swag_offset(task, return_hookup));
   sd_global->task_number = 0;
 
   surf_init(argc, argv);
@@ -87,7 +86,8 @@ void SD_init(int *argc, char **argv)
 
 /** \brief set a configuration variable
  *
- * Do --help on any simgrid binary to see the list of currently existing configuration variables, and see Section @ref options.
+ * Do --help on any simgrid binary to see the list of currently existing
+ * configuration variables, and see Section @ref options.
  *
  * Example:
  * SD_config("host/model","default");
@@ -106,9 +106,10 @@ void SD_config(const char *key, const char *value){
  *
  * @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.
+ * 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)
 {
@@ -170,23 +171,14 @@ void SD_create_environment(const char *platform_file)
 
   parse_platform_file(platform_file);
 
-  /* now let's create the SD wrappers for workstations, storages and links */
-  {
-    xbt_dict_cursor_t cursor = NULL;
-    simgrid_Host* host = NULL;
-    xbt_dict_foreach(host_list, cursor, name, host){
-    	__SD_workstation_create((const char*)name);
-    }
-  }
-
+  /* now let's create the SD wrappers for storage elements */
   xbt_lib_foreach(storage_lib, cursor, name, surf_storage) {
-  if(surf_storage[SURF_STORAGE_LEVEL])
-    __SD_storage_create(surf_storage[SURF_STORAGE_LEVEL], NULL);
+    if(surf_storage[SURF_STORAGE_LEVEL])
+      __SD_storage_create(surf_storage[SURF_STORAGE_LEVEL], NULL);
   }
 
-
   XBT_DEBUG("Workstation number: %d, link number: %d",
-         SD_workstation_get_number(), SD_link_get_number());
+         SD_workstation_get_count(), sg_link_count());
 #ifdef HAVE_JEDULE
   jedule_setup_platform();
 #endif
@@ -203,25 +195,15 @@ void SD_create_environment(const char *platform_file)
  * 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)
+ * \param how_long maximum duration of the simulation (a negative value means
+ * no time limit)
  * \return a dynar of \ref SD_task_t whose state has changed.
  * \see SD_task_schedule(), SD_task_watch()
  */
 
 xbt_dynar_t SD_simulate(double how_long) {
-  xbt_dynar_t changed_tasks = xbt_dynar_new(sizeof(SD_task_t), NULL);
-  SD_task_t task;
-
-  SD_simulate_swag(how_long);
-  while( (task = (SD_task_t)xbt_swag_extract(sd_global->return_set)) != NULL) {
-    xbt_dynar_push(changed_tasks, &task);
-  }
-
-  return changed_tasks;
-}
-
-xbt_swag_t SD_simulate_swag(double how_long) {
-  double total_time = 0.0;      /* we stop the simulation when total_time >= how_long */
+  /* we stop the simulation when total_time >= how_long */
+  double total_time = 0.0;
   double elapsed_time = 0.0;
   SD_task_t task, dst;
   SD_dependency_t dependency;
@@ -239,15 +221,14 @@ xbt_swag_t SD_simulate_swag(double how_long) {
   XBT_VERB("Run simulation for %f seconds", how_long);
   sd_global->watch_point_reached = 0;
 
-  xbt_swag_reset(sd_global->return_set);
+  xbt_dynar_reset(sd_global->return_set);
 
   /* explore the runnable tasks */
   xbt_dynar_foreach(sd_global->executable_task_set , iter, task) {
     XBT_VERB("Executing task '%s'", SD_task_get_name(task));
-    if (__SD_task_try_to_run(task)){
-      xbt_swag_insert(task,sd_global->return_set);
-      iter--;
-    }
+    SD_task_run(task);
+    xbt_dynar_push(sd_global->return_set, &task);
+    iter--;
   }
 
   /* main loop */
@@ -274,13 +255,14 @@ xbt_swag_t SD_simulate_swag(double how_long) {
 
         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));
+        SD_task_set_state(task, SD_DONE);
+        task->surf_action->unref();
+        task->surf_action = NULL;
 
-        /* the state has changed */
-        xbt_swag_insert(task,sd_global->return_set);
+        /* the state has changed. Add it only if it's the first change */
+        if (xbt_dynar_search_or_negative(sd_global->return_set, &task) < 0) {
+          xbt_dynar_push(sd_global->return_set, &task);
+        }
 
         /* remove the dependencies after this task */
         xbt_dynar_foreach(task->tasks_after, depcnt, dependency) {
@@ -329,8 +311,8 @@ xbt_swag_t SD_simulate_swag(double how_long) {
           if (SD_task_get_state(dst) == SD_RUNNABLE
               && !sd_global->watch_point_reached) {
             XBT_VERB("Executing task '%s'", SD_task_get_name(dst));
-            if (__SD_task_try_to_run(dst))
-              xbt_swag_insert(dst,sd_global->return_set);
+            SD_task_run(dst);
+            xbt_dynar_push(sd_global->return_set, &dst);
           }
         }
       }
@@ -345,7 +327,7 @@ xbt_swag_t SD_simulate_swag(double how_long) {
         action->unref();
         task->surf_action = NULL;
 
-        xbt_swag_insert(task,sd_global->return_set);
+        xbt_dynar_push(sd_global->return_set, &task);
       }
     }
   }
@@ -358,7 +340,7 @@ xbt_swag_t SD_simulate_swag(double how_long) {
              (int) xbt_dynar_length(sd_global->completed_task_set)));
         static const char* state_names[] =
               { "SD_NOT_SCHEDULED", "SD_SCHEDULABLE", "SD_SCHEDULED",
-                "SD_RUNNABLE", "SD_IN_INFO", "SD_RUNNING", "SD_DONE",
+                "SD_RUNNABLE", "SD_RUNNING", "SD_DONE",
                 "SD_FAILED" };
         xbt_dynar_foreach(sd_global->initial_task_set, iter, task){
           XBT_WARN("%s is in %s state", SD_task_get_name(task),
@@ -402,11 +384,11 @@ void SD_exit(void)
   xbt_free(sd_global->link_list);
   xbt_free(sd_global->recyclable_route);
 
-  XBT_DEBUG("Destroying the swags...");
+  XBT_DEBUG("Destroying the dynars ...");
   xbt_dynar_free_container(&(sd_global->initial_task_set));
   xbt_dynar_free_container(&(sd_global->executable_task_set));
   xbt_dynar_free_container(&(sd_global->completed_task_set));
-  xbt_swag_free(sd_global->return_set);
+  xbt_dynar_free_container(&(sd_global->return_set));
 
   TRACE_end();