X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/55adab7a8befc268fcb2f71d2df5e04ec5ff2dfb..d7344bf4cd4b75fe33e19f2ac1994b200962aa7e:/src/surf/surf_interface.cpp

diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp
index 5011054f3b..249ee2314d 100644
--- a/src/surf/surf_interface.cpp
+++ b/src/surf/surf_interface.cpp
@@ -47,25 +47,31 @@ s_surf_model_description_t surf_plugin_description[] = {
 
 /* Don't forget to update the option description in smx_config when you change this */
 s_surf_model_description_t surf_network_model_description[] = {
-  {"LV08", "Realistic network analytic model (slow-start modeled by multiplying latency by 10.4, bandwidth by .92; bottleneck sharing uses a payload of S=8775 for evaluating RTT). ",
-   &surf_network_model_init_LegrandVelho},
-  {"Constant",
-   "Simplistic network model where all communication take a constant time (one second). This model provides the lowest realism, but is (marginally) faster.",
-   &surf_network_model_init_Constant},
-  {"SMPI", "Realistic network model specifically tailored for HPC settings (accurate modeling of slow start with correction factors on three intervals: < 1KiB, < 64 KiB, >= 64 KiB)",
-   &surf_network_model_init_SMPI},
-  {"IB", "Realistic network model specifically tailored for HPC settings, with Infiniband contention model",
-   &surf_network_model_init_IB},
-  {"CM02", "Legacy network analytic model (Very similar to LV08, but without corrective factors. The timings of small messages are thus poorly modeled).",
-   &surf_network_model_init_CM02},
-  {"NS3", "Network pseudo-model using the NS3 tcp model instead of an analytic model", &surf_network_model_init_NS3},
-  {"Reno",  "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).",
-   &surf_network_model_init_Reno},
-  {"Reno2", "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).",
-   &surf_network_model_init_Reno2},
-  {"Vegas", "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).",
-   &surf_network_model_init_Vegas},
-  {nullptr, nullptr, nullptr}      /* this array must be nullptr terminated */
+    {"LV08", "Realistic network analytic model (slow-start modeled by multiplying latency by 13.01, bandwidth by .97; "
+             "bottleneck sharing uses a payload of S=20537 for evaluating RTT). ",
+     &surf_network_model_init_LegrandVelho},
+    {"Constant", "Simplistic network model where all communication take a constant time (one second). This model "
+                 "provides the lowest realism, but is (marginally) faster.",
+     &surf_network_model_init_Constant},
+    {"SMPI", "Realistic network model specifically tailored for HPC settings (accurate modeling of slow start with "
+             "correction factors on three intervals: < 1KiB, < 64 KiB, >= 64 KiB)",
+     &surf_network_model_init_SMPI},
+    {"IB", "Realistic network model specifically tailored for HPC settings, with Infiniband contention model",
+     &surf_network_model_init_IB},
+    {"CM02", "Legacy network analytic model (Very similar to LV08, but without corrective factors. The timings of "
+             "small messages are thus poorly modeled).",
+     &surf_network_model_init_CM02},
+    {"NS3", "Network pseudo-model using the NS3 tcp model instead of an analytic model", &surf_network_model_init_NS3},
+    {"Reno",
+     "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).",
+     &surf_network_model_init_Reno},
+    {"Reno2",
+     "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).",
+     &surf_network_model_init_Reno2},
+    {"Vegas",
+     "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).",
+     &surf_network_model_init_Vegas},
+    {nullptr, nullptr, nullptr} /* this array must be nullptr terminated */
 };
 
 #if ! HAVE_SMPI
@@ -155,9 +161,8 @@ FILE *surf_fopen(const char *name, const char *mode)
 
   /* search relative files in the path */
   for (auto path_elm : surf_path) {
-    char* buff = bprintf("%s" FILE_DELIM "%s", path_elm.c_str(), name);
-    file = fopen(buff, mode);
-    free(buff);
+    std::string buff = path_elm + FILE_DELIM + name;
+    file             = fopen(buff.c_str(), mode);
 
     if (file)
       return file;
@@ -373,9 +378,9 @@ void surf_exit()
     delete stype->model_properties;
     free(stype);
   }
-  for (auto s : *simgrid::surf::StorageImpl::storages)
+  for (auto s : *simgrid::surf::StorageImpl::storagesMap())
     delete s.second;
-  delete simgrid::surf::StorageImpl::storages;
+  delete simgrid::surf::StorageImpl::storagesMap();
 
   for (auto model : *all_existing_models)
     delete model;
@@ -733,8 +738,6 @@ void Action::setMaxDuration(double duration)
     heapRemove(getModel()->getActionHeap());
 }
 
-void Action::gapRemove() {}
-
 void Action::setSharingWeight(double weight)
 {
   XBT_IN("(%p,%g)", this, weight);
@@ -894,13 +897,8 @@ void Action::updateRemainingLazy(double now)
       double_update(&maxDuration_, delta, sg_surf_precision);
 
     //FIXME: duplicated code
-    if ((remains_ <= 0) &&
-        (lmm_get_variable_weight(getVariable()) > 0)) {
-      finish();
-      setState(Action::State::done);
-      heapRemove(getModel()->getActionHeap());
-    } else if (((maxDuration_ != NO_MAX_DURATION)
-        && (maxDuration_ <= 0))) {
+    if (((remains_ <= 0) && (lmm_get_variable_weight(getVariable()) > 0)) ||
+        ((maxDuration_ > NO_MAX_DURATION) && (maxDuration_ <= 0))) {
       finish();
       setState(Action::State::done);
       heapRemove(getModel()->getActionHeap());