#include "src/plugins/vm/VirtualMachineImpl.hpp"
#include "src/include/surf/surf.hpp"
-#include "src/simix/ActorImpl.hpp"
-#include "src/simix/smx_host_private.hpp"
#include "src/kernel/activity/ExecImpl.hpp"
#include "xbt/asserts.h" // xbt_log_no_loc
/*************
* Callbacks *
*************/
-simgrid::xbt::signal<void(VirtualMachineImpl*)> VirtualMachineImpl::on_creation;
-simgrid::xbt::signal<void(VirtualMachineImpl*)> VirtualMachineImpl::on_destruction;
-simgrid::xbt::signal<void(VirtualMachineImpl*)> VirtualMachineImpl::on_state_change;
+xbt::signal<void(VirtualMachineImpl&)> VirtualMachineImpl::on_creation;
+xbt::signal<void(VirtualMachineImpl const&)> VirtualMachineImpl::on_destruction;
+
/*********
* Model *
*********/
*/
const double virt_overhead = 1; // 0.95
-static void host_state_change(s4u::Host& host)
+static void host_state_change(s4u::Host const& host)
{
if (not host.is_on()) { // just turned off.
std::vector<s4u::VirtualMachine*> trash;
}
}
-static s4u::VirtualMachine* get_vm_from_task(kernel::activity::ActivityImplPtr task)
+static s4u::VirtualMachine* get_vm_from_task(kernel::activity::ActivityImpl const& task)
{
- kernel::activity::ExecImpl* exec = dynamic_cast<kernel::activity::ExecImpl*>(task.get());
- return exec != nullptr ? dynamic_cast<s4u::VirtualMachine*>(exec->host_) : nullptr;
+ auto* exec = dynamic_cast<kernel::activity::ExecImpl const*>(&task);
+ return exec != nullptr ? dynamic_cast<s4u::VirtualMachine*>(exec->get_host()) : nullptr;
}
-static void add_active_task(kernel::activity::ActivityImplPtr task)
+static void add_active_task(kernel::activity::ActivityImpl const& task)
{
s4u::VirtualMachine* vm = get_vm_from_task(task);
if (vm != nullptr) {
}
}
-static void remove_active_task(kernel::activity::ActivityImplPtr task)
+static void remove_active_task(kernel::activity::ActivityImpl const& task)
{
s4u::VirtualMachine* vm = get_vm_from_task(task);
if (vm != nullptr) {
/* iterate for all virtual machines */
for (s4u::VirtualMachine* const& ws_vm : VirtualMachineImpl::allVms_) {
- surf::Cpu* cpu = ws_vm->pimpl_cpu;
+ kernel::resource::Cpu* cpu = ws_vm->pimpl_cpu;
double solved_value =
ws_vm->get_impl()->action_->get_variable()->get_value(); // this is X1 in comment above, what
update_action_weight();
XBT_VERB("Create VM(%s)@PM(%s)", piface->get_cname(), physical_host_->get_cname());
- on_creation(this);
+ on_creation(*this);
}
/** @brief A physical host does not disappear in the current SimGrid code, but a VM may disappear during a simulation */
VirtualMachineImpl::~VirtualMachineImpl()
{
- on_destruction(this);
+ on_destruction(*this);
/* I was already removed from the allVms set if the VM was destroyed cleanly */
auto iter = find(allVms_.begin(), allVms_.end(), piface_);
if (iter != allVms_.end())
/* Update vcpu's action for the new pm */
/* create a cpu action bound to the pm model at the destination. */
- surf::CpuAction* new_cpu_action =
- static_cast<surf::CpuAction*>(destination->pimpl_cpu->execution_start(0, this->core_amount_));
+ kernel::resource::CpuAction* new_cpu_action =
+ static_cast<kernel::resource::CpuAction*>(destination->pimpl_cpu->execution_start(0, this->core_amount_));
if (action_->get_remains_no_update() > 0)
XBT_CRITICAL("FIXME: need copy the state(?), %f", action_->get_remains_no_update());
XBT_DEBUG("set the weight of the dummy CPU action of VM%p on PM to %d (#tasks: %d)", this, impact, active_tasks_);
if (impact > 0)
- action_->set_priority(1. / impact);
+ action_->set_sharing_penalty(1. / impact);
else
- action_->set_priority(0.);
+ action_->set_sharing_penalty(0.);
action_->set_bound(std::min(impact * physical_host_->get_speed(), user_bound_));
}