X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3e2e56a1ff8c65d47e0cf4e458eac56e08a2b528..36fa571a13985879dc627c70ecc2340af606aa42:/src/surf/host_clm03.cpp diff --git a/src/surf/host_clm03.cpp b/src/surf/host_clm03.cpp index ffdf58f54e..1712ea9121 100644 --- a/src/surf/host_clm03.cpp +++ b/src/surf/host_clm03.cpp @@ -12,7 +12,6 @@ #include "cpu_cas01.hpp" #include "simgrid/sg_config.h" -#include "virtual_machine.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host); @@ -46,13 +45,11 @@ void surf_host_model_init_compound() namespace simgrid { namespace surf { -HostCLM03Model::~HostCLM03Model() {} - double HostCLM03Model::nextOccuringEvent(double now){ adjustWeightOfDummyCpuActions(); 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_net = surf_network_model->nextOccuringEventIsIdempotent() ? surf_network_model->nextOccuringEvent(now) : -1; double min_by_sto = surf_storage_model->nextOccuringEvent(now); XBT_DEBUG("model %p, %s min_by_cpu %f, %s min_by_net %f, %s min_by_sto %f", @@ -71,7 +68,7 @@ double HostCLM03Model::nextOccuringEvent(double now){ } void HostCLM03Model::updateActionsState(double /*now*/, double /*delta*/){ - return; + /* I won't do what you tell me */ } }