X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/649ff8bac9ec72bc9321a7b21843cd41f7b7e7bc..cdee945b9c5436eaada21ee7b942f63d7a67df49:/src/surf/vm_hl13.cpp diff --git a/src/surf/vm_hl13.cpp b/src/surf/vm_hl13.cpp index 4afa59eccb..3553f5d770 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 @@ -27,23 +27,11 @@ VMHL13Model::VMHL13Model() : VMModel() {} void VMHL13Model::updateActionsState(double /*now*/, double /*delta*/) {} -Action *VMHL13Model::communicate(Host *src, Host *dst, double size, double rate){ - return surf_network_model->communicate(src->p_netElm, dst->p_netElm, size, rate); -} - /* 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) -{ - 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 *VMHL13Model::createVM(const char *name, surf_resource_t host_PM) { + return new VMHL13(this, name, NULL, host_PM); } static inline double get_solved_value(CpuAction *cpu_action) @@ -60,16 +48,16 @@ const double virt_overhead = 1; double VMHL13Model::shareResources(double now) { - /* TODO: udpate action's cost with the total cost of processes on the VM. */ + /* TODO: update 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_ATTRIB_UNUSED Model *ws_model = surf_host_model; + XBT_ATTRIB_UNUSED Model *vm_ws_model = surf_vm_model; + XBT_ATTRIB_UNUSED unsigned int index_of_pm_ws_model = xbt_dynar_search(model_list_invoke, &ws_model); + XBT_ATTRIB_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 @@ -107,7 +95,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"); @@ -127,7 +115,7 @@ double VMHL13Model::shareResources(double now) adjustWeightOfDummyCpuActions(); double min_by_cpu = surf_cpu_model_vm->shareResources(now); - double min_by_net = (strcmp(surf_network_model->getName(), "network NS3")) ? surf_network_model->shareResources(now) : -1; + 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; @@ -177,17 +165,17 @@ double VMHL13Model::shareResources(double now) } 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)) { @@ -201,11 +189,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; } @@ -215,7 +203,7 @@ 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)); @@ -249,12 +237,15 @@ VMHL13::VMHL13(VMModel *model, const char* name, xbt_dict_t props, NULL, // host->state_trace, NULL); // host->properties, + p_cpu->setVirtual(sub_cpu); + /* 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)); + } /* @@ -264,7 +255,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"); } @@ -346,16 +337,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)); @@ -373,7 +354,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;