X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/87c6fa8e89ef8aa6907f56dafffd65aae8c6019f..cdc5e6b304490c7f11223bea097fea9fd2a2dfee:/src/simdag/sd_global.c

diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c
index 4a26829905..2294740e6c 100644
--- a/src/simdag/sd_global.c
+++ b/src/simdag/sd_global.c
@@ -176,12 +176,12 @@ void SD_create_environment(const char *platform_file)
 
   /* now let's create the SD wrappers for workstations and links */
   xbt_lib_foreach(host_lib, cursor, name, surf_workstation){
-	  if(surf_workstation[SURF_WKS_LEVEL])
-		  __SD_workstation_create(surf_workstation[SURF_WKS_LEVEL], NULL);
+    if(surf_workstation[SURF_WKS_LEVEL])
+      __SD_workstation_create(surf_workstation[SURF_WKS_LEVEL], NULL);
   }
 
   xbt_lib_foreach(link_lib, cursor, name, surf_link) {
-	if(surf_link[SURF_LINK_LEVEL])
+  if(surf_link[SURF_LINK_LEVEL])
     __SD_link_create(surf_link[SURF_LINK_LEVEL], NULL);
   }
 
@@ -229,13 +229,14 @@ xbt_swag_t SD_simulate_swag(double how_long) {
   unsigned int iter, depcnt;
   static int first_time = 1;
 
-   if (first_time) {
-     XBT_VERB("Starting simulation...");
+  if (first_time) {
+    XBT_VERB("Starting simulation...");
 
-     surf_presolve();            /* Takes traces into account */
-     first_time = 0;
-   }
+    surf_presolve();            /* Takes traces into account */
+    first_time = 0;
+  }
 
+  XBT_VERB("Run simulation for %f seconds", how_long);
   sd_global->watch_point_reached = 0;
 
   xbt_swag_reset(sd_global->return_set);
@@ -250,7 +251,7 @@ xbt_swag_t SD_simulate_swag(double how_long) {
   /* main loop */
   elapsed_time = 0.0;
   while (elapsed_time >= 0.0 &&
-         (how_long < 0.0 || total_time < how_long) &&
+         (how_long < 0.0 || 0.00001 < (how_long -total_time)) &&
          !sd_global->watch_point_reached) {
     surf_model_t model = NULL;
     /* dumb variables */
@@ -258,7 +259,7 @@ xbt_swag_t SD_simulate_swag(double how_long) {
 
     XBT_DEBUG("Total time: %f", total_time);
 
-    elapsed_time = surf_solve(how_long > 0 ? surf_get_clock() + how_long : -1.0);
+    elapsed_time = surf_solve(how_long > 0 ? surf_get_clock() + how_long - total_time: -1.0);
     XBT_DEBUG("surf_solve() returns %f", elapsed_time);
     if (elapsed_time > 0.0)
       total_time += elapsed_time;
@@ -341,15 +342,15 @@ xbt_swag_t SD_simulate_swag(double how_long) {
     if (xbt_swag_size(sd_global->done_task_set) < sd_global->task_number){
         XBT_WARN("Simulation is finished but %d tasks are still not done",
             (sd_global->task_number - xbt_swag_size(sd_global->done_task_set)));
-      	xbt_swag_foreach_safe (task, task_safe,sd_global->not_scheduled_task_set){
+        xbt_swag_foreach_safe (task, task_safe,sd_global->not_scheduled_task_set){
                 XBT_WARN("%s is in SD_NOT_SCHEDULED state", SD_task_get_name(task));
-		}
-    	xbt_swag_foreach_safe (task, task_safe,sd_global->schedulable_task_set){
+    }
+      xbt_swag_foreach_safe (task, task_safe,sd_global->schedulable_task_set){
                 XBT_WARN("%s is in SD_SCHEDULABLE state", SD_task_get_name(task));
-	}
-      	xbt_swag_foreach_safe (task, task_safe,sd_global->scheduled_task_set){
+  }
+        xbt_swag_foreach_safe (task, task_safe,sd_global->scheduled_task_set){
                 XBT_WARN("%s is in SD_SCHEDULED state", SD_task_get_name(task));
-       	}
+         }
     }
   }