-double HostCLM03Model::shareResources(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);
-
- 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);
-
- double res = std::max(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;
- if (min_by_net >= 0.0 && min_by_net < res)
- res = min_by_net;
- if (min_by_sto >= 0.0 && min_by_sto < res)
- res = min_by_sto;
+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,
+ 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);
+
+ 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;