X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/413534bc9aac9b6a61840de0a20f933534552fd7..c63217359371b823ac279159633e66bc0ea8bb6f:/src/surf/vm_workstation_hl13.cpp diff --git a/src/surf/vm_workstation_hl13.cpp b/src/surf/vm_workstation_hl13.cpp index 763be607d6..a0a68679d5 100644 --- a/src/surf/vm_workstation_hl13.cpp +++ b/src/surf/vm_workstation_hl13.cpp @@ -12,7 +12,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_vm_workstation); void surf_vm_workstation_model_init_HL13(void){ if (surf_cpu_model_vm) { surf_vm_workstation_model = new WorkstationVMHL13Model(); - ModelPtr model = static_cast(surf_vm_workstation_model); + ModelPtr model = surf_vm_workstation_model; xbt_dynar_push(model_list, &model); xbt_dynar_push(model_list_invoke, &model); @@ -42,7 +42,7 @@ WorkstationVMPtr WorkstationVMHL13Model::createWorkstationVM(const char *name, s { WorkstationVMHL13Ptr ws = new WorkstationVMHL13(this, name, NULL, ind_phys_workstation); - xbt_lib_set(host_lib, name, SURF_WKS_LEVEL, static_cast(ws)); + xbt_lib_set(host_lib, name, SURF_WKS_LEVEL, ws); /* TODO: * - check how network requests are scheduled between distinct processes competing for the same card. @@ -70,11 +70,9 @@ double WorkstationVMHL13Model::shareResources(double now) /* 0. Make sure that we already calculated the resource share at the physical * machine layer. */ { - ModelPtr ws_model = static_cast(surf_workstation_model); - ModelPtr vm_ws_model = static_cast(surf_vm_workstation_model); - unsigned int index_of_pm_ws_model = xbt_dynar_search(model_list_invoke, &ws_model); - unsigned int index_of_vm_ws_model = xbt_dynar_search(model_list_invoke, &vm_ws_model); - xbt_assert((index_of_pm_ws_model < index_of_vm_ws_model), "Cannot assume surf_workstation_model comes before"); + xbt_assert((xbt_dynar_search(model_list_invoke, &surf_workstation_model)< + xbt_dynar_search(model_list_invoke, &surf_vm_workstation_model)), + "Cannot assume surf_workstation_model comes before"); /* Another option is that we call sub_ws->share_resource() here. The * share_resource() function has no side-effect. We can call it here to @@ -112,16 +110,16 @@ double WorkstationVMHL13Model::shareResources(double now) iter != WorkstationVMModel::ws_vms.end(); ++iter) { WorkstationVMPtr ws_vm = &*iter; - CpuPtr cpu = static_cast(ws_vm->p_cpu); + CpuPtr cpu = ws_vm->p_cpu; xbt_assert(cpu, "cpu-less workstation"); - double solved_value = get_solved_value(static_cast(ws_vm->p_action)); + 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()); // TODO: check lmm_update_constraint_bound() works fine instead of the below manual substitution. // cpu_cas01->constraint->bound = solved_value; - xbt_assert(cpu->getModel() == static_cast(surf_cpu_model_vm)); + xbt_assert(cpu->getModel() == surf_cpu_model_vm); lmm_system_t vcpu_system = cpu->getModel()->getMaxminSystem(); lmm_update_constraint_bound(vcpu_system, cpu->getConstraint(), virt_overhead * solved_value); } @@ -228,12 +226,12 @@ WorkstationVMHL13::WorkstationVMHL13(WorkstationVMModelPtr model, const char* na p_storage = NULL; /* Currently, a VM uses the network resource of its physical host. In - * host_lib, this network resource object is refered from two different keys. + * host_lib, this network resource object is referred from two different keys. * When deregistering the reference that points the network resource object * 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 = static_cast(xbt_lib_get_or_null(host_lib, sub_ws->getName(), ROUTING_HOST_LEVEL)); + p_netElm = new RoutingEdgeWrapper(static_cast(xbt_lib_get_or_null(host_lib, sub_ws->getName(), ROUTING_HOST_LEVEL))); xbt_lib_set(host_lib, name, ROUTING_HOST_LEVEL, p_netElm); p_subWs = sub_ws; @@ -246,7 +244,7 @@ WorkstationVMHL13::WorkstationVMHL13(WorkstationVMModelPtr model, const char* na /* We can assume one core and cas01 cpu for the first step. * Do xbt_lib_set(host_lib, name, SURF_CPU_LEVEL, cpu) if you get the resource. */ - p_cpu = static_cast(surf_cpu_model_vm)->createCpu(name, // name + p_cpu = surf_cpu_model_vm->createCpu(name, // name sub_cpu->getPowerPeakList(), // host->power_peak, sub_cpu->getPState(), 1, // host->power_scale, @@ -259,7 +257,7 @@ WorkstationVMHL13::WorkstationVMHL13(WorkstationVMModelPtr model, const char* na /* We create cpu_action corresponding to a VM process on the host operating system. */ /* FIXME: TODO: we have to peridocally input GUESTOS_NOISE to the system? how ? */ // vm_ws->cpu_action = surf_cpu_model_pm->extension.cpu.execute(ind_phys_workstation, GUESTOS_NOISE); - p_action = static_cast(sub_cpu->execute(0)); + p_action = sub_cpu->execute(0); /* The SURF_WKS_LEVEL at host_lib saves workstation_CLM03 objects. Please * note workstation_VM2013 objects, inheriting the workstation_CLM03 @@ -272,45 +270,13 @@ WorkstationVMHL13::WorkstationVMHL13(WorkstationVMModelPtr model, const char* na } /* - * A physical host does not disapper in the current SimGrid code, but a VM may - * disapper during a simulation. + * A physical host does not disappear in the current SimGrid code, but a VM may + * disappear during a simulation. */ WorkstationVMHL13::~WorkstationVMHL13() { - /* ind_phys_workstation equals to smx_host_t */ - surf_resource_t ind_vm_workstation = xbt_lib_get_elm_or_null(host_lib, getName()); - - /* Before clearing the entries in host_lib, we have to pick up resources. */ - CpuCas01Ptr cpu = static_cast(surf_cpu_resource_priv(ind_vm_workstation)); - - /* We deregister objects from host_lib, without invoking the freeing callback - * of each level. - * - * Do not call xbt_lib_remove() here. It deletes all levels of the key, - * including MSG_HOST_LEVEL and others. We should unregister only what we know. - */ - xbt_lib_unset(host_lib, getName(), SURF_CPU_LEVEL, 0); - xbt_lib_unset(host_lib, getName(), ROUTING_HOST_LEVEL, 0); - xbt_lib_unset(host_lib, getName(), SURF_WKS_LEVEL, 0); - - /* TODO: comment out when VM stroage is implemented. */ - // xbt_lib_unset(host_lib, name, SURF_STORAGE_LEVEL, 0); - - /* Free the cpu_action of the VM. */ - int ret = p_action->unref(); - xbt_assert(ret == 1, "Bug: some resource still remains"); - - /* Free the cpu resource of the VM. If using power_trace, we will have to */ - delete cpu; - - /* Free the network resource of the VM. */ - // Nothing has to be done, because net_elmts is just a pointer on the physical one - - /* Free the storage resource of the VM. */ - // Not relevant yet - - /* Free the workstation resource of the VM. */ + xbt_assert(p_action->unref() == 1, "Bug: some resource still remains"); } void WorkstationVMHL13::updateState(tmgr_trace_event_t /*event_type*/, double /*value*/, double /*date*/) { @@ -379,7 +345,7 @@ void WorkstationVMHL13::migrate(surf_resource_t ind_dst_pm) /* update net_elm with that of the destination physical host */ RoutingEdgePtr old_net_elm = p_netElm; - RoutingEdgePtr new_net_elm = static_cast(xbt_lib_get_or_null(host_lib, pm_name_dst, ROUTING_HOST_LEVEL)); + RoutingEdgePtr new_net_elm = new RoutingEdgeWrapper(static_cast(xbt_lib_get_or_null(host_lib, pm_name_dst, ROUTING_HOST_LEVEL))); xbt_assert(new_net_elm); /* Unregister the current net_elm from host_lib. Do not call the free callback. */ @@ -420,14 +386,14 @@ void WorkstationVMHL13::migrate(surf_resource_t ind_dst_pm) new_cpu_action->setBound(old_bound); } - int ret = p_action->unref(); - xbt_assert(ret == 1, "Bug: some resource still remains"); + xbt_assert( p_action->unref() == 1, "Bug: some resource still remains"); 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 WorkstationVMHL13::setBound(double bound){ @@ -439,7 +405,7 @@ void WorkstationVMHL13::setAffinity(CpuPtr cpu, unsigned long mask){ } /* - * A surf level object will be useless in the upper layer. Returing the + * A surf level object will be useless in the upper layer. Returning the * dict_elm of the host. **/ surf_resource_t WorkstationVMHL13::getPm()