X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b83ad9c88af4715987015ddc91ac93ad749df428..f7623851a023484d8ba1d5c26134ee7850bac134:/src/msg/msg_vm.cpp diff --git a/src/msg/msg_vm.cpp b/src/msg/msg_vm.cpp index c166b5fe78..8d59a21358 100644 --- a/src/msg/msg_vm.cpp +++ b/src/msg/msg_vm.cpp @@ -58,7 +58,8 @@ void MSG_vm_get_params(msg_vm_t vm, vm_params_t params) /* **** Check state of a VM **** */ static inline int __MSG_vm_is_state(msg_vm_t vm, e_surf_vm_state_t state) { - return static_cast(vm)->pimpl_vm_->getState() == state; + simgrid::s4u::VirtualMachine* castedVm = static_cast(vm); + return castedVm->pimpl_vm_ != nullptr && castedVm->pimpl_vm_->getState() == state; } /** @brief Returns whether the given VM has just created, not running. @@ -98,11 +99,12 @@ int MSG_vm_is_suspended(msg_vm_t vm) * @ingroup msg_VMs* * @param pm Physical machine that will host the VM * @param name Must be unique + * @param coreAmount Must be >= 1 * @param ramsize [TODO] * @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 ramsize, int mig_netspeed, int dp_intensity) +msg_vm_t MSG_vm_create(msg_host_t pm, const char* name, int coreAmount, int ramsize, int mig_netspeed, int dp_intensity) { simgrid::vm::VmHostExt::ensureVmExtInstalled(); @@ -110,7 +112,7 @@ msg_vm_t MSG_vm_create(msg_host_t pm, const char* name, int ramsize, int mig_net double host_speed = MSG_host_get_speed(pm); double update_speed = (static_cast(dp_intensity)/100) * mig_netspeed; - msg_vm_t vm = MSG_vm_create_core(pm, name); + msg_vm_t vm = MSG_vm_create_multicore(pm, name, coreAmount); s_vm_params_t params; memset(¶ms, 0, sizeof(params)); params.ramsize = static_cast(ramsize) * 1024 * 1024; @@ -128,7 +130,7 @@ msg_vm_t MSG_vm_create(msg_host_t pm, const char* name, int ramsize, int mig_net return vm; } -/** @brief Create a new VM object. The VM is not yet started. The resource of the VM is allocated upon MSG_vm_start(). +/** @brief Create a new VM object with the default parameters * @ingroup msg_VMs* * * A VM is treated as a host. The name of the VM must be unique among all hosts. @@ -138,7 +140,19 @@ msg_vm_t MSG_vm_create_core(msg_host_t pm, const char* name) xbt_assert(sg_host_by_name(name) == nullptr, "Cannot create a VM named %s: this name is already used by an host or a VM", name); - return new simgrid::s4u::VirtualMachine(name, pm); + return new simgrid::s4u::VirtualMachine(name, pm, 1); +} +/** @brief Create a new VM object with the default parameters, but with a specified amount of cores + * @ingroup msg_VMs* + * + * A VM is treated as a host. The name of the VM must be unique among all hosts. + */ +msg_vm_t MSG_vm_create_multicore(msg_host_t pm, const char* name, int coreAmount) +{ + xbt_assert(sg_host_by_name(name) == nullptr, + "Cannot create a VM named %s: this name is already used by an host or a VM", name); + + return new simgrid::s4u::VirtualMachine(name, pm, coreAmount); } /** @brief Destroy a VM. Destroy the VM object from the simulation. @@ -153,9 +167,6 @@ 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) || __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]() { vm->destroy(); @@ -171,7 +182,7 @@ void MSG_vm_destroy(msg_vm_t vm) /** @brief Start a vm (i.e., boot the guest operating system) * @ingroup msg_VMs * - * If the VM cannot be started (because of memory overprovisionning), an exception is generated. + * If the VM cannot be started (because of memory over-provisioning), an exception is generated. */ void MSG_vm_start(msg_vm_t vm) { @@ -187,7 +198,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_) @@ -268,7 +279,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); @@ -361,7 +372,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; @@ -441,7 +452,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); @@ -581,7 +592,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 { @@ -621,7 +632,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 (;;) { @@ -742,7 +753,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());