THROWF(vm_error, 0, "Cannot destroy VM '%s', which is migrating.", vm->getCname());
/* First, terminate all processes on the VM if necessary */
- if (MSG_vm_is_running(vm))
- MSG_vm_shutdown(vm);
+ vm->shutdown();
/* Then, destroy the VM object */
- simgrid::simix::kernelImmediate([vm]() { vm->destroy(); });
+ vm->destroy();
if (TRACE_msg_vm_is_enabled()) {
container_t container = simgrid::instr::Container::byName(vm->getName());
*/
void MSG_vm_shutdown(msg_vm_t vm)
{
- smx_actor_t issuer = SIMIX_process_self();
- simgrid::simix::kernelImmediate([vm, issuer]() { vm->pimpl_vm_->shutdown(issuer); });
-
- // Make sure that processes in the VM are killed in this scheduling round before processing (eg with the VM destroy)
- MSG_process_sleep(0.);
+ vm->shutdown();
}
static std::string get_mig_process_tx_name(msg_vm_t vm, msg_host_t src_pm, msg_host_t dst_pm)
static void start_dirty_page_tracking(msg_vm_t vm)
{
- vm->pimpl_vm_->dp_enabled = 1;
+ vm->pimpl_vm_->dp_enabled = true;
if (vm->pimpl_vm_->dp_objs.empty())
return;
for (auto const& elm : vm->pimpl_vm_->dp_objs) {
dirty_page_t dp = elm.second;
- double remaining = MSG_task_get_remaining_work_ratio(dp->task);
+ double remaining = MSG_task_get_flops_amount(dp->task);
dp->prev_clock = MSG_get_clock();
dp->prev_remaining = remaining;
XBT_DEBUG("%s@%s remaining %f", elm.first.c_str(), vm->getCname(), remaining);
static void stop_dirty_page_tracking(msg_vm_t vm)
{
- vm->pimpl_vm_->dp_enabled = 0;
+ vm->pimpl_vm_->dp_enabled = false;
}
static double get_computed(const std::string& key, msg_vm_t vm, dirty_page_t dp, double remaining, double clock)
for (auto const& elm : vm->pimpl_vm_->dp_objs) {
const std::string& key = elm.first;
dirty_page_t dp = elm.second;
- double remaining = MSG_task_get_remaining_work_ratio(dp->task);
+ double remaining = MSG_task_get_flops_amount(dp->task);
double clock = MSG_get_clock();
if (vm == nullptr)
return;
- double remaining = MSG_task_get_initial_flops_amount(task);
+ double remaining = MSG_task_get_flops_amount(task);
std::string key = simgrid::xbt::string_printf("%s-%p", task->name, task);
dirty_page_t dp = new s_dirty_page;
/* If we are in the middle of dirty page tracking, we record how much computation has been done until now, and keep
* the information for the lookup_() function that will called soon. */
if (vm->pimpl_vm_->dp_enabled) {
- double remaining = MSG_task_get_remaining_work_ratio(task);
+ double remaining = MSG_task_get_flops_amount(task);
double clock = MSG_get_clock();
double updated = get_computed(key, vm, dp, remaining, clock); // was host instead of vm
return vm->getPm();
}
-/** @brief Set a CPU bound for a given VM.
- * @ingroup msg_VMs
- *
- * 1. Note that in some cases MSG_task_set_bound() may not intuitively work for VMs.
- *
- * For example,
- * On PM0, there are Task1 and VM0.
- * On VM0, there is Task2.
- * Now we bound 75% to Task1\@PM0 and bound 25% to Task2\@VM0.
- * Then,
- * Task1\@PM0 gets 50%.
- * Task2\@VM0 gets 25%.
- * This is NOT 75% for Task1\@PM0 and 25% for Task2\@VM0, respectively.
- *
- * This is because a VM has the dummy CPU action in the PM layer. Putting a task on the VM does not affect the bound of
- * the dummy CPU action. The bound of the dummy CPU action is unlimited.
- *
- * There are some solutions for this problem. One option is to update the bound of the dummy CPU action automatically.
- * It should be the sum of all tasks on the VM. But, this solution might be costly, because we have to scan all tasks
- * on the VM in share_resource() or we have to trap both the start and end of task execution.
- *
- * The current solution is to use MSG_vm_set_bound(), which allows us to directly set the bound of the dummy CPU action.
- *
- * 2. Note that bound == 0 means no bound (i.e., unlimited). But, if a host has multiple CPU cores, the CPU share of a
- * computation task (or a VM) never exceeds the capacity of a CPU core.
- */
void MSG_vm_set_bound(msg_vm_t vm, double bound)
{
- simgrid::simix::kernelImmediate([vm, bound]() { vm->pimpl_vm_->setBound(bound); });
+ vm->setBound(bound);
}
}
