X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7e4383fd3186c92b1d7151a79c78fa4c4f181f7e..a34d8237b8267686bbd259670f27da273ff5236e:/src/surf/host_ptask_L07.cpp diff --git a/src/surf/host_ptask_L07.cpp b/src/surf/host_ptask_L07.cpp index 014db7b6a0..39a6de1c6e 100644 --- a/src/surf/host_ptask_L07.cpp +++ b/src/surf/host_ptask_L07.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2010, 2013-2014. The SimGrid Team. +/* Copyright (c) 2007-2010, 2013-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -8,6 +8,7 @@ #include "cpu_interface.hpp" #include "surf_routing.hpp" +#include "xbt/lib.h" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host); @@ -45,7 +46,7 @@ void surf_host_model_init_ptask_L07(void) } -HostL07Model::HostL07Model() : HostModel("Host ptask_L07") { +HostL07Model::HostL07Model() : HostModel() { if (!ptask_maxmin_system) ptask_maxmin_system = lmm_system_new(1); surf_host_model = NULL; @@ -57,7 +58,6 @@ HostL07Model::HostL07Model() : HostModel("Host ptask_L07") { 0.000015, NULL, SURF_RESOURCE_ON, NULL, SURF_LINK_FATPIPE, NULL)); - p_cpuModel = surf_cpu_model_pm; } HostL07Model::~HostL07Model() { @@ -168,26 +168,29 @@ void HostL07Model::updateActionsState(double /*now*/, double delta) { } Action *HostL07Model::executeParallelTask(int host_nb, - void **host_list, + sg_host_t*host_list, double *flops_amount, double *bytes_amount, double rate) { - L07Action *action; - int i, j; + L07Action *action = new L07Action(this, 1, 0); unsigned int cpt; int nb_link = 0; int nb_host = 0; double latency = 0.0; + action->p_edgeList->reserve(host_nb); + for (int i = 0; ip_edgeList->push_back(sg_host_edge(host_list[i])); + if (ptask_parallel_task_link_set == NULL) ptask_parallel_task_link_set = xbt_dict_new_homogeneous(NULL); xbt_dict_reset(ptask_parallel_task_link_set); /* Compute the number of affected resources... */ - for (i = 0; i < host_nb; i++) { - for (j = 0; j < host_nb; j++) { + for (int i = 0; i < host_nb; i++) { + for (int j = 0; j < host_nb; j++) { xbt_dynar_t route=NULL; if (bytes_amount[i * host_nb + j] > 0) { @@ -196,10 +199,8 @@ Action *HostL07Model::executeParallelTask(int host_nb, void *_link; LinkL07 *link; - routing_platf->getRouteAndLatency(static_cast(host_list[i])->p_netElm, - static_cast(host_list[j])->p_netElm, - &route, - &lat); + routing_platf->getRouteAndLatency((*action->p_edgeList)[i], (*action->p_edgeList)[j], + &route, &lat); latency = MAX(latency, lat); xbt_dynar_foreach(route, cpt, _link) { @@ -213,49 +214,43 @@ Action *HostL07Model::executeParallelTask(int host_nb, nb_link = xbt_dict_length(ptask_parallel_task_link_set); xbt_dict_reset(ptask_parallel_task_link_set); - for (i = 0; i < host_nb; i++) + for (int i = 0; i < host_nb; i++) if (flops_amount[i] > 0) nb_host++; - action = new L07Action(this, 1, 0); XBT_DEBUG("Creating a parallel task (%p) with %d cpus and %d links.", action, host_nb, nb_link); - action->m_suspended = 0; /* Should be useless because of the - calloc but it seems to help valgrind... */ - action->m_hostNb = host_nb; - action->p_hostList = (Host **) host_list; + action->m_suspended = 0; /* valgrind seems to want it despite the calloc... */ action->p_computationAmount = flops_amount; action->p_communicationAmount = bytes_amount; action->m_latency = latency; action->m_rate = rate; action->p_variable = lmm_variable_new(ptask_maxmin_system, action, 1.0, - (action->m_rate > 0) ? action->m_rate : -1.0, - host_nb + nb_link); + (rate > 0 ? rate : -1.0), + host_nb + nb_link); if (action->m_latency > 0) lmm_update_variable_weight(ptask_maxmin_system, action->getVariable(), 0.0); - for (i = 0; i < host_nb; i++) + for (int i = 0; i < host_nb; i++) lmm_expand(ptask_maxmin_system, - static_cast(host_list[i])->p_cpu->getConstraint(), + sg_host_surfcpu(host_list[i])->getConstraint(), action->getVariable(), flops_amount[i]); - for (i = 0; i < host_nb; i++) { - for (j = 0; j < host_nb; j++) { + for (int i = 0; i < host_nb; i++) { + for (int j = 0; j < host_nb; j++) { void *_link; - LinkL07 *link; xbt_dynar_t route=NULL; if (bytes_amount[i * host_nb + j] == 0.0) continue; - routing_platf->getRouteAndLatency(static_cast(host_list[i])->p_netElm, - static_cast(host_list[j])->p_netElm, + routing_platf->getRouteAndLatency((*action->p_edgeList)[i], (*action->p_edgeList)[j], &route, NULL); xbt_dynar_foreach(route, cpt, _link) { - link = static_cast(_link); + LinkL07 *link = static_cast(_link); lmm_expand_add(ptask_maxmin_system, link->getConstraint(), action->getVariable(), bytes_amount[i * host_nb + j]); @@ -289,19 +284,19 @@ Host *HostL07Model::createHost(const char *name) return wk; } -Action *HostL07Model::communicate(Host *src, Host *dst, +Action *NetworkL07Model::communicate(RoutingEdge *src, RoutingEdge *dst, double size, double rate) { - void **host_list = xbt_new0(void *, 2); + sg_host_t*host_list = xbt_new0(sg_host_t, 2); double *flops_amount = xbt_new0(double, 2); double *bytes_amount = xbt_new0(double, 4); Action *res = NULL; - host_list[0] = src; - host_list[1] = dst; + host_list[0] = sg_host_by_name(src->getName()); + host_list[1] = sg_host_by_name(dst->getName()); bytes_amount[1] = size; - res = executeParallelTask(2, host_list, + res = p_hostModel->executeParallelTask(2, host_list, flops_amount, bytes_amount, rate); @@ -555,12 +550,11 @@ e_surf_resource_state_t HostL07::getState() { Action *HostL07::execute(double size) { - void **host_list = xbt_new0(void *, 1); + sg_host_t*host_list = xbt_new0(sg_host_t, 1); double *flops_amount = xbt_new0(double, 1); double *bytes_amount = xbt_new0(double, 1); - host_list[0] = this; - bytes_amount[0] = 0.0; + host_list[0] = sg_host_by_name(getName()); flops_amount[0] = size; return static_cast(getModel())->executeParallelTask(1, host_list, @@ -623,7 +617,6 @@ bool LinkL07::isShared() **********/ L07Action::~L07Action(){ - free(p_hostList); free(p_communicationAmount); free(p_computationAmount); } @@ -634,17 +627,18 @@ void L07Action::updateBound() double lat_bound = -1.0; int i, j; - for (i = 0; i < m_hostNb; i++) { - for (j = 0; j < m_hostNb; j++) { + int hostNb = p_edgeList->size(); + + for (i = 0; i < hostNb; i++) { + for (j = 0; j < hostNb; j++) { xbt_dynar_t route=NULL; - if (p_communicationAmount[i * m_hostNb + j] > 0) { + if (p_communicationAmount[i * hostNb + j] > 0) { double lat = 0.0; - routing_platf->getRouteAndLatency(static_cast(((void**)p_hostList)[i])->p_netElm, - static_cast(((void**)p_hostList)[j])->p_netElm, + routing_platf->getRouteAndLatency((*p_edgeList)[i], (*p_edgeList)[j], &route, &lat); - lat_current = MAX(lat_current, lat * p_communicationAmount[i * m_hostNb + j]); + lat_current = MAX(lat_current, lat * p_communicationAmount[i * hostNb + j]); } } } @@ -662,7 +656,7 @@ int L07Action::unref() { m_refcount--; if (!m_refcount) { - if (actionHook::is_linked()) + if (action_hook.is_linked()) p_stateSet->erase(p_stateSet->iterator_to(*this)); if (getVariable()) lmm_variable_free(ptask_maxmin_system, getVariable());