X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bc72352bb779924c8f89e9835b9a409ab48adcf3..8cf6e30af8de6686461b6b1b52ba578df01de985:/src/msg/msg_vm.cpp diff --git a/src/msg/msg_vm.cpp b/src/msg/msg_vm.cpp index 86c8380d89..873e41a42e 100644 --- a/src/msg/msg_vm.cpp +++ b/src/msg/msg_vm.cpp @@ -11,22 +11,24 @@ #include +#include "src/instr/instr_private.h" +#include "src/msg/msg_private.h" #include "src/plugins/vm/VirtualMachineImpl.hpp" #include "src/plugins/vm/VmHostExt.hpp" -#include "src/simix/ActorImpl.hpp" -#include -#include -#include "msg_private.h" -#include "xbt/sysdep.h" -#include "xbt/log.h" #include "simgrid/host.h" +#include "simgrid/simix.hpp" -#include "src/simix/smx_host_private.h" /* don't ask me why the VM functions are in there (FIXME:KILLME) */ +struct dirty_page { + double prev_clock; + double prev_remaining; + msg_task_t task; +}; +typedef struct dirty_page s_dirty_page; +typedef struct dirty_page* dirty_page_t; XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_vm, msg, "Cloud-oriented parts of the MSG API"); - /* **** ******** GENERAL ********* **** */ /** \ingroup m_vm_management @@ -89,45 +91,16 @@ int MSG_vm_is_suspended(msg_vm_t vm) return __MSG_vm_is_state(vm, SURF_VM_STATE_SUSPENDED); } -/** @brief Returns whether the given VM is being saved (FIXME: live saving or not?). - * @ingroup msg_VMs - */ -int MSG_vm_is_saving(msg_vm_t vm) -{ - return __MSG_vm_is_state(vm, SURF_VM_STATE_SAVING); -} - -/** @brief Returns whether the given VM has been saved, not running. - * @ingroup msg_VMs - */ -int MSG_vm_is_saved(msg_vm_t vm) -{ - return __MSG_vm_is_state(vm, SURF_VM_STATE_SAVED); -} - -/** @brief Returns whether the given VM is being restored, not running. - * @ingroup msg_VMs - */ -int MSG_vm_is_restoring(msg_vm_t vm) -{ - return __MSG_vm_is_state(vm, SURF_VM_STATE_RESTORING); -} - /* **** ******** MSG vm actions ********* **** */ /** @brief Create a new VM with specified parameters. * @ingroup msg_VMs* * @param pm Physical machine that will host the VM - * @param name [TODO] - * @param ncpus [TODO] + * @param name Must be unique * @param ramsize [TODO] - * @param net_cap Maximal bandwidth that the VM can consume (in MByte/s) - * @param disk_path (unused) Path to the image that boots - * @param disksize (unused) will represent the size of the VM (will be used during migrations) * @param mig_netspeed Amount of Mbyte/s allocated to the migration (cannot be larger than net_cap). Use 0 if unsure. * @param dp_intensity Dirty page percentage according to migNetSpeed, [0-100]. Use 0 if unsure. */ -msg_vm_t MSG_vm_create(msg_host_t pm, const char* name, int ncpus, int ramsize, int net_cap, char* disk_path, - int disksize, int mig_netspeed, int dp_intensity) +msg_vm_t MSG_vm_create(msg_host_t pm, const char* name, int ramsize, int mig_netspeed, int dp_intensity) { simgrid::vm::VmHostExt::ensureVmExtInstalled(); @@ -139,7 +112,6 @@ msg_vm_t MSG_vm_create(msg_host_t pm, const char* name, int ncpus, int ramsize, s_vm_params_t params; memset(¶ms, 0, sizeof(params)); params.ramsize = (sg_size_t)ramsize * 1024 * 1024; - //params.overcommit = 0; params.devsize = 0; params.skip_stage2 = 0; params.max_downtime = 0.03; @@ -147,8 +119,8 @@ msg_vm_t MSG_vm_create(msg_host_t pm, const char* name, int ncpus, int ramsize, params.dp_cap = params.ramsize * 0.9; // assume working set memory is 90% of ramsize params.mig_speed = (double)mig_netspeed * 1024 * 1024; // mig_speed - //XBT_INFO("dp rate %f migspeed : %f intensity mem : %d, updatespeed %f, hostspeed %f",params.dp_rate, - // params.mig_speed, dp_intensity, update_speed, host_speed); + XBT_DEBUG("dp rate %f migspeed : %f intensity mem : %d, updatespeed %f, hostspeed %f", params.dp_rate, + params.mig_speed, dp_intensity, update_speed, host_speed); static_cast(vm)->setParameters(¶ms); return vm; @@ -237,15 +209,19 @@ void MSG_vm_start(msg_vm_t vm) } } -/** @brief Immediately kills all processes within the given VM. Any memory that they allocated will be leaked. +/** @brief Immediately kills all processes within the given VM. * @ingroup msg_VMs * - * FIXME: No extra delay occurs. If you want to simulate this too, you want to use a #MSG_process_sleep() or something. - * I'm not quite sure. + * Any memory that they allocated will be leaked, unless you used #MSG_process_on_exit(). + * + * No extra delay occurs. If you want to simulate this too, you want to use a #MSG_process_sleep(). */ void MSG_vm_shutdown(msg_vm_t vm) { - simcall_vm_shutdown(vm); + smx_actor_t issuer=SIMIX_process_self(); + simgrid::simix::kernelImmediate([vm,issuer]() { + static_cast(vm)->pimpl_vm_->shutdown(issuer); + }); // Make sure that the processes in the VM are killed in this scheduling round before processing // (eg with the VM destroy) @@ -323,11 +299,9 @@ static int migration_rx_fun(int argc, char *argv[]) /* precopy migration makes the VM temporally paused */ xbt_assert(vm->pimpl_vm_->getState() == SURF_VM_STATE_SUSPENDED); - /* jump to vm_ws_xigrate(). this will update the vm location. */ - vm->pimpl_vm_->migrate(dst_pm); - - /* Resume the VM */ - SIMIX_vm_resume(vm); + /* Update the vm location and resume it */ + vm->pimpl_vm_->setPm(dst_pm); + vm->pimpl_vm_->resume(); }); { @@ -713,7 +687,10 @@ static int migration_tx_fun(int argc, char *argv[]) /* Stage3: stop the VM and copy the rest of states. */ XBT_DEBUG("mig-stage3: remaining_size %f", remaining_size); - simcall_vm_suspend(ms->vm); + simgrid::vm::VirtualMachineImpl* pimpl = static_cast(ms->vm)->pimpl_vm_; + pimpl->setState(SURF_VM_STATE_RUNNING); // FIXME: this bypass of the checks in suspend() is not nice + pimpl->isMigrating = false; // FIXME: this bypass of the checks in suspend() is not nice + pimpl->suspend(SIMIX_process_self()); stop_dirty_page_tracking(ms->vm); try { @@ -723,7 +700,7 @@ static int migration_tx_fun(int argc, char *argv[]) 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) - simcall_vm_resume(ms->vm); + static_cast(ms->vm)->pimpl_vm_->resume(); return 0; } @@ -836,10 +813,10 @@ void MSG_vm_migrate(msg_vm_t vm, msg_host_t dst_pm) */ void MSG_vm_suspend(msg_vm_t vm) { - if (MSG_vm_is_migrating(vm)) - THROWF(vm_error, 0, "Cannot suspend VM '%s', which is migrating", vm->cname()); - - simcall_vm_suspend(vm); + smx_actor_t issuer = SIMIX_process_self(); + simgrid::simix::kernelImmediate([vm,issuer]() { + static_cast(vm)->pimpl_vm_->suspend(issuer); + }); XBT_DEBUG("vm_suspend done"); @@ -858,65 +835,7 @@ void MSG_vm_suspend(msg_vm_t vm) */ void MSG_vm_resume(msg_vm_t vm) { - simcall_vm_resume(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); - } -} - - -/** @brief Immediately save the execution of all processes within the given VM. - * @ingroup msg_VMs - * - * This function stops the execution of the VM. All the processes on this VM - * will pause. The state of the VM is preserved. We can later resume it again. - * - * FIXME: No suspension cost occurs. If you want to simulate this too, you want to use a \ref MSG_file_write() before - * or after, depending on the exact semantic of VM save to you. - */ -void MSG_vm_save(msg_vm_t vm) -{ - if (MSG_vm_is_migrating(vm)) - THROWF(vm_error, 0, "Cannot save VM '%s', which is migrating.", vm->cname()); - - simcall_vm_save(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); - val_t value = PJ_value_get_or_new("save", "0 1 0", type); // save is green - new_pajePushState(MSG_get_clock(), vm_container, type, value); - } -} - -/** @brief Restore the execution of the VM. All processes on the VM run again. - * @ingroup msg_VMs - * - * FIXME: No restore cost occurs. If you want to simulate this too, you want to use a \ref MSG_file_read() before or - * after, depending on the exact semantic of VM restore to you. - */ -void MSG_vm_restore(msg_vm_t vm) -{ - simgrid::simix::kernelImmediate([vm]() { - simgrid::s4u::VirtualMachine* typedVm = static_cast(vm); - - if (typedVm->pimpl_vm_->getState() != SURF_VM_STATE_SAVED) - THROWF(vm_error, 0, "VM(%s) was not saved", vm->cname()); - - XBT_DEBUG("restore VM(%s), where %d processes exist", vm->cname(), xbt_swag_size(sg_host_simix(vm)->process_list)); - - /* jump to vm_ws_restore() */ - typedVm->pimpl_vm_->restore(); - - smx_actor_t smx_process, smx_process_safe; - xbt_swag_foreach_safe(smx_process, smx_process_safe, sg_host_simix(vm)->process_list) { - XBT_DEBUG("resume %s", smx_process->name.c_str()); - SIMIX_process_resume(smx_process); - } - }); + static_cast(vm)->pimpl_vm_->resume(); if (TRACE_msg_vm_is_enabled()) { container_t vm_container = PJ_container_get(vm->cname()); @@ -930,7 +849,7 @@ void MSG_vm_restore(msg_vm_t vm) */ msg_host_t MSG_vm_get_pm(msg_vm_t vm) { - return static_cast(vm)->pimpl_vm_->getPm(); + return static_cast(vm)->pm(); } /** @brief Set a CPU bound for a given VM.