cosmetics in cpu_ti

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

diff --git a/src/surf/host_clm03.cpp b/src/surf/host_clm03.cpp
index ffdf58f..3cbf508 100644 (file)
--- a/src/surf/host_clm03.cpp
+++ b/src/surf/host_clm03.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2015. The SimGrid Team.
+/* Copyright (c) 2013-2018. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -11,8 +11,7 @@
 #include "host_clm03.hpp"
 
 #include "cpu_cas01.hpp"
-#include "simgrid/sg_config.h"
-#include "virtual_machine.hpp"
+#include "simgrid/sg_config.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host);
 
@@ -46,14 +45,14 @@ void surf_host_model_init_compound()
 namespace simgrid {
 namespace surf {
 
-HostCLM03Model::~HostCLM03Model() {}
-
-double HostCLM03Model::nextOccuringEvent(double now){
-  adjustWeightOfDummyCpuActions();
+double HostCLM03Model::next_occuring_event(double now)
+{
+  ignoreEmptyVmInPmLMM();
 
-  double min_by_cpu = surf_cpu_model_pm->nextOccuringEvent(now);
-  double min_by_net = surf_network_model->next_occuring_event_isIdempotent() ? surf_network_model->nextOccuringEvent(now) : -1;
-  double min_by_sto = surf_storage_model->nextOccuringEvent(now);
+  double min_by_cpu = surf_cpu_model_pm->next_occuring_event(now);
+  double min_by_net =
+      surf_network_model->nextOccuringEventIsIdempotent() ? 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,
@@ -70,8 +69,9 @@ double HostCLM03Model::nextOccuringEvent(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 */
 }
 
 }