Add model Reno, NewReno and Tahoe with ns3

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

diff --git a/src/surf/surf.c b/src/surf/surf.c
index f4d1895..8acdd35 100644 (file)
--- 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},
@@ -130,6 +131,11 @@ s_surf_model_description_t surf_network_model_description[] = {
   {"GTNets",
    "Network Pseudo-model using the GTNets simulator instead of an analytic model",
    NULL, surf_network_model_init_GTNETS},
+#endif
+#ifdef HAVE_NS3
+  {"NS3",
+   "Use NS3 tcp model",
+       NULL, surf_network_model_init_NS3},
 #endif
   {"Reno",
    "Model using lagrange_solve instead of lmm_solve (experts only)", NULL,
@@ -202,8 +208,8 @@ int find_model_description(s_surf_model_description_t * table,
     strcat(name_list, ", ");
     strcat(name_list, table[i].name);
   }
-  xbt_assert2(0, "Model '%s' is invalid! Valid models are: %s.", name,
-              name_list);
+  xbt_die("Model '%s' is invalid! Valid models are: %s.", name, name_list);
+  return -1;
 }
 
 double generic_maxmin_share_resources(xbt_swag_t running_actions,
@@ -216,7 +222,7 @@ double generic_maxmin_share_resources(xbt_swag_t running_actions,
   double value = -1;
 #define VARIABLE(action) (*((lmm_variable_t*)(((char *) (action)) + (offset))))
 
-  xbt_assert0(solve, "Give me a real solver function!");
+  xbt_assert(solve, "Give me a real solver function!");
   solve(sys);
 
   xbt_swag_foreach(action, running_actions) {
@@ -250,15 +256,15 @@ double generic_maxmin_share_resources(xbt_swag_t running_actions,
         value = 0.0;
       if (value < min) {
         min = value;
-        DEBUG2("Updating min (value) with %p: %f", action, min);
+        XBT_DEBUG("Updating min (value) with %p: %f", action, min);
       }
     }
     if ((action->max_duration >= 0) && (action->max_duration < min)) {
       min = action->max_duration;
-      DEBUG2("Updating min (duration) with %p: %f", action, min);
+      XBT_DEBUG("Updating min (duration) with %p: %f", action, min);
     }
   }
-  DEBUG1("min value : %f", min);
+  XBT_DEBUG("min value : %f", min);
 
 #undef VARIABLE
   return min;
@@ -283,6 +289,20 @@ XBT_LOG_EXTERNAL_CATEGORY(surf_network_gtnets);
 
 void surf_init(int *argc, char **argv)
 {
+       XBT_DEBUG("Create all Libs");
+       host_lib = xbt_lib_new();
+       link_lib = xbt_lib_new();
+       as_router_lib = xbt_lib_new();
+
+       XBT_DEBUG("ADD ROUTING LEVEL");
+       ROUTING_HOST_LEVEL = xbt_lib_add_level(host_lib,xbt_free);
+       ROUTING_ASR_LEVEL  = xbt_lib_add_level(as_router_lib,xbt_free);
+
+       XBT_DEBUG("ADD SURF LEVELS");
+       SURF_CPU_LEVEL = xbt_lib_add_level(host_lib,surf_resource_free);
+       SURF_WKS_LEVEL = xbt_lib_add_level(host_lib,surf_resource_free);
+       SURF_LINK_LEVEL = xbt_lib_add_level(link_lib,surf_resource_free);
+
   /* Connect our log channels: that must be done manually under windows */
   XBT_LOG_CONNECT(surf_cpu, surf);
   XBT_LOG_CONNECT(surf_kernel, surf);
@@ -308,6 +328,7 @@ void surf_init(int *argc, char **argv)
     history = tmgr_history_new();
 
   surf_config_init(argc, argv);
+  surf_action_init();
   if (MC_IS_ENABLED)
     MC_memory_init();
 }
@@ -361,13 +382,19 @@ void surf_exit(void)
     tmgr_history_free(history);
     history = NULL;
   }
+  surf_action_exit();
 
   if (surf_path)
     xbt_dynar_free(&surf_path);
 
+  xbt_lib_free(&host_lib);
+  xbt_lib_free(&link_lib);
+  xbt_lib_free(&as_router_lib);
+
   tmgr_finalize();
   surf_parse_lex_destroy();
   surf_parse_free_callbacks();
+
   NOW = 0;                      /* Just in case the user plans to restart the simulation afterward */
 }
 
@@ -380,7 +407,7 @@ void surf_presolve(void)
   surf_model_t model = NULL;
   unsigned int iter;
 
-  DEBUG0
+  XBT_DEBUG
       ("First Run! Let's \"purge\" events and put models in the right state");
   while ((next_event_date = tmgr_history_next_date(history)) != -1.0) {
     if (next_event_date > NOW)
@@ -413,37 +440,53 @@ double surf_solve(double max_date)
     min = max_date - NOW;
   }
 
-  DEBUG0("Looking for next action end");
+  XBT_DEBUG("Looking for next action end");
   xbt_dynar_foreach(model_list, iter, model) {
-    DEBUG1("Running for Resource [%s]", model->name);
-    model_next_action_end = model->model_private->share_resources(NOW);
-    DEBUG2("Resource [%s] : next action end = %f",
-           model->name, model_next_action_end);
-    if (((min < 0.0) || (model_next_action_end < min))
-        && (model_next_action_end >= 0.0))
-      min = model_next_action_end;
+
+       if(strcmp(model->name,"network NS3") ){
+               XBT_DEBUG("Running for Resource [%s]", model->name);
+               model_next_action_end = model->model_private->share_resources(NOW);
+               XBT_DEBUG("Resource [%s] : next action end = %f",
+                          model->name, model_next_action_end);
+               if (((min < 0.0) || (model_next_action_end < min))
+                       && (model_next_action_end >= 0.0))
+                 min = model_next_action_end;
+         }
   }
-  DEBUG1("Next action end : %f", min);
 
-  DEBUG0("Looking for next event");
+  XBT_DEBUG("Min for other resources : %f", min);
+
+
+  if(surf_network_model->name && !strcmp(surf_network_model->name,"network NS3")){
+       // run until min or next flow
+       model_next_action_end = surf_network_model->model_private->share_resources(min);
+       XBT_DEBUG("Min for NS3 : %f", model_next_action_end);
+       if ( ((min < 0.0) || (model_next_action_end < min)) && ( model_next_action_end >= 0.0 ))
+               min = model_next_action_end;
+  }
+
+
+  XBT_DEBUG("Next action end : %f", min);
+
+  XBT_DEBUG("Looking for next event");
   while ((next_event_date = tmgr_history_next_date(history)) != -1.0) {
-    DEBUG1("Next TRACE event : %f", next_event_date);
+    XBT_DEBUG("Next TRACE event : %f", next_event_date);
     if ((min != -1.0) && (next_event_date > NOW + min))
       break;
-    DEBUG0("Updating models");
+    XBT_DEBUG("Updating models");
     while ((event =
             tmgr_history_get_next_event_leq(history, next_event_date,
                                             &value,
                                             (void **) &resource))) {
       if (resource->model->model_private->resource_used(resource)) {
         min = next_event_date - NOW;
-        DEBUG1
+        XBT_DEBUG
             ("This event will modify model state. Next event set to %f",
              min);
       }
       /* update state of model_obj according to new value. Does not touch lmm.
          It will be modified if needed when updating actions */
-      DEBUG2("Calling update_resource_state for resource %s with min %lf",
+      XBT_DEBUG("Calling update_resource_state for resource %s with min %lf",
              resource->model->name, min);
       resource->model->model_private->update_resource_state(resource,
                                                             event, value,
@@ -458,17 +501,21 @@ double surf_solve(double max_date)
   if (min < 0.0)
     return -1.0;
 
-  DEBUG1("Duration set to %f", min);
+  XBT_DEBUG("Duration set to %f", min);
 
   NOW = NOW + min;
 
   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;
 }