X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/347f9a2ca55bffc88bf965952b9be3a15535e908..afb806d0615c22ac119575596b71691f4e2bc9d1:/src/surf/vm_hl13.cpp diff --git a/src/surf/vm_hl13.cpp b/src/surf/vm_hl13.cpp index d31a30acc9..95bc2db8aa 100644 --- a/src/surf/vm_hl13.cpp +++ b/src/surf/vm_hl13.cpp @@ -135,7 +135,7 @@ Action *VMHL13Model::executeParallelTask(int host_nb, #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]); + return host_list[0]->pimpl_cpu->execute(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); @@ -176,25 +176,24 @@ 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(sg_host_edge(host_PM)); - sg_host_t host = sg_host_by_name_or_create(name); - sg_host_edge_set(host, p_netElm); + p_netElm = host_PM->pimpl_netcard; + sg_host_t host_VM = sg_host_by_name_or_create(name); + host_VM->pimpl_netcard = p_netElm; - 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)); + CpuCas01 *sub_cpu = static_cast(host_PM->pimpl_cpu); - p_cpu = surf_cpu_model_vm->createCpu(name, // name + 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, - SURF_RESOURCE_ON, // host->initial_state, + 1/*ON*/, // host->initiallyOn, NULL); // host->state_trace, - p_cpu->plug(host); /* 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 ? */ @@ -204,64 +203,34 @@ VMHL13::VMHL13(VMModel *model, const char* name, xbt_dict_t props, sg_host_t hos XBT_INFO("Create VM(%s)@PM(%s) with %ld mounted disks", name, p_hostPM->getName().c_str(), 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; -} - -e_surf_resource_state_t VMHL13::getState() -{ - return (e_surf_resource_state_t) p_currentState; -} - -void VMHL13::setState(e_surf_resource_state_t state) -{ - p_currentState = (e_surf_vm_state_t) state; -} - void VMHL13::suspend() { p_action->suspend(); - p_currentState = SURF_VM_STATE_SUSPENDED; + p_vm_state = SURF_VM_STATE_SUSPENDED; } void VMHL13::resume() { p_action->resume(); - p_currentState = SURF_VM_STATE_RUNNING; + 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; + 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; + p_vm_state = SURF_VM_STATE_RUNNING; } /* @@ -269,33 +238,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)); + Host *surfHost_dst = host_dest->extension(); const char *vm_name = getName(); const char *pm_name_src = p_hostPM->getName().c_str(); const char *pm_name_dst = surfHost_dst->getName(); - xbt_assert(surfHost_dst); - /* 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 = p_netElm = 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( - static_cast(sg_host_surfcpu(host_dest))->execute(0)); + CpuAction *new_cpu_action = static_cast(host_dest->pimpl_cpu->execute(0)); e_surf_action_state_t state = p_action->getState(); if (state != SURF_ACTION_DONE) @@ -316,9 +272,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){ @@ -329,33 +283,6 @@ 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. - **/ -sg_host_t VMHL13::getPm() -{ - return p_hostPM; -} - -/* 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_hostPM->getName().c_str(), - old_cost, new_cost); - - p_action->setCost(new_cost); - - return p_cpu->execute(size); -} - -Action *VMHL13::sleep(double duration) { - return p_cpu->sleep(duration); -} } }