X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/242fde5e8077f8193db4df5f262a9672085c8d8a..3485c6e6a8dd0c46b18838dc42b150f8093d54a8:/src/surf/vm_hl13.cpp diff --git a/src/surf/vm_hl13.cpp b/src/surf/vm_hl13.cpp index 918df46b23..19d008dc94 100644 --- a/src/surf/vm_hl13.cpp +++ b/src/surf/vm_hl13.cpp @@ -1,9 +1,13 @@ -/* Copyright (c) 2013-2014. The SimGrid Team. +/* Copyright (c) 2013-2015. The SimGrid Team. * All rights reserved. */ /* 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" @@ -11,14 +15,15 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_vm); void surf_vm_model_init_HL13(void){ if (surf_cpu_model_vm) { - surf_vm_model = new VMHL13Model(); - Model *model = surf_vm_model; - - xbt_dynar_push(model_list, &model); - xbt_dynar_push(model_list_invoke, &model); + surf_vm_model = new simgrid::surf::VMHL13Model(); + simgrid::surf::Model *model = surf_vm_model; + xbt_dynar_push(all_existing_models, &model); } } +namespace simgrid { +namespace surf { + /********* * Model * *********/ @@ -30,16 +35,11 @@ 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) */ -VM *VMHL13Model::createVM(const char *name, surf_resource_t host_PM) +VirtualMachine *VMHL13Model::createVM(const char *name, sg_host_t host_PM) { - VMHL13 *ws = new VMHL13(this, name, NULL, host_PM); - - xbt_lib_set(host_lib, name, SURF_HOST_LEVEL, ws); - - /* TODO: - * - check how network requests are scheduled between distinct processes competing for the same card. - */ - return ws; + VirtualMachine* vm = new VMHL13(this, name, NULL, host_PM); + VMCreatedCallbacks(vm); + return vm; } static inline double get_solved_value(CpuAction *cpu_action) @@ -56,23 +56,7 @@ const double virt_overhead = 1; double VMHL13Model::shareResources(double now) { - /* TODO: udpate action's cost with the total cost of processes on the VM. */ - - - /* 0. Make sure that we already calculated the resource share at the physical - * machine layer. */ - { - _XBT_GNUC_UNUSED Model *ws_model = surf_host_model; - _XBT_GNUC_UNUSED Model *vm_ws_model = surf_vm_model; - _XBT_GNUC_UNUSED unsigned int index_of_pm_ws_model = xbt_dynar_search(model_list_invoke, &ws_model); - _XBT_GNUC_UNUSED 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_host_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 - * ensure that. */ - } - + /* 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. @@ -103,13 +87,13 @@ double VMHL13Model::shareResources(double now) VMModel::ws_vms.begin(); iter != VMModel::ws_vms.end(); ++iter) { - VM *ws_vm = &*iter; + VirtualMachine *ws_vm = &*iter; 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()); + 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; @@ -132,7 +116,7 @@ double VMHL13Model::shareResources(double now) typeid(surf_network_model).name(), min_by_net, typeid(surf_storage_model).name(), min_by_sto); - double ret = max(max(min_by_cpu, min_by_net), 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) @@ -140,35 +124,6 @@ double VMHL13Model::shareResources(double now) if (min_by_sto >= 0.0 && min_by_sto < ret) ret = min_by_sto; - /* FIXME: 3. do we have to re-initialize our cpu_action object? */ -#if 0 - /* iterate for all virtual machines */ - for (VMModel::vm_list_t::iterator iter = - VMModel::ws_vms.begin(); - iter != VMModel::ws_vms.end(); ++iter) { - - { -#if 0 - VM2013 *ws_vm2013 = static_cast(&*iter); - XBT_INFO("cost %f remains %f start %f finish %f", ws_vm2013->cpu_action->cost, - ws_vm2013->cpu_action->remains, - ws_vm2013->cpu_action->start, - ws_vm2013->cpu_action->finish - ); -#endif -#if 0 - void *ind_sub_host = xbt_lib_get_elm_or_null(host_lib, ws_vm2013->sub_ws->generic_resource.getName); - surf_cpu_model_pm->action_unref(ws_vm2013->cpu_action); - /* FIXME: this means busy loop? */ - // ws_vm2013->cpu_action = surf_cpu_model_pm->extension.cpu.execute(ind_sub_host, GUESTOS_NOISE); - ws_vm2013->cpu_action = surf_cpu_model_pm->extension.cpu.execute(ind_sub_host, 0); -#endif - - } - } -#endif - - return ret; } @@ -209,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) - : VM(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 = static_cast(surf_host_resource_priv(host_PM)); - /* Currently, we assume a VM has no storage. */ p_storage = NULL; @@ -224,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 //// @@ -236,21 +187,21 @@ VMHL13::VMHL13(VMModel *model, const char* name, xbt_dict_t props, CpuCas01 *sub_cpu = static_cast(sg_host_surfcpu(host_PM)); p_cpu = surf_cpu_model_vm->createCpu(name, // name - sub_cpu->getPowerPeakList(), // host->power_peak, + 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, + 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)); } /* @@ -260,7 +211,7 @@ VMHL13::VMHL13(VMModel *model, const char* name, xbt_dict_t props, VMHL13::~VMHL13() { /* Free the cpu_action of the VM. */ - _XBT_GNUC_UNUSED int ret = p_action->unref(); + XBT_ATTRIB_UNUSED int ret = p_action->unref(); xbt_assert(ret == 1, "Bug: some resource still remains"); } @@ -316,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; @@ -338,23 +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 */ { -#if 0 - XBT_INFO("cpu_action->remains %g", p_action->remains); - XBT_INFO("cost %f remains %f start %f finish %f", p_action->cost, - p_action->remains, - p_action->start, - p_action->finish - ); - XBT_INFO("cpu_action state %d", surf_action_get_state(p_action)); -#endif - /* 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) @@ -369,7 +310,7 @@ void VMHL13::migrate(surf_resource_t ind_dst_pm) new_cpu_action->setBound(old_bound); } - _XBT_GNUC_UNUSED int ret = p_action->unref(); + XBT_ATTRIB_UNUSED int ret = p_action->unref(); xbt_assert(ret == 1, "Bug: some resource still remains"); p_action = new_cpu_action; @@ -388,15 +329,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. - **/ -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) { @@ -404,7 +336,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); @@ -416,9 +348,5 @@ Action *VMHL13::sleep(double duration) { return p_cpu->sleep(duration); } -/********** - * Action * - **********/ - -//FIME:: handle action cancel - +} +}