double now = surf_get_clock();
// This loop updates the flops that the host executed for the ongoing computations
- for (auto& pair : current_activities) {
- auto& activity = pair.first; // Just an alias
- auto& remaining_cost_after_last_update = pair.second; // Just an alias
+ auto iter = begin(current_activities);
+ while (iter != end(current_activities)) {
+ auto& activity = iter->first; // Just an alias
+ auto& remaining_cost_after_last_update = iter->second; // Just an alias
+ auto current_iter = iter;
+ ++iter;
if (activity->surf_action_->get_finish_time() != now && activity->state_ == e_smx_state_t::SIMIX_RUNNING) {
if (remaining_cost_after_last_update == activity_uninitialized_remaining_cost) {
}
else if (activity->state_ == e_smx_state_t::SIMIX_DONE) {
computed_flops_ += remaining_cost_after_last_update;
- current_activities.erase(activity);
+ current_activities.erase(current_iter);
}
}
host.extension_set(new HostLoad(&host));
});
- simgrid::surf::CpuAction::on_state_change.connect(&on_action_state_change);
+ simgrid::kernel::activity::ExecImpl::on_creation.connect([](simgrid::kernel::activity::ExecImplPtr activity){
+ if (activity->host_ != nullptr) { // We only run on one host
+ simgrid::s4u::Host* host = activity->host_;
+ if (dynamic_cast<simgrid::s4u::VirtualMachine*>(activity->host_))
+ host = dynamic_cast<simgrid::s4u::VirtualMachine*>(activity->host_)->get_pm();
+
+ host->extension<HostLoad>()->add_activity(activity);
+ host->extension<HostLoad>()->update(); // If the system was idle until now, we need to update *before*
+ // this computation starts running so we can keep track of the
+ // idle time. (Communication operations don't trigger this hook!)
+ }
+ else { // This runs on multiple hosts
+ XBT_DEBUG("HostLoad plugin currently does not support executions on several hosts");
+ }
+ });
+ simgrid::kernel::activity::ExecImpl::on_completion.connect([](simgrid::kernel::activity::ExecImplPtr activity){
+ if (activity->host_ != nullptr) { // We only run on one host
+ simgrid::s4u::Host* host = activity->host_;
+ if (dynamic_cast<simgrid::s4u::VirtualMachine*>(activity->host_))
+ host = dynamic_cast<simgrid::s4u::VirtualMachine*>(activity->host_)->get_pm();
+
+ host->extension<HostLoad>()->update();
+ }
+ else { // This runs on multiple hosts
+ XBT_DEBUG("HostLoad plugin currently does not support executions on several hosts");
+ }
+ });
simgrid::s4u::Host::on_state_change.connect(&on_host_change);
simgrid::s4u::Host::on_speed_change.connect(&on_host_change);
}