* under the terms of the license (GNU LGPL) which comes with this package. */
#include "src/plugins/vm/VirtualMachineImpl.hpp"
+#include "src/include/surf/surf.hpp"
#include "src/simix/ActorImpl.hpp"
#include "src/simix/smx_host_private.hpp"
-
-#include <xbt/asserts.h> // xbt_log_no_loc
+#include "xbt/asserts.h" // xbt_log_no_loc
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_vm, surf, "Logging specific to the SURF VM module");
void surf_vm_model_init_HL13()
{
- if (surf_cpu_model_vm) {
+ if (surf_cpu_model_vm != nullptr)
surf_vm_model = new simgrid::vm::VMModel();
- all_existing_models->push_back(surf_vm_model);
- }
}
namespace simgrid {
std::vector<s4u::VirtualMachine*> trash;
/* Find all VMs living on that host */
for (s4u::VirtualMachine* const& vm : VirtualMachineImpl::allVms_)
- if (vm->getPm() == &host)
+ if (vm->get_pm() == &host)
trash.push_back(vm);
for (s4u::VirtualMachine* vm : trash)
vm->shutdown();
VMModel::VMModel()
{
+ all_existing_models.push_back(this);
s4u::Host::on_state_change.connect(hostStateChange);
}
surf::Cpu* cpu = ws_vm->pimpl_cpu;
double solved_value =
- ws_vm->getImpl()->action_->get_variable()->get_value(); // this is X1 in comment above, what
- // this VM got in the sharing on the PM
- XBT_DEBUG("assign %f to vm %s @ pm %s", solved_value, ws_vm->get_cname(), ws_vm->getPm()->get_cname());
+ ws_vm->get_impl()->action_->get_variable()->get_value(); // this is X1 in comment above, what
+ // this VM got in the sharing on the PM
+ XBT_DEBUG("assign %f to vm %s @ pm %s", solved_value, ws_vm->get_cname(), ws_vm->get_pm()->get_cname());
xbt_assert(cpu->get_model() == surf_cpu_model_vm);
kernel::lmm::System* vcpu_system = cpu->get_model()->get_maxmin_system();
allVms_.erase(iter);
/* Free the cpu_action of the VM. */
- XBT_ATTRIB_UNUSED int ret = action_->unref();
- xbt_assert(ret == 1, "Bug: some resource still remains");
+ XBT_ATTRIB_UNUSED bool ret = action_->unref();
+ xbt_assert(ret, "Bug: some resource still remains");
}
void VirtualMachineImpl::suspend(smx_actor_t issuer)
{
- if (get_state() != SURF_VM_STATE_RUNNING)
+ if (get_state() != s4u::VirtualMachine::state::RUNNING)
THROWF(vm_error, 0, "Cannot suspend VM %s: it is not running.", piface_->get_cname());
- if (issuer->host == piface_)
+ if (issuer->host_ == piface_)
THROWF(vm_error, 0, "Actor %s cannot suspend the VM %s in which it runs", issuer->get_cname(),
piface_->get_cname());
- auto& process_list = piface_->extension<simgrid::simix::Host>()->process_list;
- XBT_DEBUG("suspend VM(%s), where %zu processes exist", piface_->get_cname(), process_list.size());
+ XBT_DEBUG("suspend VM(%s), where %zu processes exist", piface_->get_cname(), process_list_.size());
action_->suspend();
- for (auto& smx_process : process_list) {
- XBT_DEBUG("suspend %s", smx_process.name.c_str());
+ for (auto& smx_process : process_list_) {
+ XBT_DEBUG("suspend %s", smx_process.get_cname());
smx_process.suspend(issuer);
}
XBT_DEBUG("suspend all processes on the VM done done");
- vm_state_ = SURF_VM_STATE_SUSPENDED;
+ vm_state_ = s4u::VirtualMachine::state::SUSPENDED;
}
void VirtualMachineImpl::resume()
{
- if (get_state() != SURF_VM_STATE_SUSPENDED)
+ if (get_state() != s4u::VirtualMachine::state::SUSPENDED)
THROWF(vm_error, 0, "Cannot resume VM %s: it was not suspended", piface_->get_cname());
- auto& process_list = piface_->extension<simgrid::simix::Host>()->process_list;
- XBT_DEBUG("Resume VM %s, containing %zu processes.", piface_->get_cname(), process_list.size());
+ XBT_DEBUG("Resume VM %s, containing %zu processes.", piface_->get_cname(), process_list_.size());
action_->resume();
- for (auto& smx_process : process_list) {
+ for (auto& smx_process : process_list_) {
XBT_DEBUG("resume %s", smx_process.get_cname());
smx_process.resume();
}
- vm_state_ = SURF_VM_STATE_RUNNING;
+ vm_state_ = s4u::VirtualMachine::state::RUNNING;
}
/** @brief Power off a VM.
*/
void VirtualMachineImpl::shutdown(smx_actor_t issuer)
{
- if (get_state() != SURF_VM_STATE_RUNNING) {
+ if (get_state() != s4u::VirtualMachine::state::RUNNING) {
const char* stateName = "(unknown state)";
switch (get_state()) {
- case SURF_VM_STATE_CREATED:
+ case s4u::VirtualMachine::state::CREATED:
stateName = "created, but not yet started";
break;
- case SURF_VM_STATE_SUSPENDED:
+ case s4u::VirtualMachine::state::SUSPENDED:
stateName = "suspended";
break;
- case SURF_VM_STATE_DESTROYED:
+ case s4u::VirtualMachine::state::DESTROYED:
stateName = "destroyed";
break;
default: /* SURF_VM_STATE_RUNNING or unexpected values */
XBT_VERB("Shutting down the VM %s even if it's not running but %s", piface_->get_cname(), stateName);
}
- auto& process_list = piface_->extension<simgrid::simix::Host>()->process_list;
- XBT_DEBUG("shutdown VM %s, that contains %zu processes", piface_->get_cname(), process_list.size());
+ XBT_DEBUG("shutdown VM %s, that contains %zu processes", piface_->get_cname(), process_list_.size());
- for (auto& smx_process : process_list) {
+ for (auto& smx_process : process_list_) {
XBT_DEBUG("kill %s@%s on behalf of %s which shutdown that VM.", smx_process.get_cname(),
- smx_process.host->get_cname(), issuer->get_cname());
+ smx_process.host_->get_cname(), issuer->get_cname());
SIMIX_process_kill(&smx_process, issuer);
}
- set_state(SURF_VM_STATE_DESTROYED);
+ set_state(s4u::VirtualMachine::state::DESTROYED);
/* FIXME: we may have to do something at the surf layer, e.g., vcpu action */
}
*/
void VirtualMachineImpl::set_physical_host(s4u::Host* destination)
{
- const char* vm_name = piface_->get_cname();
- const char* pm_name_src = physical_host_->get_cname();
- const char* pm_name_dst = destination->get_cname();
+ std::string vm_name = piface_->get_name();
+ std::string pm_name_src = physical_host_->get_name();
+ std::string pm_name_dst = destination->get_name();
/* update net_elm with that of the destination physical host */
piface_->pimpl_netpoint = destination->pimpl_netpoint;
/* keep the bound value of the cpu action of the VM. */
double old_bound = action_->get_bound();
if (old_bound > 0) {
- XBT_DEBUG("migrate VM(%s): set bound (%f) at %s", vm_name, old_bound, pm_name_dst);
+ XBT_DEBUG("migrate VM(%s): set bound (%f) at %s", vm_name.c_str(), old_bound, pm_name_dst.c_str());
new_cpu_action->set_bound(old_bound);
}
- xbt_assert(action_->unref() == 1, "Bug: some resource still remains");
+ XBT_ATTRIB_UNUSED bool ret = action_->unref();
+ xbt_assert(ret, "Bug: some resource still remains");
action_ = new_cpu_action;
- XBT_DEBUG("migrate VM(%s): change PM (%s to %s)", vm_name, pm_name_src, pm_name_dst);
+ XBT_DEBUG("migrate VM(%s): change PM (%s to %s)", vm_name.c_str(), pm_name_src.c_str(), pm_name_dst.c_str());
}
void VirtualMachineImpl::set_bound(double bound)
