X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7f4f03348bd07609e258eb3b545bdafc2c881847..347f9a2ca55bffc88bf965952b9be3a15535e908:/src/surf/vm_hl13.cpp diff --git a/src/surf/vm_hl13.cpp b/src/surf/vm_hl13.cpp index 295421bbdf..d31a30acc9 100644 --- a/src/surf/vm_hl13.cpp +++ b/src/surf/vm_hl13.cpp @@ -6,6 +6,8 @@ #include +#include + #include "cpu_cas01.hpp" #include "vm_hl13.hpp" @@ -33,10 +35,10 @@ 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 *VMHL13Model::createVM(const char *name, sg_host_t host_PM) { VirtualMachine* vm = new VMHL13(this, name, NULL, host_PM); - surf_callback_emit(VMCreatedCallbacks, vm); + VMCreatedCallbacks(vm); return vm; } @@ -91,7 +93,7 @@ double VMHL13Model::shareResources(double now) 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()); + ws_vm->getName(), ws_vm->p_hostPM->getName().c_str()); // TODO: check lmm_update_constraint_bound() works fine instead of the below manual substitution. // cpu_cas01->constraint->bound = solved_value; @@ -162,12 +164,9 @@ Action *VMHL13Model::executeParallelTask(int host_nb, * 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, xbt_dict_t props, sg_host_t host_PM) + : VirtualMachine(model, name, props, host_PM) { - Host *sub_ws = surf_host_resource_priv(host_PM); - /* Currently, we assume a VM has no storage. */ p_storage = NULL; @@ -177,11 +176,10 @@ 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); + 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_subWs = sub_ws; p_currentState = SURF_VM_STATE_CREATED; // //// CPU RELATED STUFF //// @@ -195,15 +193,15 @@ VMHL13::VMHL13(VMModel *model, const char* name, xbt_dict_t props, NULL, // host->power_trace, 1, // host->core_amount, SURF_RESOURCE_ON, // host->initial_state, - NULL, // host->state_trace, - NULL); // host->properties, + 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 ? */ // 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)); + XBT_INFO("Create VM(%s)@PM(%s) with %ld mounted disks", name, p_hostPM->getName().c_str(), xbt_dynar_length(p_storage)); } /* @@ -269,15 +267,15 @@ void VMHL13::restore() /* * Update the physical host of the given VM */ -void VMHL13::migrate(surf_resource_t ind_dst_pm) +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)); + Host *surfHost_dst = static_cast(surf_host_resource_priv(host_dest)); const char *vm_name = getName(); - const char *pm_name_src = p_subWs->getName(); - const char *pm_name_dst = ws_dst->getName(); + const char *pm_name_src = p_hostPM->getName().c_str(); + const char *pm_name_dst = surfHost_dst->getName(); - xbt_assert(ws_dst); + xbt_assert(surfHost_dst); /* update net_elm with that of the destination physical host */ RoutingEdge *old_net_elm = p_netElm; @@ -291,13 +289,13 @@ void VMHL13::migrate(surf_resource_t ind_dst_pm) p_netElm = new_net_elm; sg_host_edge_set(sg_host_by_name(vm_name), p_netElm); - p_subWs = ws_dst; + 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(ind_dst_pm))->execute(0)); + static_cast(sg_host_surfcpu(host_dest))->execute(0)); e_surf_action_state_t state = p_action->getState(); if (state != SURF_ACTION_DONE) @@ -335,9 +333,9 @@ void VMHL13::setAffinity(Cpu *cpu, unsigned long mask){ * A surf level object will be useless in the upper layer. Returning the * dict_elm of the host. **/ -surf_resource_t VMHL13::getPm() +sg_host_t VMHL13::getPm() { - return xbt_lib_get_elm_or_null(host_lib, p_subWs->getName()); + return p_hostPM; } /* Adding a task to a VM updates the VCPU task on its physical machine. */ @@ -347,7 +345,7 @@ Action *VMHL13::execute(double size) double new_cost = old_cost + size; XBT_DEBUG("VM(%s)@PM(%s): update dummy action's cost (%f -> %f)", - getName(), p_subWs->getName(), + getName(), p_hostPM->getName().c_str(), old_cost, new_cost); p_action->setCost(new_cost);