Added a gtnets_jitter_seed parameter enabling jitted repeatable experiments, activate...

[simgrid.git] / src / surf / surf.c

diff --git a/src/surf/surf.c b/src/surf/surf.c
index 7dba882..85ad156 100644 (file)
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -114,7 +114,7 @@ xbt_dynar_t surf_path = NULL;
 s_surf_model_description_t surf_network_model_description[] = {
   {"Constant", NULL, surf_network_model_init_Constant},
   {"CM02", NULL, surf_network_model_init_CM02},
-  {"LegrandVelho", NULL, surf_network_model_init_LegrandVelho},
+  {"LV08", NULL, surf_network_model_init_LegrandVelho},
 #ifdef HAVE_GTNETS
   {"GTNets", NULL, surf_network_model_init_GTNETS},
 #endif
@@ -125,8 +125,8 @@ s_surf_model_description_t surf_network_model_description[] = {
 };
 
 s_surf_model_description_t surf_cpu_model_description[] = {
-  {"Cas01", NULL, surf_cpu_model_init_Cas01},
-  {"Cas01_IM", NULL, surf_cpu_model_init_Cas01_im},
+  {"Cas01_fullupdate", NULL, surf_cpu_model_init_Cas01},
+  {"Cas01", NULL, surf_cpu_model_init_Cas01_im},
   {"CpuTI", NULL, surf_cpu_model_init_ti},
   {NULL, NULL, NULL}            /* this array must be NULL terminated */
 };
@@ -384,13 +384,10 @@ double surf_solve(void)
   }
   DEBUG1("Next action end : %f", min);
 
-  if (min < 0.0)
-    return -1.0;
-
   DEBUG0("Looking for next event");
   while ((next_event_date = tmgr_history_next_date(history)) != -1.0) {
     DEBUG1("Next TRACE event : %f", next_event_date);
-    if (next_event_date > NOW + min)
+    if ((min != -1.0) && (next_event_date > NOW + min))
       break;
     DEBUG0("Updating models");
     while ((event =
@@ -410,6 +407,12 @@ double surf_solve(void)
     }
   }
 
+  /* FIXME: Moved this test to here to avoid stoping simulation if there are actions running on cpus and all cpus are with availability = 0. 
+   * This may cause an infinite loop if one cpu has a trace with periodicity = 0 and the other a trace with periodicity > 0.
+   * The options are: all traces with same periodicity(0 or >0) or we need to change the way how the events are managed */
+  if (min < 0.0)
+    return -1.0;
+
   DEBUG1("Duration set to %f", min);
 
   NOW = NOW + min;