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 62d8945..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,7 +125,9 @@ 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_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 */
 };
 
@@ -234,6 +236,7 @@ XBT_LOG_EXTERNAL_CATEGORY(surf_parse);
 XBT_LOG_EXTERNAL_CATEGORY(surf_timer);
 XBT_LOG_EXTERNAL_CATEGORY(surf_workstation);
 XBT_LOG_EXTERNAL_CATEGORY(surf_config);
+XBT_LOG_EXTERNAL_CATEGORY(surf_routing);
 
 
 #ifdef HAVE_GTNETS
@@ -254,6 +257,7 @@ void surf_init(int *argc, char **argv)
   XBT_LOG_CONNECT(surf_timer, surf);
   XBT_LOG_CONNECT(surf_workstation, surf);
   XBT_LOG_CONNECT(surf_config, surf);
+  XBT_LOG_CONNECT(surf_routing, surf);
 
 #ifdef HAVE_GTNETS
   XBT_LOG_CONNECT(surf_network_gtnets, surf);
@@ -271,7 +275,7 @@ void surf_init(int *argc, char **argv)
 #ifdef WIN32
 # define FILE_DELIM "\\"
 #else
-# define FILE_DELIM "/" /* FIXME: move to better location */
+# define FILE_DELIM "/"         /* FIXME: move to better location */
 #endif
 
 FILE *surf_fopen(const char *name, const char *mode)
@@ -283,12 +287,12 @@ FILE *surf_fopen(const char *name, const char *mode)
 
   xbt_assert(name);
 
-  if (__surf_is_absolute_file_path(name))     /* don't mess with absolute file names */
+  if (__surf_is_absolute_file_path(name))       /* don't mess with absolute file names */
     return fopen(name, mode);
 
   /* search relative files in the path */
   xbt_dynar_foreach(surf_path, cpt, path_elm) {
-    buff = bprintf("%s" FILE_DELIM "%s", path_elm,name);
+    buff = bprintf("%s" FILE_DELIM "%s", path_elm, name);
     file = fopen(buff, mode);
     free(buff);
 
@@ -305,9 +309,9 @@ void surf_exit(void)
 
   surf_config_finalize();
 
-  xbt_dynar_foreach(model_list, iter, model) {
+  xbt_dynar_foreach(model_list, iter, model)
     model->model_private->finalize();
-  }
+  xbt_dynar_free(&model_list);
 
   if (maxmin_system) {
     lmm_system_free(maxmin_system);
@@ -317,8 +321,6 @@ void surf_exit(void)
     tmgr_history_free(history);
     history = NULL;
   }
-  if (model_list)
-    xbt_dynar_free(&model_list);
 
   if (surf_path)
     xbt_dynar_free(&surf_path);
@@ -353,9 +355,8 @@ void surf_presolve(void)
                                                             NOW);
     }
   }
-  xbt_dynar_foreach(model_list, iter, model) {
+  xbt_dynar_foreach(model_list, iter, model)
     model->model_private->update_actions_state(NOW, 0.0);
-  }
 }
 
 double surf_solve(void)
@@ -383,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 event : %f", next_event_date);
-    if (next_event_date > NOW + min)
+    DEBUG1("Next TRACE event : %f", next_event_date);
+    if ((min != -1.0) && (next_event_date > NOW + min))
       break;
     DEBUG0("Updating models");
     while ((event =
@@ -402,19 +400,25 @@ double surf_solve(void)
       }
       /* update state of model_obj according to new value. Does not touch lmm.
          It will be modified if needed when updating actions */
-      resource->model->model_private->update_resource_state(resource,
-                                                            event, value,
-                                                            NOW + min);
+      DEBUG2("Calling update_resource_state for resource %s with min %lf",
+             resource->model->name, min);
+      resource->model->model_private->update_resource_state(resource, event,
+                                                            value, NOW + min);
     }
   }
 
+  /* 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;
 
-  xbt_dynar_foreach(model_list, iter, model) {
+  xbt_dynar_foreach(model_list, iter, model)
     model->model_private->update_actions_state(NOW, min);
-  }
 
   return min;
 }