X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2cee965a59bc4c1b024ddd0e10b64dc065044778..f3da0e53f20a27db79c661314020550b7b9d0bcd:/src/surf/host_clm03.cpp

diff --git a/src/surf/host_clm03.cpp b/src/surf/host_clm03.cpp
index e76df1daac..912e630329 100644
--- a/src/surf/host_clm03.cpp
+++ b/src/surf/host_clm03.cpp
@@ -1,18 +1,11 @@
-/* Copyright (c) 2013-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include <cstdlib>
-
-#include <algorithm>
-
 #include "host_clm03.hpp"
-
-#include "cpu_cas01.hpp"
-#include "simgrid/sg_config.h"
-#include "virtual_machine.hpp"
+#include "simgrid/sg_config.hpp"
+#include "surf/surf.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host);
 
@@ -24,14 +17,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("network/crosstraffic", "yes");
+  simgrid::config::set_default<bool>("network/crosstraffic", true);
   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,19 +33,19 @@ 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 {
 
-HostCLM03Model::~HostCLM03Model() {}
-
-double HostCLM03Model::next_occuring_event(double now){
-  adjustWeightOfDummyCpuActions();
+double HostCLM03Model::next_occuring_event(double now)
+{
+  ignore_empty_vm_in_pm_LMM();
 
   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_net =
+      surf_network_model->next_occuring_event_is_idempotent() ? 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",
@@ -70,8 +63,9 @@ double HostCLM03Model::next_occuring_event(double now){
   return res;
 }
 
-void HostCLM03Model::updateActionsState(double /*now*/, double /*delta*/){
-  return;
+void HostCLM03Model::update_actions_state(double /*now*/, double /*delta*/)
+{
+  /* I won't do what you tell me */
 }
 
 }