X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/638b21d2071c77f39da2f322156f05f75bf91517..cc9460b0958168a1f9adec8208d190bf128ce6cc:/src/surf/vm_hl13.cpp diff --git a/src/surf/vm_hl13.cpp b/src/surf/vm_hl13.cpp index 295421bbdf..9dd72aae81 100644 --- a/src/surf/vm_hl13.cpp +++ b/src/surf/vm_hl13.cpp @@ -4,18 +4,17 @@ /* 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" #include "vm_hl13.hpp" 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); } } @@ -25,41 +24,29 @@ 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, surf_resource_t host_PM) -{ - VirtualMachine* vm = new VMHL13(this, name, NULL, host_PM); - surf_callback_emit(VMCreatedCallbacks, vm); - return vm; -} - -static inline double get_solved_value(CpuAction *cpu_action) +s4u::Host *VMHL13Model::createVM(const char *name, sg_host_t host_PM) { - return cpu_action->getVariable()->value; + VirtualMachine* vm = new VMHL13(this, name, host_PM); + onVmCreation(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; -double VMHL13Model::shareResources(double now) +double VMHL13Model::next_occuring_event(double now) { /* TODO: update action's cost with the total cost of processes on the VM. */ /* 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 @@ -77,21 +64,15 @@ double VMHL13Model::shareResources(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) { - - VirtualMachine *ws_vm = &*iter; + for (VirtualMachine *ws_vm : VirtualMachine::allVms_) { Cpu *cpu = ws_vm->p_cpu; xbt_assert(cpu, "cpu-less host"); - double solved_value = get_solved_value(ws_vm->p_action); - XBT_DEBUG("assign %f to vm %s @ pm %s", solved_value, - ws_vm->getName(), ws_vm->p_subWs->getName()); + 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; @@ -100,76 +81,21 @@ double VMHL13Model::shareResources(double now) lmm_update_constraint_bound(vcpu_system, cpu->getConstraint(), virt_overhead * solved_value); } - /* 2. Calculate resource share at the virtual machine layer. */ adjustWeightOfDummyCpuActions(); - double min_by_cpu = surf_cpu_model_vm->shareResources(now); - double min_by_net = surf_network_model->shareResourcesIsIdempotent() ? surf_network_model->shareResources(now) : -1; - // Fixme: take storage into account once it's implemented - double min_by_sto = -1; - - XBT_DEBUG("model %p, %s min_by_cpu %f, %s min_by_net %f, %s min_by_sto %f", - this, typeid(surf_cpu_model_pm ).name(), min_by_cpu, - typeid(surf_network_model).name(), min_by_net, - typeid(surf_storage_model).name(), min_by_sto); - - double ret = std::max(std::max(min_by_cpu, min_by_net), min_by_sto); - if (min_by_cpu >= 0.0 && min_by_cpu < ret) - ret = min_by_cpu; - if (min_by_net >= 0.0 && min_by_net < ret) - ret = min_by_net; - if (min_by_sto >= 0.0 && min_by_sto < ret) - ret = min_by_sto; - - return ret; -} - -Action *VMHL13Model::executeParallelTask(int host_nb, - sg_host_t *host_list, - double *flops_amount, - double *bytes_amount, - double rate){ -#define cost_or_zero(array,pos) ((array)?(array)[pos]:0.0) - if ((host_nb == 1) - && (cost_or_zero(bytes_amount, 0) == 0.0)) - return surf_host_execute(host_list[0], flops_amount[0]); - else if ((host_nb == 1) - && (cost_or_zero(flops_amount, 0) == 0.0)) - return surf_network_model_communicate(surf_network_model, host_list[0], host_list[0],bytes_amount[0], rate); - else if ((host_nb == 2) - && (cost_or_zero(flops_amount, 0) == 0.0) - && (cost_or_zero(flops_amount, 1) == 0.0)) { - int i,nb = 0; - double value = 0.0; - - for (i = 0; i < host_nb * host_nb; i++) { - if (cost_or_zero(bytes_amount, i) > 0.0) { - nb++; - value = cost_or_zero(bytes_amount, i); - } - } - if (nb == 1) - return surf_network_model_communicate(surf_network_model, host_list[0], host_list[1], value, rate); - } -#undef cost_or_zero - - THROW_UNIMPLEMENTED; /* This model does not implement parallel tasks for more than 2 hosts. */ - return NULL; + /* 3. Ready. Get the next occuring event */ + return surf_cpu_model_vm->next_occuring_event(now); } /************ * Resource * ************/ - -VMHL13::VMHL13(VMModel *model, const char* name, xbt_dict_t props, - surf_resource_t host_PM) - : VirtualMachine(model, name, props, NULL, NULL) +VMHL13::VMHL13(VMModel *model, const char* name, sg_host_t host_PM) + : VirtualMachine(model, name, host_PM) { - Host *sub_ws = surf_host_resource_priv(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. @@ -177,186 +103,102 @@ VMHL13::VMHL13(VMModel *model, const char* name, xbt_dict_t props, * 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 sg_sub_ws = sg_host_by_name_or_create(sub_ws->getName()); - p_netElm = new RoutingEdgeWrapper(sg_host_edge(sg_sub_ws)); - sg_host_edge_set(sg_host_by_name_or_create(name), p_netElm); + sg_host_t host_VM = simgrid::s4u::Host::by_name_or_create(name); + host_VM->pimpl_netcard = host_PM->pimpl_netcard; - p_subWs = sub_ws; - p_currentState = SURF_VM_STATE_CREATED; + p_vm_state = SURF_VM_STATE_CREATED; // //// CPU RELATED STUFF //// // Roughly, create a vcpu resource by using the values of the sub_cpu one. - CpuCas01 *sub_cpu = static_cast(sg_host_surfcpu(host_PM)); - - p_cpu = surf_cpu_model_vm->createCpu(name, // name - sub_cpu->getSpeedPeakList(), // host->power_peak, - sub_cpu->getPState(), - 1, // host->power_scale, - NULL, // host->power_trace, - 1, // host->core_amount, - SURF_RESOURCE_ON, // host->initial_state, - NULL, // host->state_trace, - NULL); // host->properties, + 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(), 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 ? */ - // vm_ws->cpu_action = surf_cpu_model_pm->extension.cpu.execute(host_PM, GUESTOS_NOISE); - p_action = sub_cpu->execute(0); - - XBT_INFO("Create VM(%s)@PM(%s) with %ld mounted disks", name, sub_ws->getName(), xbt_dynar_length(p_storage)); -} - -/* - * A physical host does not disappear in the current SimGrid code, but a VM may - * disappear during a simulation. - */ -VMHL13::~VMHL13() -{ - /* Free the cpu_action of the VM. */ - XBT_ATTRIB_UNUSED int ret = p_action->unref(); - xbt_assert(ret == 1, "Bug: some resource still remains"); -} - -void VMHL13::updateState(tmgr_trace_event_t /*event_type*/, double /*value*/, double /*date*/) { - THROW_IMPOSSIBLE; /* This model does not implement parallel tasks */ -} - -bool VMHL13::isUsed() { - THROW_IMPOSSIBLE; /* This model does not implement parallel tasks */ - return -1; -} + action_ = sub_cpu->execution_start(0); -e_surf_resource_state_t VMHL13::getState() -{ - return (e_surf_resource_state_t) p_currentState; + XBT_VERB("Create VM(%s)@PM(%s) with %ld mounted disks", name, hostPM_->name().c_str(), xbt_dynar_length(p_storage)); } - -void VMHL13::setState(e_surf_resource_state_t state) -{ - p_currentState = (e_surf_vm_state_t) state; +VMHL13::~VMHL13() { + delete p_cpu; } void VMHL13::suspend() { - p_action->suspend(); - p_currentState = SURF_VM_STATE_SUSPENDED; + action_->suspend(); + p_vm_state = SURF_VM_STATE_SUSPENDED; } void VMHL13::resume() { - p_action->resume(); - p_currentState = SURF_VM_STATE_RUNNING; + action_->resume(); + p_vm_state = SURF_VM_STATE_RUNNING; } void VMHL13::save() { - p_currentState = SURF_VM_STATE_SAVING; + p_vm_state = SURF_VM_STATE_SAVING; /* FIXME: do something here */ - p_action->suspend(); - p_currentState = SURF_VM_STATE_SAVED; + action_->suspend(); + p_vm_state = SURF_VM_STATE_SAVED; } void VMHL13::restore() { - p_currentState = SURF_VM_STATE_RESTORING; + p_vm_state = SURF_VM_STATE_RESTORING; /* FIXME: do something here */ - p_action->resume(); - p_currentState = SURF_VM_STATE_RUNNING; + action_->resume(); + p_vm_state = SURF_VM_STATE_RUNNING; } -/* - * Update the physical host of the given VM - */ -void VMHL13::migrate(surf_resource_t ind_dst_pm) +/* Update the physical host of the given VM */ +void VMHL13::migrate(sg_host_t host_dest) { - /* ind_dst_pm equals to smx_host_t */ - Host *ws_dst = static_cast(surf_host_resource_priv(ind_dst_pm)); + HostImpl *surfHost_dst = host_dest->extension(); const char *vm_name = getName(); - const char *pm_name_src = p_subWs->getName(); - const char *pm_name_dst = ws_dst->getName(); - - xbt_assert(ws_dst); + 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 */ - RoutingEdge *old_net_elm = p_netElm; - RoutingEdge *new_net_elm = new RoutingEdgeWrapper(sg_host_edge(sg_host_by_name(pm_name_dst))); - xbt_assert(new_net_elm); - - /* Unregister the current net_elm from host_lib. Do not call the free callback. */ - sg_host_edge_destroy(sg_host_by_name(vm_name), 0); - - /* Then, resister the new one. */ - p_netElm = new_net_elm; - sg_host_edge_set(sg_host_by_name(vm_name), p_netElm); + sg_host_by_name(vm_name)->pimpl_netcard = sg_host_by_name(pm_name_dst)->pimpl_netcard; - p_subWs = ws_dst; + 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( - static_cast(sg_host_surfcpu(ind_dst_pm))->execute(0)); + 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 net_elm (%p to %p)", vm_name, old_net_elm, new_net_elm); XBT_DEBUG("migrate VM(%s): change PM (%s to %s)", vm_name, pm_name_src, pm_name_dst); - delete old_net_elm; } void VMHL13::setBound(double bound){ - p_action->setBound(bound); -} - -void VMHL13::setAffinity(Cpu *cpu, unsigned long mask){ - p_action->setAffinity(cpu, mask); -} - -/* - * A surf level object will be useless in the upper layer. Returning the - * dict_elm of the host. - **/ -surf_resource_t VMHL13::getPm() -{ - return xbt_lib_get_elm_or_null(host_lib, p_subWs->getName()); -} - -/* Adding a task to a VM updates the VCPU task on its physical machine. */ -Action *VMHL13::execute(double size) -{ - double old_cost = p_action->getCost(); - double new_cost = old_cost + size; - - XBT_DEBUG("VM(%s)@PM(%s): update dummy action's cost (%f -> %f)", - getName(), p_subWs->getName(), - old_cost, new_cost); - - p_action->setCost(new_cost); - - return p_cpu->execute(size); -} - -Action *VMHL13::sleep(double duration) { - return p_cpu->sleep(duration); + action_->setBound(bound); } }