X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9698647b08a3a2771bd8217f9698b014af69a346..2b3b5bd763d386fdf2f64236790cf86d1f3fd828:/src/msg/msg_vm.cpp diff --git a/src/msg/msg_vm.cpp b/src/msg/msg_vm.cpp index e1f2576f3a..4ba76638cd 100644 --- a/src/msg/msg_vm.cpp +++ b/src/msg/msg_vm.cpp @@ -19,6 +19,8 @@ #include "simgrid/host.h" #include "simgrid/simix.hpp" +SG_BEGIN_DECL() + struct dirty_page { double prev_clock; double prev_remaining; @@ -151,7 +153,8 @@ void MSG_vm_destroy(msg_vm_t vm) if (MSG_vm_is_running(vm)) MSG_vm_shutdown(vm); - xbt_assert(MSG_vm_is_created(vm), "shutdown the given VM before destroying it"); + xbt_assert(MSG_vm_is_created(vm) || __MSG_vm_is_state(vm, SURF_VM_STATE_DESTROYED), + "shutdown the given VM before destroying it"); /* Then, destroy the VM object */ simgrid::simix::kernelImmediate([vm]() { @@ -184,7 +187,7 @@ void MSG_vm_start(msg_vm_t vm) int pm_overcommit = pm->extension()->overcommit; long vm_ramsize = typedVM->getRamsize(); - if (pm_ramsize && !pm_overcommit) { /* Only verify that we don't overcommit on need */ + if (pm_ramsize && not pm_overcommit) { /* Only verify that we don't overcommit on need */ /* Retrieve the memory occupied by the VMs on that host. Yep, we have to traverse all VMs of all hosts for that */ long total_ramsize_of_vms = 0; for (simgrid::s4u::VirtualMachine* ws_vm : simgrid::vm::VirtualMachineImpl::allVms_) @@ -205,7 +208,7 @@ void MSG_vm_start(msg_vm_t vm) container_t vm_container = PJ_container_get(vm->cname()); type_t type = PJ_type_get("MSG_VM_STATE", vm_container->type); val_t value = PJ_value_get_or_new("start", "0 0 1", type); // start is blue - new_pajePushState(MSG_get_clock(), vm_container, type, value); + new PushStateEvent(MSG_get_clock(), vm_container, type, value); } } @@ -265,7 +268,7 @@ static int migration_rx_fun(int argc, char *argv[]) bool received_finalize = false; char *finalize_task_name = get_mig_task_name(ms->vm, ms->src_pm, ms->dst_pm, 3); - while (!received_finalize) { + while (not received_finalize) { msg_task_t task = nullptr; int ret = MSG_task_recv(&task, ms->mbox); @@ -317,7 +320,7 @@ static int migration_rx_fun(int argc, char *argv[]) // start link container_t msg = PJ_container_get(vm->cname()); type_t type = PJ_type_get("MSG_VM_LINK", PJ_type_get_root()); - new_pajeStartLink(MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key); + new StartLinkEvent(MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key); // destroy existing container of this vm container_t existing_container = PJ_container_get(vm->cname()); @@ -330,7 +333,7 @@ static int migration_rx_fun(int argc, char *argv[]) // end link msg = PJ_container_get(vm->cname()); type = PJ_type_get("MSG_VM_LINK", PJ_type_get_root()); - new_pajeEndLink(MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key); + new EndLinkEvent(MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key); } // Inform the SRC that the migration has been correctly performed @@ -358,7 +361,7 @@ static void start_dirty_page_tracking(msg_vm_t vm) simgrid::vm::VirtualMachineImpl* pimpl = static_cast(vm)->pimpl_vm_; pimpl->dp_enabled = 1; - if (!pimpl->dp_objs) + if (not pimpl->dp_objs) return; char *key = nullptr; @@ -438,7 +441,7 @@ void MSG_host_add_task(msg_host_t host, msg_task_t task) dp->prev_clock = MSG_get_clock(); dp->prev_remaining = remaining; } - if (!pimpl->dp_objs) + if (not pimpl->dp_objs) pimpl->dp_objs = xbt_dict_new_homogeneous(nullptr); xbt_assert(xbt_dict_get_or_null(pimpl->dp_objs, key) == nullptr); xbt_dict_set(pimpl->dp_objs, key, dp, nullptr); @@ -578,7 +581,7 @@ static int migration_tx_fun(int argc, char *argv[]) start_dirty_page_tracking(ms->vm); double computed_during_stage1 = 0; - if (!skip_stage1) { + if (not skip_stage1) { double clock_prev_send = MSG_get_clock(); try { @@ -618,7 +621,7 @@ static int migration_tx_fun(int argc, char *argv[]) /* Stage2: send update pages iteratively until the size of remaining states becomes smaller than threshold value. */ - if (!skip_stage2) { + if (not skip_stage2) { int stage2_round = 0; for (;;) { @@ -739,7 +742,7 @@ void MSG_vm_migrate(msg_vm_t vm, msg_host_t dst_pm) THROWF(vm_error, 0, "Cannot migrate VM '%s' from host '%s', which is offline.", vm->cname(), src_pm->cname()); if (dst_pm->isOff()) THROWF(vm_error, 0, "Cannot migrate VM '%s' to host '%s', which is offline.", vm->cname(), dst_pm->cname()); - if (!MSG_vm_is_running(vm)) + if (not MSG_vm_is_running(vm)) THROWF(vm_error, 0, "Cannot migrate VM '%s' that is not running yet.", vm->cname()); if (typedVm->isMigrating()) THROWF(vm_error, 0, "Cannot migrate VM '%s' that is already migrating.", vm->cname()); @@ -772,9 +775,7 @@ void MSG_vm_migrate(msg_vm_t vm, msg_host_t dst_pm) /* wait until the migration have finished or on error has occurred */ XBT_DEBUG("wait for reception of the final ACK (i.e. migration has been correctly performed"); msg_task_t task = nullptr; - msg_error_t ret = MSG_TIMEOUT; - while (ret == MSG_TIMEOUT && dst_pm->isOn()) // The rx will tell me when he gots the VM - ret = MSG_task_receive_with_timeout(&task, ms->mbox_ctl, 4); + msg_error_t ret = MSG_task_receive(&task, ms->mbox_ctl); pimpl->isMigrating = false; @@ -823,7 +824,7 @@ void MSG_vm_suspend(msg_vm_t vm) container_t vm_container = PJ_container_get(vm->cname()); type_t type = PJ_type_get("MSG_VM_STATE", vm_container->type); val_t value = PJ_value_get_or_new("suspend", "1 0 0", type); // suspend is red - new_pajePushState(MSG_get_clock(), vm_container, type, value); + new PushStateEvent(MSG_get_clock(), vm_container, type, value); } } @@ -839,7 +840,7 @@ void MSG_vm_resume(msg_vm_t vm) if (TRACE_msg_vm_is_enabled()) { container_t vm_container = PJ_container_get(vm->cname()); type_t type = PJ_type_get("MSG_VM_STATE", vm_container->type); - new_pajePopState(MSG_get_clock(), vm_container, type); + new PopStateEvent(MSG_get_clock(), vm_container, type); } } @@ -882,3 +883,5 @@ void MSG_vm_set_bound(msg_vm_t vm, double bound) simgrid::simix::kernelImmediate( [vm, bound]() { static_cast(vm)->pimpl_vm_->setBound(bound); }); } + +SG_END_DECL()