X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/097befdbebacea302be3a7442afce30ae1a26937..92882866aab7e49d993fc3965bc1010146fcac35:/src/surf/host_ptask_L07.cpp diff --git a/src/surf/host_ptask_L07.cpp b/src/surf/host_ptask_L07.cpp index 69b9b75480..adc4aba6ea 100644 --- a/src/surf/host_ptask_L07.cpp +++ b/src/surf/host_ptask_L07.cpp @@ -54,10 +54,10 @@ HostL07Model::HostL07Model() : HostModel() { surf_cpu_model_pm = new CpuL07Model(this,p_maxminSystem); routing_model_create(surf_network_model->createLink("__loopback__", - 498000000, NULL, - 0.000015, NULL, - 1/*ON*/, NULL, - SURF_LINK_FATPIPE, NULL)); + 498000000, NULL, + 0.000015, NULL, + 1/*ON*/, NULL, + SURF_LINK_FATPIPE, NULL)); } HostL07Model::~HostL07Model() { @@ -66,26 +66,26 @@ HostL07Model::~HostL07Model() { } CpuL07Model::CpuL07Model(HostL07Model *hmodel,lmm_system_t sys) - : CpuModel() - , p_hostModel(hmodel) - { - p_maxminSystem = sys; - } + : CpuModel() + , p_hostModel(hmodel) + { + p_maxminSystem = sys; + } CpuL07Model::~CpuL07Model() { - surf_cpu_model_pm = NULL; - lmm_system_free(p_maxminSystem); - p_maxminSystem = NULL; + surf_cpu_model_pm = NULL; + lmm_system_free(p_maxminSystem); + p_maxminSystem = NULL; } NetworkL07Model::NetworkL07Model(HostL07Model *hmodel, lmm_system_t sys) - : NetworkModel() - , p_hostModel(hmodel) - { - p_maxminSystem = sys; - } + : NetworkModel() + , p_hostModel(hmodel) + { + p_maxminSystem = sys; + } NetworkL07Model::~NetworkL07Model() { - surf_network_model = NULL; - p_maxminSystem = NULL; // Avoid multi-free + surf_network_model = NULL; + p_maxminSystem = NULL; // Avoid multi-free } @@ -99,8 +99,8 @@ double HostL07Model::shareResources(double /*now*/) bottleneck_solve); for(ActionList::iterator it(running_actions->begin()), itend(running_actions->end()) - ; it != itend ; ++it) { - action = static_cast(&*it); + ; it != itend ; ++it) { + action = static_cast(&*it); if (action->m_latency > 0) { if (min < 0) { min = action->m_latency; @@ -125,9 +125,9 @@ void HostL07Model::updateActionsState(double /*now*/, double delta) { ActionList *actionSet = getRunningActionSet(); for(ActionList::iterator it = actionSet->begin(), itNext = it - ; it != actionSet->end() - ; it = itNext) { - ++itNext; + ; it != actionSet->end() + ; it = itNext) { + ++itNext; action = static_cast(&*it); if (action->m_latency > 0) { if (action->m_latency > delta) { @@ -184,93 +184,88 @@ void HostL07Model::updateActionsState(double /*now*/, double delta) { } Action *HostL07Model::executeParallelTask(int host_nb, sg_host_t *host_list, - double *flops_amount, double *bytes_amount, - double rate) { - return new L07Action(this, host_nb, host_list, flops_amount, bytes_amount, rate); + double *flops_amount, double *bytes_amount, + double rate) { + return new L07Action(this, host_nb, host_list, flops_amount, bytes_amount, rate); } L07Action::L07Action(Model *model, int host_nb, - sg_host_t*host_list, - double *flops_amount, - double *bytes_amount, - double rate) - : CpuAction(model, 1, 0) + sg_host_t*host_list, + double *flops_amount, + double *bytes_amount, + double rate) + : CpuAction(model, 1, 0) { unsigned int cpt; int nb_link = 0; int nb_used_host = 0; /* Only the hosts with something to compute (>0 flops) are counted) */ double latency = 0.0; - xbt_dict_t ptask_parallel_task_link_set = xbt_dict_new_homogeneous(NULL); - this->p_netcardList->reserve(host_nb); for (int i = 0; ip_netcardList->push_back(host_list[i]->pimpl_netcard); + this->p_netcardList->push_back(host_list[i]->pimpl_netcard); /* Compute the number of affected resources... */ if(bytes_amount != NULL) { + xbt_dict_t ptask_parallel_task_link_set = xbt_dict_new_homogeneous(NULL); + 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) { double lat=0.0; - unsigned int cpt; - void *_link; - LinkL07 *link; + xbt_dynar_t route=NULL; - routing_platf->getRouteAndLatency((*this->p_netcardList)[i], (*this->p_netcardList)[j], - &route, &lat); + routing_platf->getRouteAndLatency((*p_netcardList)[i], (*p_netcardList)[j], &route, &lat); latency = MAX(latency, lat); + void *_link; xbt_dynar_foreach(route, cpt, _link) { - link = static_cast(_link); + LinkL07 *link = static_cast(_link); xbt_dict_set(ptask_parallel_task_link_set, link->getName(), link, NULL); } } } } - } - nb_link = xbt_dict_length(ptask_parallel_task_link_set); - xbt_dict_free(&ptask_parallel_task_link_set); + nb_link = xbt_dict_length(ptask_parallel_task_link_set); + xbt_dict_free(&ptask_parallel_task_link_set); + } for (int i = 0; i < host_nb; i++) if (flops_amount[i] > 0) nb_used_host++; - XBT_DEBUG("Creating a parallel task (%p) with %d cpus and %d links.", - this, host_nb, nb_link); + XBT_DEBUG("Creating a parallel task (%p) with %d hosts and %d unique links.", this, host_nb, nb_link); this->p_computationAmount = flops_amount; this->p_communicationAmount = bytes_amount; this->m_latency = latency; this->m_rate = rate; this->p_variable = lmm_variable_new(model->getMaxminSystem(), this, 1.0, - (rate > 0 ? rate : -1.0), - host_nb + nb_link); + (rate > 0 ? rate : -1.0), + host_nb + nb_link); if (this->m_latency > 0) lmm_update_variable_weight(model->getMaxminSystem(), this->getVariable(), 0.0); for (int i = 0; i < host_nb; i++) - lmm_expand(model->getMaxminSystem(), - host_list[i]->pimpl_cpu->getConstraint(), - this->getVariable(), flops_amount[i]); + lmm_expand(model->getMaxminSystem(), host_list[i]->pimpl_cpu->getConstraint(), + this->getVariable(), flops_amount[i]); if(bytes_amount != NULL) { for (int i = 0; i < host_nb; i++) { for (int j = 0; j < host_nb; j++) { - void *_link; xbt_dynar_t route=NULL; if (bytes_amount[i * host_nb + j] == 0.0) continue; - routing_platf->getRouteAndLatency((*this->p_netcardList)[i], (*this->p_netcardList)[j], + routing_platf->getRouteAndLatency((*p_netcardList)[i], (*p_netcardList)[j], &route, NULL); + void *_link; xbt_dynar_foreach(route, cpt, _link) { LinkL07 *link = static_cast(_link); lmm_expand_add(model->getMaxminSystem(), link->getConstraint(), @@ -284,6 +279,7 @@ L07Action::L07Action(Model *model, int host_nb, this->setCost(1.0); this->setRemains(0.0); } + xbt_free(host_list); } Action *NetworkL07Model::communicate(NetCard *src, NetCard *dst, @@ -298,9 +294,7 @@ Action *NetworkL07Model::communicate(NetCard *src, NetCard *dst, host_list[1] = sg_host_by_name(dst->getName()); bytes_amount[1] = size; - res = p_hostModel->executeParallelTask(2, host_list, - flops_amount, - bytes_amount, rate); + res = p_hostModel->executeParallelTask(2, host_list, flops_amount, bytes_amount, rate); return res; } @@ -327,13 +321,13 @@ Link* NetworkL07Model::createLink(const char *name, xbt_dict_t properties) { xbt_assert(!Link::byName(name), - "Link '%s' declared several times in the platform file.", name); + "Link '%s' declared several times in the platform file.", name); Link* link = new LinkL07(this, name, properties, - bw_initial, bw_trace, - lat_initial, lat_trace, - initiallyOn, state_trace, - policy); + bw_initial, bw_trace, + lat_initial, lat_trace, + initiallyOn, state_trace, + policy); Link::onCreation(link); return link; } @@ -343,28 +337,18 @@ void HostL07Model::addTraces() xbt_dict_cursor_t cursor = NULL; char *trace_name, *elm; - if (!trace_connect_list_host_avail) + if (!trace_connect_list_host_speed) return; /* Connect traces relative to cpu */ - xbt_dict_foreach(trace_connect_list_host_avail, cursor, trace_name, elm) { + xbt_dict_foreach(trace_connect_list_host_speed, cursor, trace_name, elm) { tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name); - CpuL07 *host = static_cast(sg_host_by_name(elm)->pimpl_cpu); + Cpu *cpu = sg_host_by_name(elm)->pimpl_cpu; - xbt_assert(host, "Host %s undefined", elm); + xbt_assert(cpu, "Host %s undefined", elm); xbt_assert(trace, "Trace %s undefined", trace_name); - host->p_stateEvent = future_evt_set->add_trace(trace, 0.0, host); - } - - xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) { - tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name); - CpuL07 *host = static_cast(sg_host_by_name(elm)->pimpl_cpu); - - xbt_assert(host, "Host %s undefined", elm); - xbt_assert(trace, "Trace %s undefined", trace_name); - - host->p_speedEvent = future_evt_set->add_trace(trace, 0.0, host); + cpu->set_speed_trace(trace); } /* Connect traces relative to network */ @@ -378,7 +362,7 @@ void HostL07Model::addTraces() link->p_stateEvent = future_evt_set->add_trace(trace, 0.0, link); } - xbt_dict_foreach(trace_connect_list_bandwidth, cursor, trace_name, elm) { + xbt_dict_foreach(trace_connect_list_link_bw, cursor, trace_name, elm) { tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name); LinkL07 *link = static_cast(Link::byName(elm)); @@ -388,7 +372,7 @@ void HostL07Model::addTraces() link->p_bwEvent = future_evt_set->add_trace(trace, 0.0, link); } - xbt_dict_foreach(trace_connect_list_latency, cursor, trace_name, elm) { + xbt_dict_foreach(trace_connect_list_link_lat, cursor, trace_name, elm) { tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name); LinkL07 *link = static_cast(Link::byName(elm)); @@ -404,11 +388,11 @@ void HostL07Model::addTraces() ************/ CpuL07::CpuL07(CpuL07Model *model, simgrid::s4u::Host *host, - xbt_dynar_t speedPeakList, int pstate, - double speedScale, tmgr_trace_t speedTrace, - int core, int initiallyOn, tmgr_trace_t state_trace) + xbt_dynar_t speedPeakList, int pstate, + double speedScale, tmgr_trace_t speedTrace, + int core, int initiallyOn, tmgr_trace_t state_trace) : Cpu(model, host, speedPeakList, pstate, - core, xbt_dynar_get_as(speedPeakList,pstate,double), speedScale, initiallyOn) + core, xbt_dynar_get_as(speedPeakList,pstate,double), speedScale, initiallyOn) { p_constraint = lmm_constraint_new(model->getMaxminSystem(), this, xbt_dynar_get_as(speedPeakList,pstate,double) * speedScale); @@ -424,13 +408,13 @@ CpuL07::~CpuL07() } LinkL07::LinkL07(NetworkL07Model *model, const char* name, xbt_dict_t props, - double bw_initial, - tmgr_trace_t bw_trace, - double lat_initial, - tmgr_trace_t lat_trace, - int initiallyOn, - tmgr_trace_t state_trace, - e_surf_link_sharing_policy_t policy) + double bw_initial, + tmgr_trace_t bw_trace, + double lat_initial, + tmgr_trace_t lat_trace, + int initiallyOn, + tmgr_trace_t state_trace, + e_surf_link_sharing_policy_t policy) : Link(model, name, props, lmm_constraint_new(model->getMaxminSystem(), this, bw_initial), future_evt_set, state_trace) { m_bwCurrent = bw_initial; @@ -447,35 +431,28 @@ LinkL07::LinkL07(NetworkL07Model *model, const char* name, xbt_dict_t props, p_latEvent = future_evt_set->add_trace(lat_trace, 0.0, this); if (policy == SURF_LINK_FATPIPE) - lmm_constraint_shared(getConstraint()); + lmm_constraint_shared(getConstraint()); } -Action *CpuL07::execute(double size) +Action *CpuL07::execution_start(double size) { 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] = getHost(); flops_amount[0] = size; - return static_cast(getModel()) - ->p_hostModel - ->executeParallelTask( 1, host_list, flops_amount, bytes_amount, -1); + return static_cast(getModel())->p_hostModel + ->executeParallelTask( 1, host_list, flops_amount, NULL, -1); } Action *CpuL07::sleep(double duration) { - L07Action *action = NULL; - - XBT_IN("(%s,%g)", getName(), duration); - - action = static_cast(execute(1.0)); + L07Action *action = static_cast(execution_start(1.0)); action->m_maxDuration = duration; action->m_suspended = 2; lmm_update_variable_weight(getModel()->getMaxminSystem(), action->getVariable(), 0.0); - XBT_OUT(); return action; } @@ -485,8 +462,8 @@ bool CpuL07::isUsed(){ /** @brief take into account changes of speed (either load or max) */ void CpuL07::onSpeedChange() { - lmm_variable_t var = NULL; - lmm_element_t elem = NULL; + lmm_variable_t var = NULL; + lmm_element_t elem = NULL; lmm_update_constraint_bound(getModel()->getMaxminSystem(), getConstraint(), m_speedPeak * m_speedScale); while ((var = lmm_get_var_from_cnst @@ -498,7 +475,7 @@ void CpuL07::onSpeedChange() { m_speedScale * m_speedPeak); } - Cpu::onSpeedChange(); + Cpu::onSpeedChange(); } @@ -571,8 +548,8 @@ void LinkL07::updateLatency(double value, double date) **********/ L07Action::~L07Action(){ - if (p_communicationAmount != NULL) - free(p_communicationAmount); + delete p_netcardList; + free(p_communicationAmount); free(p_computationAmount); } @@ -615,7 +592,7 @@ int L07Action::unref() m_refcount--; if (!m_refcount) { if (action_hook.is_linked()) - p_stateSet->erase(p_stateSet->iterator_to(*this)); + p_stateSet->erase(p_stateSet->iterator_to(*this)); if (getVariable()) lmm_variable_free(getModel()->getMaxminSystem(), getVariable()); delete this; @@ -624,46 +601,5 @@ int L07Action::unref() return 0; } -void L07Action::suspend() -{ - XBT_IN("(%p))", this); - if (m_suspended != 2) { - m_suspended = 1; - lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), 0.0); - } - XBT_OUT(); -} - -void L07Action::resume() -{ - XBT_IN("(%p)", this); - if (m_suspended != 2) { - lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), 1.0); - m_suspended = 0; - } - XBT_OUT(); -} - -void L07Action::setMaxDuration(double duration) -{ /* FIXME: should inherit */ - XBT_IN("(%p,%g)", this, duration); - m_maxDuration = duration; - XBT_OUT(); -} - -void L07Action::setPriority(double priority) -{ /* FIXME: should inherit */ - XBT_IN("(%p,%g)", this, priority); - m_priority = priority; - XBT_OUT(); -} - -double L07Action::getRemains() -{ - XBT_IN("(%p)", this); - XBT_OUT(); - return m_remains; -} - } }