X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0f5e8daaa6e9f74521068aa75837200bcd182ea6..5eecba1cd4850c7820f9cfa3c1af484f674b1e8b:/src/surf/surf.c

diff --git a/src/surf/surf.c b/src/surf/surf.c
index a31ee9bb77..edb6f37318 100644
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -115,14 +115,15 @@ s_surf_model_description_t surf_network_model_description[] = {
   {"Constant",
    "Simplistic network model where all communication take a constant time (one second)",
    NULL, surf_network_model_init_Constant},
-  {"Vivaldi", "Scalable network model using the Vivaldi coordinate ideas",
-   NULL, surf_network_model_init_Vivaldi},
   {"CM02",
    "Realistic network model with lmm_solve and no correction factors",
    NULL, surf_network_model_init_CM02},
   {"LV08",
    "Realistic network model with lmm_solve and these correction factors: latency*=10.4, bandwidth*=.92, S=8775",
    NULL, surf_network_model_init_LegrandVelho},
+   {"LV08_im",
+    "Realistic network model with IMPROVED ACTION MANAGEMENT and these correction factors: latency*=10.4, bandwidth*=.92, S=8775",
+    NULL, im_surf_network_model_init_LegrandVelho},
   {"SMPI",
    "Realistic network model with lmm_solve and correction factors on three intervals (< 1KiB, < 64 KiB, >= 64 KiB)",
    NULL, surf_network_model_init_SMPI},
@@ -204,6 +205,7 @@ int find_model_description(s_surf_model_description_t * table,
   }
   xbt_assert2(0, "Model '%s' is invalid! Valid models are: %s.", name,
               name_list);
+  return -1;
 }
 
 double generic_maxmin_share_resources(xbt_swag_t running_actions,
@@ -308,10 +310,9 @@ void surf_init(int *argc, char **argv)
     history = tmgr_history_new();
 
   surf_config_init(argc, argv);
-#ifdef HAVE_MC
-  if (_surf_do_model_check)
+  surf_action_init();
+  if (MC_IS_ENABLED)
     MC_memory_init();
-#endif
 }
 
 #ifdef _XBT_WIN32
@@ -363,6 +364,7 @@ void surf_exit(void)
     tmgr_history_free(history);
     history = NULL;
   }
+  surf_action_exit();
 
   if (surf_path)
     xbt_dynar_free(&surf_path);
@@ -400,9 +402,9 @@ void surf_presolve(void)
       model->model_private->update_actions_state(NOW, 0.0);
 }
 
-double surf_solve(void)
+double surf_solve(double max_date)
 {
-  double min = -1.0;
+  double min = -1.0; /* duration */
   double next_event_date = -1.0;
   double model_next_action_end = -1.0;
   double value = -1.0;
@@ -411,7 +413,9 @@ double surf_solve(void)
   tmgr_trace_event_t event = NULL;
   unsigned int iter;
 
-  min = -1.0;
+  if (max_date != -1.0 && max_date != NOW) {
+    min = max_date - NOW;
+  }
 
   DEBUG0("Looking for next action end");
   xbt_dynar_foreach(model_list, iter, model) {
@@ -451,6 +455,7 @@ 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 */
@@ -464,10 +469,14 @@ double surf_solve(void)
   xbt_dynar_foreach(model_list, iter, model)
       model->model_private->update_actions_state(NOW, min);
 
+#ifdef HAVE_TRACING
+  TRACE_paje_dump_buffer (0);
+#endif
+
   return min;
 }
 
-double surf_get_clock(void)
+XBT_INLINE double surf_get_clock(void)
 {
   return NOW;
 }