- for (auto const& model : all_existing_models) {
- if (model != surf_host_model && model != surf_vm_model && model != surf_network_model &&
- model != surf_storage_model && model != surf_disk_model) {
- double next_event_model = model->next_occurring_event(NOW);
- if ((time_delta < 0.0 || next_event_model < time_delta) && next_event_model >= 0.0)
- time_delta = next_event_model;
- }
- }
+ // following the order it was done in HostCLM03Model->next_occurring_event
+ XBT_DEBUG("Looking for next event in CPU models");
+ surf_update_next_event(engine->get_model_list(simgrid::kernel::resource::Model::Type::CPU_PM), time_delta);
+
+ XBT_DEBUG("Looking for next event in network models");
+ surf_update_next_event(engine->get_model_list(simgrid::kernel::resource::Model::Type::NETWORK), time_delta);
+ XBT_DEBUG("Looking for next event in disk models");
+ surf_update_next_event(engine->get_model_list(simgrid::kernel::resource::Model::Type::DISK), time_delta);
+
+ XBT_DEBUG("Looking for next event in virtual models");
+ surf_update_next_event(engine->get_model_list(simgrid::kernel::resource::Model::Type::VM), time_delta);
+ surf_update_next_event(engine->get_model_list(simgrid::kernel::resource::Model::Type::CPU_VM), time_delta);