X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/79f2c630c9587d494cb154e6d074294c1e23208e..e37abccaa5b5cfb44e2cfcf68d5156766da28dc1:/src/surf/vm_hl13.cpp diff --git a/src/surf/vm_hl13.cpp b/src/surf/vm_hl13.cpp index f073423761..e453e8a6d1 100644 --- a/src/surf/vm_hl13.cpp +++ b/src/surf/vm_hl13.cpp @@ -42,11 +42,6 @@ VirtualMachine *VMHL13Model::createVM(const char *name, sg_host_t host_PM) return vm; } -static inline double get_solved_value(CpuAction *cpu_action) -{ - return cpu_action->getVariable()->value; -} - /* 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 @@ -54,7 +49,7 @@ static inline double get_solved_value(CpuAction *cpu_action) // 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. */ @@ -91,9 +86,9 @@ double VMHL13Model::shareResources(double now) Cpu *cpu = ws_vm->p_cpu; xbt_assert(cpu, "cpu-less host"); - double solved_value = get_solved_value(ws_vm->p_action); + 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->getName().c_str()); + ws_vm->getName(), ws_vm->p_hostPM->name().c_str()); // TODO: check lmm_update_constraint_bound() works fine instead of the below manual substitution. // cpu_cas01->constraint->bound = solved_value; @@ -106,58 +101,8 @@ double VMHL13Model::shareResources(double now) /* 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); } /************ @@ -176,31 +121,29 @@ 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. */ - p_netElm = new RoutingEdgeWrapper(host_PM->p_netcard); sg_host_t host_VM = sg_host_by_name_or_create(name); - host_VM->p_netcard = p_netElm; + host_VM->pimpl_netcard = host_PM->pimpl_netcard; 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(host_PM->p_cpu); + 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, - sub_cpu->getPState(), - 1, // host->power_scale, NULL, // host->power_trace, 1, // host->core_amount, - 1/*ON*/, // host->initiallyOn, NULL); // host->state_trace, + 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); + p_action = sub_cpu->execution_start(0); - XBT_INFO("Create VM(%s)@PM(%s) with %ld mounted disks", name, p_hostPM->getName().c_str(), xbt_dynar_length(p_storage)); + XBT_INFO("Create VM(%s)@PM(%s) with %ld mounted disks", + name, p_hostPM->name().c_str(), xbt_dynar_length(p_storage)); } void VMHL13::suspend() @@ -238,32 +181,20 @@ void VMHL13::restore() */ void VMHL13::migrate(sg_host_t host_dest) { - /* ind_dst_pm equals to smx_host_t */ - Host *surfHost_dst = static_cast(surf_host_resource_priv(host_dest)); + HostImpl *surfHost_dst = host_dest->extension(); const char *vm_name = getName(); - const char *pm_name_src = p_hostPM->getName().c_str(); + const char *pm_name_src = p_hostPM->name().c_str(); const char *pm_name_dst = surfHost_dst->getName(); - xbt_assert(surfHost_dst); - /* update net_elm with that of the destination physical host */ - NetCard *old_net_elm = p_netElm; - NetCard *new_net_elm = new RoutingEdgeWrapper(sg_host_by_name(pm_name_dst)->p_netcard); - xbt_assert(new_net_elm); - - /* Unregister the current net_elm from host_lib. Do not call the free callback. */ - sg_host_by_name(vm_name)->p_netcard = nullptr; - - /* Then, resister the new one. */ - p_netElm = new_net_elm; - sg_host_by_name(vm_name)->p_netcard = p_netElm; + sg_host_by_name(vm_name)->pimpl_netcard = sg_host_by_name(pm_name_dst)->pimpl_netcard; p_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->p_cpu->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) @@ -284,9 +215,7 @@ void VMHL13::migrate(sg_host_t host_dest) p_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){