X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/54e35ebda7e4ffacd769653b8ebb8ba93c7298bf..ae7bffe6655b934fc4a09ca1a34e10de5d8dd366:/src/surf/vm_hl13.cpp diff --git a/src/surf/vm_hl13.cpp b/src/surf/vm_hl13.cpp index ff60c24e27..fc317ee75d 100644 --- a/src/surf/vm_hl13.cpp +++ b/src/surf/vm_hl13.cpp @@ -1,4 +1,4 @@ -/* 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 @@ -14,8 +14,7 @@ void surf_vm_model_init_HL13(void){ surf_vm_model = new VMHL13Model(); Model *model = surf_vm_model; - xbt_dynar_push(model_list, &model); - xbt_dynar_push(model_list_invoke, &model); + xbt_dynar_push(all_existing_models, &model); } } @@ -23,31 +22,18 @@ void surf_vm_model_init_HL13(void){ * Model * *********/ -VMHL13Model::VMHL13Model() : VMModel() { - p_cpuModel = surf_cpu_model_vm; -} - -void VMHL13Model::updateActionsState(double /*now*/, double /*delta*/){ - return; -} +VMHL13Model::VMHL13Model() : VMModel() {} -Action *VMHL13Model::communicate(Host *src, Host *dst, double size, double rate){ - return surf_network_model->communicate(src->p_netElm, dst->p_netElm, size, rate); -} +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, surf_resource_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); + surf_callback_emit(VMCreatedCallbacks, vm); + return vm; } static inline double get_solved_value(CpuAction *cpu_action) @@ -64,23 +50,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. @@ -111,7 +81,7 @@ 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"); @@ -130,16 +100,15 @@ double VMHL13Model::shareResources(double now) /* 2. Calculate resource share at the virtual machine layer. */ adjustWeightOfDummyCpuActions(); - double min_by_cpu = p_cpuModel->shareResources(now); - double min_by_net = (strcmp(surf_network_model->getName(), "network NS3")) ? surf_network_model->shareResources(now) : -1; + 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; - if (p_cpuModel == surf_cpu_model_pm) - min_by_sto = surf_storage_model->shareResources(now); XBT_DEBUG("model %p, %s min_by_cpu %f, %s min_by_net %f, %s min_by_sto %f", - this, surf_cpu_model_pm->getName(), min_by_cpu, - surf_network_model->getName(), min_by_net, - surf_storage_model->getName(), min_by_sto); + 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 = max(max(min_by_cpu, min_by_net), min_by_sto); if (min_by_cpu >= 0.0 && min_by_cpu < ret) @@ -149,50 +118,21 @@ 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; } Action *VMHL13Model::executeParallelTask(int host_nb, - void **host_list, - double *flops_amount, - double *bytes_amount, - double rate){ + 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 static_cast(host_list[0])->execute(flops_amount[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 communicate(static_cast(host_list[0]), static_cast(host_list[0]),bytes_amount[0], rate); + 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)) { @@ -206,11 +146,11 @@ Action *VMHL13Model::executeParallelTask(int host_nb, } } if (nb == 1) - return communicate(static_cast(host_list[0]), static_cast(host_list[1]),value, rate); + 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 */ + THROW_UNIMPLEMENTED; /* This model does not implement parallel tasks for more than 2 hosts. */ return NULL; } @@ -220,9 +160,9 @@ Action *VMHL13Model::executeParallelTask(int host_nb, VMHL13::VMHL13(VMModel *model, const char* name, xbt_dict_t props, surf_resource_t host_PM) - : VM(model, name, props, NULL, NULL) + : VirtualMachine(model, name, props, NULL, NULL) { - Host *sub_ws = static_cast(surf_host_resource_priv(host_PM)); + Host *sub_ws = surf_host_resource_priv(host_PM); /* Currently, we assume a VM has no storage. */ p_storage = NULL; @@ -269,7 +209,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"); } @@ -351,16 +291,6 @@ void VMHL13::migrate(surf_resource_t ind_dst_pm) /* 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)); @@ -378,7 +308,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; @@ -424,10 +354,3 @@ Action *VMHL13::execute(double size) Action *VMHL13::sleep(double duration) { return p_cpu->sleep(duration); } - -/********** - * Action * - **********/ - -//FIME:: handle action cancel -