#include "src/plugins/vm/VirtualMachineImpl.hpp"
#include "simgrid/Exception.hpp"
+#include "simgrid/s4u/Exec.hpp"
#include "src/include/surf/surf.hpp"
#include "src/kernel/activity/ExecImpl.hpp"
}
}
-static s4u::VirtualMachine* get_vm_from_task(kernel::activity::ActivityImpl const& task)
+static void add_active_exec(s4u::Actor const&, s4u::Exec const& task)
{
- auto* exec = dynamic_cast<kernel::activity::ExecImpl const*>(&task);
+ s4u::VirtualMachine* vm = dynamic_cast<s4u::VirtualMachine*>(task.get_host());
+ if (vm != nullptr) {
+ VirtualMachineImpl* vm_impl = vm->get_impl();
+ vm_impl->active_tasks_ = vm_impl->active_tasks_ + 1;
+ vm_impl->update_action_weight();
+ }
+}
+
+static void remove_active_exec(s4u::Actor const&, s4u::Exec const& task)
+{
+ s4u::VirtualMachine* vm = dynamic_cast<s4u::VirtualMachine*>(task.get_host());
+ if (vm != nullptr) {
+ VirtualMachineImpl* vm_impl = vm->get_impl();
+ vm_impl->active_tasks_ = vm_impl->active_tasks_ - 1;
+ vm_impl->update_action_weight();
+ }
+}
+
+static s4u::VirtualMachine* get_vm_from_activity(kernel::activity::ActivityImpl const& act)
+{
+ auto* exec = dynamic_cast<kernel::activity::ExecImpl const*>(&act);
return exec != nullptr ? dynamic_cast<s4u::VirtualMachine*>(exec->get_host()) : nullptr;
}
-static void add_active_task(kernel::activity::ActivityImpl const& task)
+static void add_active_activity(kernel::activity::ActivityImpl const& act)
{
- s4u::VirtualMachine* vm = get_vm_from_task(task);
+ s4u::VirtualMachine* vm = get_vm_from_activity(act);
if (vm != nullptr) {
VirtualMachineImpl *vm_impl = vm->get_impl();
vm_impl->active_tasks_ = vm_impl->active_tasks_ + 1;
- vm_impl->update_action_weight();
+ vm_impl->update_action_weight();
}
}
-static void remove_active_task(kernel::activity::ActivityImpl const& task)
+static void remove_active_activity(kernel::activity::ActivityImpl const& act)
{
- s4u::VirtualMachine* vm = get_vm_from_task(task);
+ s4u::VirtualMachine* vm = get_vm_from_activity(act);
if (vm != nullptr) {
VirtualMachineImpl *vm_impl = vm->get_impl();
vm_impl->active_tasks_ = vm_impl->active_tasks_ - 1;
{
all_existing_models.push_back(this);
s4u::Host::on_state_change.connect(host_state_change);
- kernel::activity::ExecImpl::on_creation.connect(add_active_task);
- kernel::activity::ExecImpl::on_completion.connect(remove_active_task);
- kernel::activity::ActivityImpl::on_resumed.connect(add_active_task);
- kernel::activity::ActivityImpl::on_suspended.connect(remove_active_task);
+ s4u::Exec::on_start.connect(add_active_exec);
+ s4u::Exec::on_completion.connect(remove_active_exec);
+ kernel::activity::ActivityImpl::on_resumed.connect(add_active_activity);
+ kernel::activity::ActivityImpl::on_suspended.connect(remove_active_activity);
}
-double VMModel::next_occuring_event(double now)
+double VMModel::next_occurring_event(double now)
{
/* TODO: update action's cost with the total cost of processes on the VM. */
}
/* 2. Ready. Get the next occurring event */
- return surf_cpu_model_vm->next_occuring_event(now);
+ return surf_cpu_model_vm->next_occurring_event(now);
}
/************
std::string pm_name_dst = destination->get_name();
/* update net_elm with that of the destination physical host */
- piface_->pimpl_netpoint = destination->pimpl_netpoint;
+ piface_->set_netpoint(destination->get_netpoint());
physical_host_ = destination;