X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/44f73def709658990c1570729f21eb1e14c583fa..5d42245e230395eb181277793042a38cc65c7d88:/src/surf/host_clm03.cpp diff --git a/src/surf/host_clm03.cpp b/src/surf/host_clm03.cpp index 97d9a72309..0e232e68c5 100644 --- a/src/surf/host_clm03.cpp +++ b/src/surf/host_clm03.cpp @@ -36,18 +36,15 @@ double HostCLM03Model::next_occurring_event(double now) double min_by_cpu = surf_cpu_model_pm->next_occurring_event(now); double min_by_net = surf_network_model->next_occurring_event_is_idempotent() ? surf_network_model->next_occurring_event(now) : -1; - double min_by_sto = surf_storage_model->next_occurring_event(now); double min_by_dsk = surf_disk_model->next_occurring_event(now); - XBT_DEBUG("model %p, %s min_by_cpu %f, %s min_by_net %f, %s min_by_sto %f, %s min_by_dsk %f", this, + XBT_DEBUG("model %p, %s min_by_cpu %f, %s min_by_net %f, %s min_by_dsk %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_disk_model).name(), min_by_dsk); + typeid(surf_disk_model).name(), min_by_dsk); double res = min_by_cpu; if (res < 0 || (min_by_net >= 0.0 && min_by_net < res)) res = min_by_net; - if (res < 0 || (min_by_sto >= 0.0 && min_by_sto < res)) - res = min_by_sto; if (res < 0 || (min_by_dsk >= 0.0 && min_by_dsk < res)) res = min_by_dsk; return res;