Fix SD_simulate return value

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

diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c
index afc5da5..b0206eb 100644 (file)
--- a/src/simdag/sd_global.c
+++ b/src/simdag/sd_global.c
@@ -1,9 +1,11 @@
-#include "simdag/simdag.h"

 #include "private.h"
 #include "private.h"

-#include "xbt/asserts.h"

 #include "xbt/sysdep.h"
 #include "xbt/sysdep.h"

+#include "xbt/dynar.h"

 #include "surf/surf.h"
 
 #include "surf/surf.h"
 

+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_kernel, msg,
+                               "Logging specific to SimDag (kernel)");
+

 SD_global_t sd_global = NULL;
 
 /* Initialises SD internal data. This function should be called before any other SD function.
 SD_global_t sd_global = NULL;
 
 /* Initialises SD internal data. This function should be called before any other SD function.


@@ -14,25 +16,50 @@ void SD_init(int *argc, char **argv) {
   sd_global = xbt_new0(s_SD_global_t, 1);
   sd_global->workstations = xbt_dict_new();
   sd_global->workstation_count = 0;
   sd_global = xbt_new0(s_SD_global_t, 1);
   sd_global->workstations = xbt_dict_new();
   sd_global->workstation_count = 0;

+  sd_global->links = xbt_dict_new();
+  sd_global->watch_point_reached = 0;
+
+  s_SD_task_t task;
+  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->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));

 
   surf_init(argc, argv);
 }
 
 
   surf_init(argc, argv);
 }
 

-/* Creates the environnement described in a xml file of a platform descriptions.
+/* Creates the environnement described in a xml file of a platform description.

  */
 void SD_create_environment(const char *platform_file) {
   xbt_dict_cursor_t cursor = NULL;
   char *name = NULL;
   void *surf_workstation = NULL;
  */
 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;
+
+  SD_CHECK_INIT_DONE();
+
+  surf_timer_resource_init(platform_file);  /* tell Surf to create the environnement */
+
+  
+  /*printf("surf_workstation_resource = %p, workstation_set = %p\n", surf_workstation_resource, workstation_set);
+    printf("surf_network_resource = %p, network_link_set = %p\n", surf_network_resource, network_link_set);*/
+
+  /*surf_workstation_resource_init_KCCFLN05(platform_file);*/
+  surf_workstation_resource_init_CLM03(platform_file);

 
 

-  CHECK_INIT_DONE();
-  surf_timer_resource_init(platform_file);
-  surf_workstation_resource_init_KCCFLN05(platform_file); /* tell Surf to create the environnement */
+  /*printf("surf_workstation_resource = %p, workstation_set = %p\n", surf_workstation_resource, workstation_set);
+    printf("surf_network_resource = %p, network_link_set = %p\n", surf_network_resource, network_link_set);*/

 
 

-  /* now let's create the SD wrappers */
+
+  /* now let's create the SD wrappers for workstations and links */

   xbt_dict_foreach(workstation_set, cursor, name, surf_workstation) {
     __SD_workstation_create(surf_workstation, NULL);
   }
   xbt_dict_foreach(workstation_set, cursor, name, surf_workstation) {
     __SD_workstation_create(surf_workstation, NULL);
   }

+
+  xbt_dict_foreach(network_link_set, cursor, name, surf_link) {
+    __SD_link_create(surf_link, NULL);
+  }

 }
 
 /* Launches the simulation. Returns a NULL-terminated array of SD_task_t whose state has changed.
 }
 
 /* Launches the simulation. Returns a NULL-terminated array of SD_task_t whose state has changed.


@@ -41,28 +68,95 @@ SD_task_t* SD_simulate(double how_long)
 {
   /* TODO */
 
 {
   /* TODO */
 

-  /* temporary test to explore the workstations */
-  xbt_dict_cursor_t cursor = NULL;
-  char *name = NULL;
-  SD_workstation_t workstation = NULL;
-  double power;
+  double total_time = 0.0; /* we stop the simulation when total_time >= how_long */
+  double elapsed_time = 0.0;
+  SD_task_t task;
+  surf_action_t action;
+  SD_task_t *changed_tasks = NULL;
+  int changed_task_number = 0;
+  int changed_task_capacity = 16;

 
 

-  xbt_dict_foreach(sd_global->workstations, cursor, name, workstation) {
-    power = SD_workstation_get_power(workstation);
-    printf("Workstation name: %s, power: %f Mflop/s\n", name, power);
+  /* create the array that will be returned */
+  changed_tasks = xbt_new0(SD_task_t, changed_task_capacity); /* changed_task_capacity will be increased if necessary */
+  changed_tasks[0] = NULL;
+
+  surf_solve(); /* Takes traces into account. Returns 0.0 */
+
+  sd_global->watch_point_reached = 0;
+
+  /* main loop */
+  while (elapsed_time >= 0.0 && total_time < how_long && !sd_global->watch_point_reached) {
+
+    /* explore the scheduled tasks */
+    xbt_swag_foreach(task, sd_global->scheduled_task_set) {
+      INFO1("Examining task '%s'...", SD_task_get_name(task));
+      task->state_changed = 0;
+      if (xbt_dynar_length(task->tasks_before) == 0) {
+       INFO1("The dependencies are satisfied. Executing task '%s'", SD_task_get_name(task));
+       action = __SD_task_run(task);
+       surf_workstation_resource->common_public->action_set_data(action, task);
+       task->state_changed = 1;
+       
+       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;
+      }
+      else {
+       INFO1("Cannot execute task '%s' now because some depencies are not satisfied.", SD_task_get_name(task));
+      }
+    }
+
+    elapsed_time = surf_solve();
+    if (elapsed_time > 0.0)
+      total_time += elapsed_time;
+    /*    INFO1("Total time: %f", total_time);*/
+
+    while ((action = xbt_swag_extract(surf_workstation_resource->common_public->states.done_action_set))) {
+      task = action->data;
+      INFO1("Task '%s' done", SD_task_get_name(task));
+      __SD_task_set_state(task, SD_DONE);
+      __SD_task_remove_dependencies(task);
+      if (!task->state_changed) {
+       task->state_changed = 1;
+       changed_tasks[changed_task_number++] = task;
+      }
+    }
+
+    while ((action = xbt_swag_extract(surf_workstation_resource->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);
+      if (!task->state_changed) {
+       task->state_changed = 1;
+       changed_tasks[changed_task_number++] = task;
+      }
+    }

   }
   }

-  /* TODO: remove name from SD workstation structure */

 
 

-  return NULL;
+  INFO0("Simulation finished");
+
+  INFO1("Number of tasks whose state has changed: %d", changed_task_number);
+  return changed_tasks;

 }
 
 }
 

-/* Destroys all SD data. This function should be called when the simulation is over.
+/* Destroys all SD internal data. This function should be called when the simulation is over.
+ * The tasks should have been destroyed first.

  */
  */

-void SD_clean() {
+void SD_exit(void) {

   if (sd_global != NULL) {
     xbt_dict_free(&sd_global->workstations);
   if (sd_global != NULL) {
     xbt_dict_free(&sd_global->workstations);

+    xbt_dict_free(&sd_global->links);

     xbt_free(sd_global);
     xbt_free(sd_global);

+
+    xbt_swag_free(sd_global->not_scheduled_task_set);
+    xbt_swag_free(sd_global->scheduled_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);
+

     surf_exit();
     surf_exit();

-    /* TODO: destroy the workstations, the links and the tasks */

   }
 }
   }
 }