X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9dd79081a792879245787203a8407c7bff23726a..8204cd55d2af7b77c13f77dd69ce18330dac16d4:/src/simdag/sd_global.cpp

diff --git a/src/simdag/sd_global.cpp b/src/simdag/sd_global.cpp
index 0eb1691c54..f278ae154b 100644
--- a/src/simdag/sd_global.cpp
+++ b/src/simdag/sd_global.cpp
@@ -17,14 +17,9 @@
 #include "xbt/str.h"
 #include "xbt/config.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"
+#include "simgrid/jedule/jedule_sd_binding.h"
 #endif
 
 XBT_LOG_NEW_CATEGORY(sd, "Logging specific to SimDag");
@@ -50,9 +45,6 @@ void SD_init(int *argc, char **argv)
   xbt_assert(sd_global == NULL, "SD_init() already called");
 
   sd_global = xbt_new(s_SD_global_t, 1);
-  sd_global->workstation_list = NULL;
-  sd_global->link_list = NULL;
-  sd_global->recyclable_route = NULL;
   sd_global->watch_point_reached = 0;
 
   sd_global->task_mallocator=xbt_mallocator_new(65536, SD_task_new_f,
@@ -75,9 +67,6 @@ void SD_init(int *argc, char **argv)
   jedule_sd_init();
 #endif
 
-  XBT_DEBUG("ADD SD LEVELS");
-  SD_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,__SD_storage_destroy);
-
   if (_sg_cfg_exit_asap) {
     SD_exit();
     exit(0);
@@ -97,7 +86,6 @@ void SD_config(const char *key, const char *value){
   xbt_cfg_set_as_string(_sg_cfg_set, key, value);
 }
 
-
 /**
  * \brief Reinits the application part of the simulation (experimental feature)
  *
@@ -139,7 +127,6 @@ void SD_application_reinit(void)
 
 
 #ifdef HAVE_JEDULE
-  jedule_sd_dump();
   jedule_sd_cleanup();
   jedule_sd_init();
 #endif
@@ -148,12 +135,12 @@ void SD_application_reinit(void)
 /**
  * \brief Creates the environment
  *
- * The environment (i.e. the \ref SD_workstation_management "workstations"
+ * The environment (i.e. the \ref sg_host_management "hosts"
  * 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
+ * \see sg_host_management, SD_link_management
  *
  * The XML file follows this DTD:
  *
@@ -165,29 +152,10 @@ void SD_application_reinit(void)
  */
 void SD_create_environment(const char *platform_file)
 {
-  xbt_lib_cursor_t cursor = NULL;
-  char *name = NULL;
-  void **surf_storage = NULL;
-
   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);
-    }
-  }
-
-  xbt_lib_foreach(storage_lib, cursor, name, surf_storage) {
-  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_count(), sg_link_count());
+  XBT_DEBUG("Workstation number: %zu, link number: %d",
+         sg_host_count(), sg_link_count());
 #ifdef HAVE_JEDULE
   jedule_setup_platform();
 #endif
@@ -235,10 +203,9 @@ xbt_dynar_t SD_simulate(double how_long) {
   /* 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_dynar_push(sd_global->return_set, &task);
-      iter--;
-    }
+    SD_task_run(task);
+    xbt_dynar_push(sd_global->return_set, &task);
+    iter--;
   }
 
   /* main loop */
@@ -265,10 +232,9 @@ xbt_dynar_t SD_simulate(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. Add it only if it's the first change */
         if (xbt_dynar_search_or_negative(sd_global->return_set, &task) < 0) {
@@ -322,8 +288,8 @@ xbt_dynar_t SD_simulate(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_dynar_push(sd_global->return_set, &dst);
+            SD_task_run(dst);
+            xbt_dynar_push(sd_global->return_set, &dst);
           }
         }
       }
@@ -351,7 +317,7 @@ xbt_dynar_t SD_simulate(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),
@@ -390,11 +356,6 @@ void SD_exit(void)
 
   xbt_mallocator_free(sd_global->task_mallocator);
 
-  XBT_DEBUG("Destroying workstation and link arrays...");
-  xbt_free(sd_global->workstation_list);
-  xbt_free(sd_global->link_list);
-  xbt_free(sd_global->recyclable_route);
-
   XBT_DEBUG("Destroying the dynars ...");
   xbt_dynar_free_container(&(sd_global->initial_task_set));
   xbt_dynar_free_container(&(sd_global->executable_task_set));
@@ -407,7 +368,6 @@ void SD_exit(void)
   sd_global = NULL;
 
 #ifdef HAVE_JEDULE
-  jedule_sd_dump();
   jedule_sd_cleanup();
   jedule_sd_exit();
 #endif