dynar to std::vector

[simgrid.git] / src / surf / host_clm03.cpp

diff --git a/src/surf/host_clm03.cpp b/src/surf/host_clm03.cpp
index 24f3f38..0c95e43 100644 (file)
--- a/src/surf/host_clm03.cpp
+++ b/src/surf/host_clm03.cpp
@@ -24,14 +24,14 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host);
  * Model *
  *********/
 
-void surf_host_model_init_current_default(void)
+void surf_host_model_init_current_default()
 {
   surf_host_model = new simgrid::surf::HostCLM03Model();
-  xbt_cfg_setdefault_boolean(_sg_cfg_set, "network/crosstraffic", "yes");
+  xbt_cfg_setdefault_boolean("network/crosstraffic", "yes");
   surf_cpu_model_init_Cas01();
   surf_network_model_init_LegrandVelho();
 
-  xbt_dynar_push(all_existing_models, &surf_host_model);
+  all_existing_models->push_back(surf_host_model);
 }
 
 void surf_host_model_init_compound()
@@ -40,31 +40,33 @@ void surf_host_model_init_compound()
   xbt_assert(surf_network_model, "No network model defined yet!");
 
   surf_host_model = new simgrid::surf::HostCLM03Model();
-  xbt_dynar_push(all_existing_models, &surf_host_model);
+  all_existing_models->push_back(surf_host_model);
 }
 
 namespace simgrid {
 namespace surf {
 
-double HostCLM03Model::shareResources(double now){
+HostCLM03Model::~HostCLM03Model() {}
+
+double HostCLM03Model::next_occuring_event(double now){
   adjustWeightOfDummyCpuActions();
 
-  double min_by_cpu = surf_cpu_model_pm->shareResources(now);
-  double min_by_net = surf_network_model->shareResourcesIsIdempotent() ? surf_network_model->shareResources(now) : -1;
-  double min_by_sto = surf_storage_model->shareResources(now);
+  double min_by_cpu = surf_cpu_model_pm->next_occuring_event(now);
+  double min_by_net = surf_network_model->next_occuring_event_isIdempotent() ? surf_network_model->next_occuring_event(now) : -1;
+  double min_by_sto = surf_storage_model->next_occuring_event(now);
 
   XBT_DEBUG("model %p, %s min_by_cpu %f, %s min_by_net %f, %s min_by_sto %f",
       this, typeid(surf_cpu_model_pm).name(), min_by_cpu,
-               typeid(surf_network_model).name(), min_by_net,
-                       typeid(surf_storage_model).name(), min_by_sto);
+      typeid(surf_network_model).name(), min_by_net,
+      typeid(surf_storage_model).name(), min_by_sto);
 
-  double res = std::max(std::max(min_by_cpu, min_by_net), min_by_sto);
+  double res = std::max({min_by_cpu, min_by_net, min_by_sto});
   if (min_by_cpu >= 0.0 && min_by_cpu < res)
-       res = min_by_cpu;
+    res = min_by_cpu;
   if (min_by_net >= 0.0 && min_by_net < res)
-       res = min_by_net;
+    res = min_by_net;
   if (min_by_sto >= 0.0 && min_by_sto < res)
-       res = min_by_sto;
+    res = min_by_sto;
   return res;
 }