X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c80eff88110151cbf0bf09fafeeab4b287e185ab..bfed90d7c58bf90f06017312bc82965a416986eb:/src/surf/vm_hl13.cpp diff --git a/src/surf/vm_hl13.cpp b/src/surf/vm_hl13.cpp index ce54ea0288..09cb6630b6 100644 --- a/src/surf/vm_hl13.cpp +++ b/src/surf/vm_hl13.cpp @@ -4,8 +4,6 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include - #include #include "cpu_cas01.hpp" @@ -13,11 +11,10 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_vm); -void surf_vm_model_init_HL13(void){ +void surf_vm_model_init_HL13(){ if (surf_cpu_model_vm) { surf_vm_model = new simgrid::surf::VMHL13Model(); - simgrid::surf::Model *model = surf_vm_model; - xbt_dynar_push(all_existing_models, &model); + all_existing_models->push_back(surf_vm_model); } } @@ -27,25 +24,19 @@ namespace surf { /********* * Model * *********/ - VMHL13Model::VMHL13Model() : VMModel() {} void VMHL13Model::updateActionsState(double /*now*/, double /*delta*/) {} -/* ind means ''indirect'' that this is a reference on the whole dict_elm - * structure (i.e not on the surf_resource_private infos) */ - -VirtualMachine *VMHL13Model::createVM(const char *name, sg_host_t host_PM) +s4u::Host *VMHL13Model::createVM(const char *name, sg_host_t host_PM) { - VirtualMachine* vm = new VMHL13(this, name, NULL, host_PM); + VirtualMachine* vm = new VMHL13(this, name, host_PM); VMCreatedCallbacks(vm); - return vm; + return vm->piface; } -/* In the real world, processes on the guest operating system will be somewhat - * degraded due to virtualization overhead. The total CPU share that these - * processes get is smaller than that of the VM process gets on a host - * operating system. */ +/* In the real world, processes on the guest operating system will be somewhat degraded due to virtualization overhead. + * The total CPU share these processes get is smaller than that of the VM process gets on a host operating system. */ // const double virt_overhead = 0.95; const double virt_overhead = 1; @@ -56,7 +47,6 @@ double VMHL13Model::next_occuring_event(double now) /* 1. Now we know how many resource should be assigned to each virtual * machine. We update constraints of the virtual machine layer. * - * * If we have two virtual machine (VM1 and VM2) on a physical machine (PM1). * X1 + X2 = C (Equation 1) * where @@ -74,21 +64,16 @@ double VMHL13Model::next_occuring_event(double now) * Equation 1 was solved in the physical machine layer. * Equation 2 is solved in the virtual machine layer (here). * X1 must be passed to the virtual machine laye as a constraint value. - * **/ /* iterate for all virtual machines */ - for (VMModel::vm_list_t::iterator iter = - VMModel::ws_vms.begin(); - iter != VMModel::ws_vms.end(); ++iter) { - + for (VMModel::vm_list_t::iterator iter = VMModel::ws_vms.begin(); iter != VMModel::ws_vms.end(); ++iter) { VirtualMachine *ws_vm = &*iter; Cpu *cpu = ws_vm->p_cpu; xbt_assert(cpu, "cpu-less host"); - double solved_value = ws_vm->p_action->getVariable()->value; - XBT_DEBUG("assign %f to vm %s @ pm %s", solved_value, - ws_vm->getName(), ws_vm->p_hostPM->name().c_str()); + double solved_value = ws_vm->action_->getVariable()->value; + XBT_DEBUG("assign %f to vm %s @ pm %s", solved_value, ws_vm->getName(), ws_vm->getPm()->name().c_str()); // TODO: check lmm_update_constraint_bound() works fine instead of the below manual substitution. // cpu_cas01->constraint->bound = solved_value; @@ -97,7 +82,6 @@ double VMHL13Model::next_occuring_event(double now) lmm_update_constraint_bound(vcpu_system, cpu->getConstraint(), virt_overhead * solved_value); } - /* 2. Calculate resource share at the virtual machine layer. */ adjustWeightOfDummyCpuActions(); @@ -108,12 +92,11 @@ double VMHL13Model::next_occuring_event(double now) /************ * Resource * ************/ - -VMHL13::VMHL13(VMModel *model, const char* name, xbt_dict_t props, sg_host_t host_PM) - : VirtualMachine(model, name, props, host_PM) +VMHL13::VMHL13(VMModel *model, const char* name, sg_host_t host_PM) + : VirtualMachine(model, name, host_PM) { /* Currently, we assume a VM has no storage. */ - p_storage = NULL; + p_storage = nullptr; /* Currently, a VM uses the network resource of its physical host. In * host_lib, this network resource object is referred from two different keys. @@ -121,7 +104,7 @@ VMHL13::VMHL13(VMModel *model, const char* name, xbt_dict_t props, sg_host_t hos * from the VM name, we have to make sure that the system does not call the * free callback for the network resource object. The network resource object * is still used by the physical machine. */ - sg_host_t host_VM = sg_host_by_name_or_create(name); + sg_host_t host_VM = simgrid::s4u::Host::by_name_or_create(name); host_VM->pimpl_netcard = host_PM->pimpl_netcard; p_vm_state = SURF_VM_STATE_CREATED; @@ -131,30 +114,29 @@ VMHL13::VMHL13(VMModel *model, const char* name, xbt_dict_t props, sg_host_t hos CpuCas01 *sub_cpu = static_cast(host_PM->pimpl_cpu); p_cpu = surf_cpu_model_vm->createCpu(host_VM, // the machine hosting the VM - sub_cpu->getSpeedPeakList(), // host->power_peak, - NULL, // host->power_trace, - 1, // host->core_amount, - NULL); // host->state_trace, + sub_cpu->getSpeedPeakList(), 1 /*cores*/); if (sub_cpu->getPState() != 0) p_cpu->setPState(sub_cpu->getPState()); /* We create cpu_action corresponding to a VM process on the host operating system. */ /* FIXME: TODO: we have to periodically input GUESTOS_NOISE to the system? how ? */ - p_action = sub_cpu->execution_start(0); + action_ = sub_cpu->execution_start(0); - XBT_INFO("Create VM(%s)@PM(%s) with %ld mounted disks", - name, p_hostPM->name().c_str(), xbt_dynar_length(p_storage)); + XBT_VERB("Create VM(%s)@PM(%s) with %ld mounted disks", name, hostPM_->name().c_str(), xbt_dynar_length(p_storage)); +} +VMHL13::~VMHL13() { + delete p_cpu; } void VMHL13::suspend() { - p_action->suspend(); + action_->suspend(); p_vm_state = SURF_VM_STATE_SUSPENDED; } void VMHL13::resume() { - p_action->resume(); + action_->resume(); p_vm_state = SURF_VM_STATE_RUNNING; } @@ -163,7 +145,7 @@ void VMHL13::save() p_vm_state = SURF_VM_STATE_SAVING; /* FIXME: do something here */ - p_action->suspend(); + action_->suspend(); p_vm_state = SURF_VM_STATE_SAVED; } @@ -172,60 +154,53 @@ void VMHL13::restore() p_vm_state = SURF_VM_STATE_RESTORING; /* FIXME: do something here */ - p_action->resume(); + action_->resume(); p_vm_state = SURF_VM_STATE_RUNNING; } -/* - * Update the physical host of the given VM - */ +/* Update the physical host of the given VM */ void VMHL13::migrate(sg_host_t host_dest) { - Host *surfHost_dst = host_dest->extension(); + HostImpl *surfHost_dst = host_dest->extension(); const char *vm_name = getName(); - const char *pm_name_src = p_hostPM->name().c_str(); + const char *pm_name_src = hostPM_->name().c_str(); const char *pm_name_dst = surfHost_dst->getName(); /* update net_elm with that of the destination physical host */ sg_host_by_name(vm_name)->pimpl_netcard = sg_host_by_name(pm_name_dst)->pimpl_netcard; - p_hostPM = host_dest; + hostPM_ = host_dest; /* Update vcpu's action for the new pm */ { /* create a cpu action bound to the pm model at the destination. */ CpuAction *new_cpu_action = static_cast(host_dest->pimpl_cpu->execution_start(0)); - e_surf_action_state_t state = p_action->getState(); - if (state != SURF_ACTION_DONE) - XBT_CRITICAL("FIXME: may need a proper handling, %d", state); - if (p_action->getRemainsNoUpdate() > 0) - XBT_CRITICAL("FIXME: need copy the state(?), %f", p_action->getRemainsNoUpdate()); + Action::State state = action_->getState(); + if (state != Action::State::done) + XBT_CRITICAL("FIXME: may need a proper handling, %d", static_cast(state)); + if (action_->getRemainsNoUpdate() > 0) + XBT_CRITICAL("FIXME: need copy the state(?), %f", action_->getRemainsNoUpdate()); /* keep the bound value of the cpu action of the VM. */ - double old_bound = p_action->getBound(); + double old_bound = action_->getBound(); if (old_bound != 0) { XBT_DEBUG("migrate VM(%s): set bound (%f) at %s", vm_name, old_bound, pm_name_dst); new_cpu_action->setBound(old_bound); } - XBT_ATTRIB_UNUSED int ret = p_action->unref(); + XBT_ATTRIB_UNUSED int ret = action_->unref(); xbt_assert(ret == 1, "Bug: some resource still remains"); - p_action = new_cpu_action; + action_ = new_cpu_action; } XBT_DEBUG("migrate VM(%s): change PM (%s to %s)", vm_name, pm_name_src, pm_name_dst); } void VMHL13::setBound(double bound){ - p_action->setBound(bound); + action_->setBound(bound); } -void VMHL13::setAffinity(Cpu *cpu, unsigned long mask){ - p_action->setAffinity(cpu, mask); -} - - } }