XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_vm, msg, "Cloud-oriented parts of the MSG API");
-/* **** ******** GENERAL ********* **** */
const char* MSG_vm_get_name(msg_vm_t vm)
{
return vm->getCname();
/* **** Check state of a VM **** */
static inline int __MSG_vm_is_state(msg_vm_t vm, e_surf_vm_state_t state)
{
- return vm->pimpl_vm_ != nullptr && vm->pimpl_vm_->getState() == state;
+ return vm->pimpl_vm_ != nullptr && vm->getState() == state;
}
/** @brief Returns whether the given VM has just created, not running.
simgrid::simix::kernelImmediate([vm, dst_pm]() {
/* Update the vm location */
/* precopy migration makes the VM temporally paused */
- xbt_assert(vm->pimpl_vm_->getState() == SURF_VM_STATE_SUSPENDED);
+ xbt_assert(vm->getState() == SURF_VM_STATE_SUSPENDED);
/* Update the vm location and resume it */
vm->pimpl_vm_->setPm(dst_pm);
- vm->pimpl_vm_->resume();
+ vm->resume();
});
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
// Note that the ms structure has been allocated in do_migration and hence should be freed in the same function ;)
migration_session* ms = static_cast<migration_session*>(MSG_process_get_data(MSG_process_self()));
- double host_speed = ms->vm->pimpl_vm_->getPm()->getSpeed();
+ double host_speed = ms->vm->getPm()->getSpeed();
s_vm_params_t params;
ms->vm->getParameters(¶ms);
const sg_size_t ramsize = ms->vm->getRamsize();
catch(xbt_ex& e) {
//hostfailure (if you want to know whether this is the SRC or the DST check directly in send_migration_data code)
// Stop the dirty page tracking an return (there is no memory space to release)
- ms->vm->pimpl_vm_->resume();
+ ms->vm->resume();
return 0;
}
* The second one would be easier.
*/
- msg_host_t src_pm = vm->pimpl_vm_->getPm();
+ msg_host_t src_pm = vm->getPm();
if (src_pm->isOff())
THROWF(vm_error, 0, "Cannot migrate VM '%s' from host '%s', which is offline.", vm->getCname(), src_pm->getCname());
*/
void MSG_vm_suspend(msg_vm_t vm)
{
- smx_actor_t issuer = SIMIX_process_self();
- simgrid::simix::kernelImmediate([vm, issuer]() { vm->pimpl_vm_->suspend(issuer); });
-
- XBT_DEBUG("vm_suspend done");
-
+ vm->suspend();
if (TRACE_msg_vm_is_enabled()) {
simgrid::instr::StateType* state = simgrid::instr::Container::byName(vm->getName())->getState("MSG_VM_STATE");
state->addEntityValue("suspend", "1 0 0"); // suspend is red
*/
void MSG_vm_resume(msg_vm_t vm)
{
- vm->pimpl_vm_->resume();
-
+ vm->resume();
if (TRACE_msg_vm_is_enabled())
simgrid::instr::Container::byName(vm->getName())->getState("MSG_VM_STATE")->popEvent();
}