X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/558cfc9fc06c8d1a7206b5995d3736cc11319529..e13ce5b2e888ecb8a373501a4332860f71a1e97c:/src/surf/ptask_L07.cpp diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp index b94e7ce4d0..bea3d7c1f0 100644 --- a/src/surf/ptask_L07.cpp +++ b/src/surf/ptask_L07.cpp @@ -1,18 +1,13 @@ -/* Copyright (c) 2007-2010, 2013-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2007-2018. 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 "ptask_L07.hpp" +#include "surf/surf.hpp" +#include "xbt/config.hpp" -#include "cpu_interface.hpp" -#include "surf_routing.hpp" -#include "xbt/lib.h" +#include XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host); XBT_LOG_EXTERNAL_CATEGORY(xbt_cfg); @@ -20,17 +15,14 @@ XBT_LOG_EXTERNAL_CATEGORY(xbt_cfg); /**************************************/ /*** Resource Creation & Destruction **/ /**************************************/ -void surf_host_model_init_ptask_L07(void) +void surf_host_model_init_ptask_L07() { XBT_CINFO(xbt_cfg,"Switching to the L07 model to handle parallel tasks."); - xbt_assert(!surf_cpu_model_pm, "CPU model type already defined"); - xbt_assert(!surf_network_model, "network model type already defined"); - - // Define the callbacks to parse the XML - simgrid::surf::on_link.connect(netlink_parse_init); + xbt_assert(not surf_cpu_model_pm, "CPU model type already defined"); + xbt_assert(not surf_network_model, "network model type already defined"); surf_host_model = new simgrid::surf::HostL07Model(); - xbt_dynar_push(all_existing_models, &surf_host_model); + all_existing_models->push_back(surf_host_model); } @@ -38,101 +30,81 @@ namespace simgrid { namespace surf { HostL07Model::HostL07Model() : HostModel() { - maxminSystem_ = lmm_system_new(1); - surf_network_model = new NetworkL07Model(this,maxminSystem_); - surf_cpu_model_pm = new CpuL07Model(this,maxminSystem_); - - routing_model_create(surf_network_model->createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE, NULL)); + auto* maxmin_system = new simgrid::kernel::lmm::FairBottleneck(true /* selective update */); + set_maxmin_system(maxmin_system); + surf_network_model = new NetworkL07Model(this, maxmin_system); + surf_cpu_model_pm = new CpuL07Model(this, maxmin_system); } -HostL07Model::~HostL07Model() { - delete surf_cpu_model_pm; +HostL07Model::~HostL07Model() +{ delete surf_network_model; + delete surf_cpu_model_pm; } -CpuL07Model::CpuL07Model(HostL07Model *hmodel,lmm_system_t sys) - : CpuModel() - , p_hostModel(hmodel) - { - maxminSystem_ = sys; - } -CpuL07Model::~CpuL07Model() { - surf_cpu_model_pm = NULL; - lmm_system_free(maxminSystem_); - maxminSystem_ = NULL; +CpuL07Model::CpuL07Model(HostL07Model* hmodel, kernel::lmm::System* sys) + : CpuModel(Model::UpdateAlgo::FULL), hostModel_(hmodel) +{ + set_maxmin_system(sys); } -NetworkL07Model::NetworkL07Model(HostL07Model *hmodel, lmm_system_t sys) - : NetworkModel() - , p_hostModel(hmodel) - { - maxminSystem_ = sys; - } -NetworkL07Model::~NetworkL07Model() + +CpuL07Model::~CpuL07Model() { - surf_network_model = NULL; - maxminSystem_ = NULL; // Avoid multi-free + set_maxmin_system(nullptr); } +NetworkL07Model::NetworkL07Model(HostL07Model* hmodel, kernel::lmm::System* sys) + : NetworkModel(Model::UpdateAlgo::FULL), hostModel_(hmodel) +{ + set_maxmin_system(sys); + loopback_ = NetworkL07Model::createLink("__loopback__", 498000000, 0.000015, s4u::Link::SharingPolicy::FATPIPE); +} -double HostL07Model::next_occuring_event(double /*now*/) +NetworkL07Model::~NetworkL07Model() { - L07Action *action; + set_maxmin_system(nullptr); +} - ActionList *running_actions = getRunningActionSet(); - double min = this->shareResourcesMaxMin(running_actions, - maxminSystem_, - bottleneck_solve); - - for(ActionList::iterator it(running_actions->begin()), itend(running_actions->end()) - ; it != itend ; ++it) { - action = static_cast(&*it); - if (action->m_latency > 0) { - if (min < 0) { - min = action->m_latency; - XBT_DEBUG("Updating min (value) with %p (start %f): %f", action, - action->getStartTime(), min); - } else if (action->m_latency < min) { - min = action->m_latency; - XBT_DEBUG("Updating min (latency) with %p (start %f): %f", action, - action->getStartTime(), min); - } +double HostL07Model::next_occuring_event(double now) +{ + double min = HostModel::next_occuring_event_full(now); + for (kernel::resource::Action const& action : *get_started_action_set()) { + const L07Action& net_action = static_cast(action); + if (net_action.latency_ > 0 && (min < 0 || net_action.latency_ < min)) { + min = net_action.latency_; + XBT_DEBUG("Updating min with %p (start %f): %f", &net_action, net_action.get_start_time(), min); } } - - XBT_DEBUG("min value : %f", min); + XBT_DEBUG("min value: %f", min); return min; } -void HostL07Model::updateActionsState(double /*now*/, double delta) { - - L07Action *action; - ActionList *actionSet = getRunningActionSet(); - - for(ActionList::iterator it = actionSet->begin(), itNext = it - ; it != actionSet->end() - ; it = itNext) { - ++itNext; - action = static_cast(&*it); - if (action->m_latency > 0) { - if (action->m_latency > delta) { - double_update(&(action->m_latency), delta, sg_surf_precision); +void HostL07Model::update_actions_state(double /*now*/, double delta) +{ + for (auto it = std::begin(*get_started_action_set()); it != std::end(*get_started_action_set());) { + L07Action& action = static_cast(*it); + ++it; // increment iterator here since the following calls to action.finish() may invalidate it + if (action.latency_ > 0) { + if (action.latency_ > delta) { + double_update(&(action.latency_), delta, sg_surf_precision); } else { - action->m_latency = 0.0; + action.latency_ = 0.0; } - if ((action->m_latency == 0.0) && (action->isSuspended() == 0)) { - action->updateBound(); - lmm_update_variable_weight(maxminSystem_, action->getVariable(), 1.0); + if ((action.latency_ <= 0.0) && (action.is_suspended() == 0)) { + action.updateBound(); + get_maxmin_system()->update_variable_weight(action.get_variable(), 1.0); + action.set_last_update(); } } - XBT_DEBUG("Action (%p) : remains (%g) updated by %g.", - action, action->getRemains(), lmm_variable_getvalue(action->getVariable()) * delta); - action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta); + XBT_DEBUG("Action (%p) : remains (%g) updated by %g.", &action, action.get_remains(), + action.get_variable()->get_value() * delta); + action.update_remains(action.get_variable()->get_value() * delta); - if (action->getMaxDuration() != NO_MAX_DURATION) - action->updateMaxDuration(delta); + if (action.get_max_duration() > NO_MAX_DURATION) + action.update_max_duration(delta); - XBT_DEBUG("Action (%p) : remains (%g).", action, action->getRemains()); + XBT_DEBUG("Action (%p) : remains (%g).", &action, action.get_remains()); /* In the next if cascade, the action can be finished either because: * - The amount of remaining work reached 0 @@ -140,358 +112,303 @@ void HostL07Model::updateActionsState(double /*now*/, double delta) { * If it's not done, it may have failed. */ - if ((action->getRemains() <= 0) && - (lmm_get_variable_weight(action->getVariable()) > 0)) { - action->finish(); - action->setState(SURF_ACTION_DONE); - } else if ((action->getMaxDuration() != NO_MAX_DURATION) && - (action->getMaxDuration() <= 0)) { - action->finish(); - action->setState(SURF_ACTION_DONE); + if (((action.get_remains() <= 0) && (action.get_variable()->get_weight() > 0)) || + ((action.get_max_duration() > NO_MAX_DURATION) && (action.get_max_duration() <= 0))) { + action.finish(kernel::resource::Action::State::FINISHED); } else { /* Need to check that none of the model has failed */ - lmm_constraint_t cnst = NULL; int i = 0; - - while ((cnst = lmm_get_cnst_from_var(maxminSystem_, action->getVariable(), i++))) { - void *constraint_id = lmm_constraint_id(cnst); - - if (static_cast(constraint_id)->isOff()) { - XBT_DEBUG("Action (%p) Failed!!", action); - action->finish(); - action->setState(SURF_ACTION_FAILED); + kernel::lmm::Constraint* cnst = action.get_variable()->get_constraint(i); + while (cnst != nullptr) { + i++; + void* constraint_id = cnst->get_id(); + if (static_cast(constraint_id)->is_off()) { + XBT_DEBUG("Action (%p) Failed!!", &action); + action.finish(kernel::resource::Action::State::FAILED); break; } + cnst = action.get_variable()->get_constraint(i); } } } - return; } -Action *HostL07Model::executeParallelTask(int host_nb, sg_host_t *host_list, - double *flops_amount, double *bytes_amount, - double rate) { +kernel::resource::Action* HostL07Model::execute_parallel(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); } - -L07Action::L07Action(Model *model, int host_nb, sg_host_t*host_list, - double *flops_amount, double *bytes_amount, double rate) - : CpuAction(model, 1, 0) +L07Action::L07Action(kernel::resource::Model* model, int host_nb, sg_host_t* host_list, double* flops_amount, + double* bytes_amount, double rate) + : CpuAction(model, 1, 0), computationAmount_(flops_amount), communicationAmount_(bytes_amount), rate_(rate) { int nb_link = 0; int nb_used_host = 0; /* Only the hosts with something to compute (>0 flops) are counted) */ double latency = 0.0; - this->p_netcardList->reserve(host_nb); - for (int i = 0; ip_netcardList->push_back(host_list[i]->pimpl_netcard); + this->hostList_->reserve(host_nb); + for (int i = 0; i < host_nb; i++) { + this->hostList_->push_back(host_list[i]); + if (flops_amount[i] > 0) + nb_used_host++; + } /* Compute the number of affected resources... */ - if(bytes_amount != NULL) { - xbt_dict_t ptask_parallel_task_link_set = xbt_dict_new_homogeneous(NULL); + if(bytes_amount != nullptr) { + std::unordered_set affected_links; for (int i = 0; i < host_nb; i++) { for (int j = 0; j < host_nb; j++) { if (bytes_amount[i * host_nb + j] > 0) { double lat=0.0; - std::vector *route = new std::vector(); - routing_platf->getRouteAndLatency((*p_netcardList)[i], (*p_netcardList)[j], route, &lat); - latency = MAX(latency, lat); + std::vector route; + hostList_->at(i)->route_to(hostList_->at(j), route, &lat); + latency = std::max(latency, lat); - for (auto link : *route) - xbt_dict_set(ptask_parallel_task_link_set, link->getName(), link, NULL); - delete route; + for (auto const& link : route) + affected_links.insert(link->get_cname()); } } } - nb_link = xbt_dict_length(ptask_parallel_task_link_set); - xbt_dict_free(&ptask_parallel_task_link_set); + nb_link = affected_links.size(); } - 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 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; + latency_ = latency; - this->p_variable = lmm_variable_new(model->getMaxminSystem(), this, 1.0, - (rate > 0 ? rate : -1.0), - host_nb + nb_link); + set_variable(model->get_maxmin_system()->variable_new(this, 1.0, (rate > 0 ? rate : -1.0), host_nb + nb_link)); - if (this->m_latency > 0) - lmm_update_variable_weight(model->getMaxminSystem(), this->getVariable(), 0.0); + if (latency_ > 0) + model->get_maxmin_system()->update_variable_weight(get_variable(), 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]); + model->get_maxmin_system()->expand(host_list[i]->pimpl_cpu->get_constraint(), get_variable(), flops_amount[i]); - if(bytes_amount != NULL) { + if(bytes_amount != nullptr) { for (int i = 0; i < host_nb; i++) { for (int j = 0; j < host_nb; j++) { + if (bytes_amount[i * host_nb + j] > 0.0) { + std::vector route; + hostList_->at(i)->route_to(hostList_->at(j), route, nullptr); - if (bytes_amount[i * host_nb + j] == 0.0) - continue; - std::vector *route = new std::vector(); - - routing_platf->getRouteAndLatency((*p_netcardList)[i], (*p_netcardList)[j], route, NULL); - - for (auto link : *route) - lmm_expand_add(model->getMaxminSystem(), link->getConstraint(), this->getVariable(), bytes_amount[i * host_nb + j]); - - delete route; + for (auto const& link : route) + model->get_maxmin_system()->expand_add(link->get_constraint(), this->get_variable(), + bytes_amount[i * host_nb + j]); + } } } } if (nb_link + nb_used_host == 0) { - this->setCost(1.0); - this->setRemains(0.0); + this->set_cost(1.0); + this->set_remains(0.0); } - xbt_free(host_list); + delete[] host_list; } -Action *NetworkL07Model::communicate(NetCard *src, NetCard *dst, - double size, double rate) +kernel::resource::Action* NetworkL07Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) { - 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; + sg_host_t* host_list = new sg_host_t[2](); + double* flops_amount = new double[2](); + double* bytes_amount = new double[4](); - host_list[0] = sg_host_by_name(src->name()); - host_list[1] = sg_host_by_name(dst->name()); + host_list[0] = src; + host_list[1] = dst; bytes_amount[1] = size; - res = p_hostModel->executeParallelTask(2, host_list, flops_amount, bytes_amount, rate); - - return res; + return hostModel_->execute_parallel(2, host_list, flops_amount, bytes_amount, rate); } -Cpu *CpuL07Model::createCpu(simgrid::s4u::Host *host, xbt_dynar_t powerPeakList, - tmgr_trace_t power_trace, int core, tmgr_trace_t state_trace) +Cpu* CpuL07Model::create_cpu(simgrid::s4u::Host* host, std::vector* speed_per_pstate, int core) { - CpuL07 *cpu = new CpuL07(this, host, powerPeakList, power_trace, core, state_trace); - return cpu; + return new CpuL07(this, host, speed_per_pstate, core); } -Link* NetworkL07Model::createLink(const char *name, double bandwidth, double latency, - e_surf_link_sharing_policy_t policy, xbt_dict_t properties) +kernel::resource::LinkImpl* NetworkL07Model::createLink(const std::string& name, double bandwidth, double latency, + s4u::Link::SharingPolicy policy) { - xbt_assert(!Link::byName(name), - "Link '%s' declared several times in the platform.", name); - - Link* link = new LinkL07(this, name, properties, bandwidth, latency, policy); - Link::onCreation(link); - return link; + return new LinkL07(this, name, bandwidth, latency, policy); } /************ * Resource * ************/ -CpuL07::CpuL07(CpuL07Model *model, simgrid::s4u::Host *host, - xbt_dynar_t speedPeakList, - tmgr_trace_t speedTrace, - int core, tmgr_trace_t state_trace) - : Cpu(model, host, speedPeakList, core, xbt_dynar_get_as(speedPeakList,0,double)) +CpuL07::CpuL07(CpuL07Model* model, simgrid::s4u::Host* host, std::vector* speed_per_pstate, int core) + : Cpu(model, host, model->get_maxmin_system()->constraint_new(this, speed_per_pstate->front()), speed_per_pstate, + core) { - p_constraint = lmm_constraint_new(model->getMaxminSystem(), this, xbt_dynar_get_as(speedPeakList,0,double)); - - if (speedTrace) - p_speed.event = future_evt_set->add_trace(speedTrace, 0.0, this); - - if (state_trace) - p_stateEvent = future_evt_set->add_trace(state_trace, 0.0, this); } -CpuL07::~CpuL07() -{ -} +CpuL07::~CpuL07()=default; -LinkL07::LinkL07(NetworkL07Model *model, const char* name, xbt_dict_t props, double bandwidth, double latency, - e_surf_link_sharing_policy_t policy) - : Link(model, name, props, lmm_constraint_new(model->getMaxminSystem(), this, bandwidth)) +LinkL07::LinkL07(NetworkL07Model* model, const std::string& name, double bandwidth, double latency, + s4u::Link::SharingPolicy policy) + : LinkImpl(model, name, model->get_maxmin_system()->constraint_new(this, bandwidth)) { - m_bandwidth.peak = bandwidth; - m_latency.peak = latency; + bandwidth_.peak = bandwidth; + latency_.peak = latency; + + if (policy == s4u::Link::SharingPolicy::FATPIPE) + get_constraint()->unshare(); - if (policy == SURF_LINK_FATPIPE) - lmm_constraint_shared(getConstraint()); + s4u::Link::on_creation(this->piface_); } -Action *CpuL07::execution_start(double size) +kernel::resource::Action* CpuL07::execution_start(double size) { - sg_host_t*host_list = xbt_new0(sg_host_t, 1); - double *flops_amount = xbt_new0(double, 1); + sg_host_t* host_list = new sg_host_t[1](); + double* flops_amount = new double[1](); - host_list[0] = getHost(); + host_list[0] = get_host(); flops_amount[0] = size; - return static_cast(getModel())->p_hostModel - ->executeParallelTask( 1, host_list, flops_amount, NULL, -1); + return static_cast(get_model())->hostModel_->execute_parallel(1, host_list, flops_amount, nullptr, -1); } -Action *CpuL07::sleep(double duration) +kernel::resource::Action* CpuL07::sleep(double duration) { 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); + action->set_max_duration(duration); + action->suspended_ = kernel::resource::Action::SuspendStates::sleeping; + get_model()->get_maxmin_system()->update_variable_weight(action->get_variable(), 0.0); return action; } -bool CpuL07::isUsed(){ - return lmm_constraint_used(getModel()->getMaxminSystem(), getConstraint()); +bool CpuL07::is_used() +{ + return get_model()->get_maxmin_system()->constraint_used(get_constraint()); } /** @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_update_constraint_bound(getModel()->getMaxminSystem(), getConstraint(), p_speed.peak * p_speed.scale); - while ((var = lmm_get_var_from_cnst - (getModel()->getMaxminSystem(), getConstraint(), &elem))) { - Action *action = static_cast(lmm_variable_id(var)); - - lmm_update_variable_bound(getModel()->getMaxminSystem(), - action->getVariable(), - p_speed.scale * p_speed.peak); - } +void CpuL07::on_speed_change() +{ + kernel::lmm::Variable* var = nullptr; + const kernel::lmm::Element* elem = nullptr; - Cpu::onSpeedChange(); -} + get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), speed_.peak * speed_.scale); + while ((var = get_constraint()->get_variable(&elem))) { + kernel::resource::Action* action = static_cast(var->get_id()); + get_model()->get_maxmin_system()->update_variable_bound(action->get_variable(), speed_.scale * speed_.peak); + } -bool LinkL07::isUsed(){ - return lmm_constraint_used(getModel()->getMaxminSystem(), getConstraint()); + Cpu::on_speed_change(); } -void CpuL07::apply_event(tmgr_trace_iterator_t triggered, double value){ - XBT_DEBUG("Updating cpu %s (%p) with value %g", getName(), this, value); - if (triggered == p_speed.event) { - p_speed.scale = value; - onSpeedChange(); - tmgr_trace_event_unref(&p_speed.event); +bool LinkL07::is_used() +{ + return get_model()->get_maxmin_system()->constraint_used(get_constraint()); +} - } else if (triggered == p_stateEvent) { +void CpuL07::apply_event(tmgr_trace_event_t triggered, double value) +{ + XBT_DEBUG("Updating cpu %s (%p) with value %g", get_cname(), this, value); + if (triggered == speed_.event) { + speed_.scale = value; + on_speed_change(); + tmgr_trace_event_unref(&speed_.event); + + } else if (triggered == state_event_) { if (value > 0) - turnOn(); + turn_on(); else - turnOff(); - tmgr_trace_event_unref(&p_stateEvent); + turn_off(); + tmgr_trace_event_unref(&state_event_); } else { xbt_die("Unknown event!\n"); } } -void LinkL07::apply_event(tmgr_trace_iterator_t triggered, double value) { - XBT_DEBUG("Updating link %s (%p) with value=%f", getName(), this, value); - if (triggered == m_bandwidth.event) { - updateBandwidth(value); - tmgr_trace_event_unref(&m_bandwidth.event); +void LinkL07::apply_event(tmgr_trace_event_t triggered, double value) +{ + XBT_DEBUG("Updating link %s (%p) with value=%f", get_cname(), this, value); + if (triggered == bandwidth_.event) { + set_bandwidth(value); + tmgr_trace_event_unref(&bandwidth_.event); - } else if (triggered == m_latency.event) { - updateLatency(value); - tmgr_trace_event_unref(&m_latency.event); + } else if (triggered == latency_.event) { + set_latency(value); + tmgr_trace_event_unref(&latency_.event); - } else if (triggered == m_stateEvent) { + } else if (triggered == state_event_) { if (value > 0) - turnOn(); + turn_on(); else - turnOff(); - tmgr_trace_event_unref(&m_stateEvent); + turn_off(); + tmgr_trace_event_unref(&state_event_); } else { xbt_die("Unknown event ! \n"); } } -void LinkL07::updateBandwidth(double value) +void LinkL07::set_bandwidth(double value) { - m_bandwidth.peak = value; - lmm_update_constraint_bound(getModel()->getMaxminSystem(), getConstraint(), m_bandwidth.peak * m_bandwidth.scale); + bandwidth_.peak = value; + LinkImpl::on_bandwidth_change(); + + get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), bandwidth_.peak * bandwidth_.scale); } -void LinkL07::updateLatency(double value) +void LinkL07::set_latency(double value) { - lmm_variable_t var = NULL; + kernel::lmm::Variable* var = nullptr; L07Action *action; - lmm_element_t elem = NULL; + const kernel::lmm::Element* elem = nullptr; - m_latency.peak = value; - while ((var = lmm_get_var_from_cnst(getModel()->getMaxminSystem(), getConstraint(), &elem))) { - action = static_cast(lmm_variable_id(var)); + latency_.peak = value; + while ((var = get_constraint()->get_variable(&elem))) { + action = static_cast(var->get_id()); action->updateBound(); } } +LinkL07::~LinkL07() = default; /********** * Action * **********/ L07Action::~L07Action(){ - delete p_netcardList; - free(p_communicationAmount); - free(p_computationAmount); + delete hostList_; + delete[] communicationAmount_; + delete[] computationAmount_; } void L07Action::updateBound() { double lat_current = 0.0; - double lat_bound = -1.0; - int i, j; - int hostNb = p_netcardList->size(); + int hostNb = hostList_->size(); - if (p_communicationAmount != NULL) { - for (i = 0; i < hostNb; i++) { - for (j = 0; j < hostNb; j++) { + if (communicationAmount_ != nullptr) { + for (int i = 0; i < hostNb; i++) { + for (int j = 0; j < hostNb; j++) { - if (p_communicationAmount[i * hostNb + j] > 0) { + if (communicationAmount_[i * hostNb + j] > 0) { double lat = 0.0; - std::vector *route = new std::vector(); - routing_platf->getRouteAndLatency((*p_netcardList)[i], (*p_netcardList)[j], route, &lat); + std::vector route; + hostList_->at(i)->route_to(hostList_->at(j), route, &lat); - lat_current = MAX(lat_current, lat * p_communicationAmount[i * hostNb + j]); - delete route; + lat_current = std::max(lat_current, lat * communicationAmount_[i * hostNb + j]); } } } } - lat_bound = sg_tcp_gamma / (2.0 * lat_current); + double lat_bound = kernel::resource::NetworkModel::cfg_tcp_gamma / (2.0 * lat_current); XBT_DEBUG("action (%p) : lat_bound = %g", this, lat_bound); - if ((m_latency == 0.0) && (m_suspended == 0)) { - if (m_rate < 0) - lmm_update_variable_bound(getModel()->getMaxminSystem(), getVariable(), lat_bound); + if ((latency_ <= 0.0) && (suspended_ == Action::SuspendStates::not_suspended)) { + if (rate_ < 0) + get_model()->get_maxmin_system()->update_variable_bound(get_variable(), lat_bound); else - lmm_update_variable_bound(getModel()->getMaxminSystem(), getVariable(), - std::min(m_rate, lat_bound)); - } -} - -int L07Action::unref() -{ - m_refcount--; - if (!m_refcount) { - if (action_hook.is_linked()) - p_stateSet->erase(p_stateSet->iterator_to(*this)); - if (getVariable()) - lmm_variable_free(getModel()->getMaxminSystem(), getVariable()); - delete this; - return 1; + get_model()->get_maxmin_system()->update_variable_bound(get_variable(), std::min(rate_, lat_bound)); } - return 0; } }