New question: Valgrind spits tons of errors

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

diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c
index 741805e..c464c47 100644 (file)
--- a/src/simdag/sd_global.c
+++ b/src/simdag/sd_global.c
@@ -20,7 +20,9 @@ SD_global_t sd_global = NULL;
  * \see SD_create_environment(), SD_exit()
  */
 void SD_init(int *argc, char **argv) {
-  xbt_assert0(sd_global == NULL, "SD_init already called");
+  if (SD_INITIALISED()) {
+    xbt_assert0(0, "SD_init() already called");
+  }
 
   sd_global = xbt_new0(s_SD_global_t, 1);
   sd_global->workstations = xbt_dict_new();
@@ -68,10 +70,12 @@ void SD_create_environment(const char *platform_file) {
 
   SD_CHECK_INIT_DONE();
 
+  DEBUG0("SD_create_environment");
+
   surf_timer_resource_init(platform_file);  /* tell Surf to create the environnement */
 
-  /*surf_workstation_resource_init_KCCFLN05(platform_file);*/
-  surf_workstation_resource_init_CLM03(platform_file);
+  surf_workstation_resource_init_KCCFLN05(platform_file);
+/*   surf_workstation_resource_init_CLM03(platform_file); */
 
   /* now let's create the SD wrappers for workstations and links */
   xbt_dict_foreach(workstation_set, cursor, name, surf_workstation) {
@@ -108,6 +112,8 @@ SD_task_t* SD_simulate(double how_long)
   int i;
   static int first_time = 1;
 
+  SD_CHECK_INIT_DONE();
+
   INFO0("Starting simulation...");
 
   /* create the array that will be returned */
@@ -124,8 +130,8 @@ SD_task_t* SD_simulate(double how_long)
   /* explore the ready tasks */
   xbt_swag_foreach(task, sd_global->ready_task_set) {
     INFO1("Executing task '%s'", SD_task_get_name(task));
-    action = __SD_task_run(task);
-    surf_workstation_resource->common_public->action_set_data(action, task);
+    __SD_task_run(task);
+    surf_workstation_resource->common_public->action_set_data(task->surf_action, task);
     task->state_changed = 1;
     
     changed_tasks[changed_task_number++] = task; /* replace NULL by the task */
@@ -145,6 +151,7 @@ SD_task_t* SD_simulate(double how_long)
     DEBUG1("Total time: %f", total_time);
 
     elapsed_time = surf_solve();
+    DEBUG1("surf_solve() returns %f", elapsed_time);
     if (elapsed_time > 0.0)
       total_time += elapsed_time;
 
@@ -153,6 +160,8 @@ SD_task_t* SD_simulate(double how_long)
       task = action->data;
       INFO1("Task '%s' done", SD_task_get_name(task));
       __SD_task_set_state(task, SD_DONE);
+      surf_workstation_resource->common_public->action_free(action);
+      task->surf_action = NULL;
 
       /* the state has changed */
       if (!task->state_changed) {
@@ -174,8 +183,8 @@ SD_task_t* SD_simulate(double how_long)
        /* is dst ready now? */
        if (__SD_task_is_ready(dst) && !sd_global->watch_point_reached) {
          INFO1("Executing task '%s'", SD_task_get_name(dst));
-         action = __SD_task_run(dst);
-         surf_workstation_resource->common_public->action_set_data(action, dst);
+         dst->surf_action = __SD_task_run(dst);
+         surf_workstation_resource->common_public->action_set_data(dst->surf_action, dst);
          dst->state_changed = 1;
          
          changed_tasks[changed_task_number++] = dst;
@@ -193,6 +202,9 @@ SD_task_t* SD_simulate(double how_long)
       task = action->data;
       INFO1("Task '%s' failed", SD_task_get_name(task));
       __SD_task_set_state(task, SD_FAILED);
+      surf_workstation_resource->common_public->action_free(action);
+      task->surf_action = NULL;
+
       if (!task->state_changed) {
        task->state_changed = 1;
        changed_tasks[changed_task_number++] = task;
@@ -214,12 +226,24 @@ SD_task_t* SD_simulate(double how_long)
 
   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());
 
   return changed_tasks;
 }
 
 /**
- * \brief Destroys all SD internal data.
+ * \brief Returns the current clock
+ *
+ * \return the current clock, in second
+ */
+double SD_get_clock(void) {
+  SD_CHECK_INIT_DONE();
+
+  return surf_get_clock();
+}
+
+/**
+ * \brief Destroys all SD internal data
  *
  * This function should be called when the simulation is over. Don't forget also to destroy
  * the tasks.
@@ -227,18 +251,19 @@ SD_task_t* SD_simulate(double how_long)
  * \see SD_init(), SD_task_destroy()
  */
 void SD_exit(void) {
-  if (sd_global != NULL) {
+  if (SD_INITIALISED()) {
+    DEBUG0("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...");
     if (sd_global->workstation_list != NULL)
       xbt_free(sd_global->workstation_list);
 
     if (sd_global->link_list != NULL)
       xbt_free(sd_global->link_list);
 
-    xbt_free(sd_global);
-
+    DEBUG0("Destroying the swags...");
     xbt_swag_free(sd_global->not_scheduled_task_set);
     xbt_swag_free(sd_global->scheduled_task_set);
     xbt_swag_free(sd_global->ready_task_set);
@@ -246,6 +271,14 @@ void SD_exit(void) {
     xbt_swag_free(sd_global->done_task_set);
     xbt_swag_free(sd_global->failed_task_set);
 
+    xbt_free(sd_global);
+    sd_global = NULL;
+
+    DEBUG0("Exiting Surf...");
     surf_exit();
   }
+  else {
+    fprintf(stderr, "Warning: SD_exit() called while SimDag was not running\n");
+    /* we cannot use exceptions here because xbt is not running! */
+  }
 }