X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7fb4337fa68b21ac48b0160cc9461c5a87199598..dac676c1180a5ea95897072e55f698433a857d90:/src/surf/ptask_L07.cpp diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp index 82a7e710a6..d4eb8a24bd 100644 --- a/src/surf/ptask_L07.cpp +++ b/src/surf/ptask_L07.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2010, 2013-2015. The SimGrid Team. +/* Copyright (c) 2007-2010, 2013-2017. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -7,12 +7,12 @@ #include #include +#include #include "ptask_L07.hpp" #include "cpu_interface.hpp" -#include "surf_routing.hpp" -#include "xbt/lib.h" +#include "xbt/utility.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host); XBT_LOG_EXTERNAL_CATEGORY(xbt_cfg); @@ -23,8 +23,8 @@ XBT_LOG_EXTERNAL_CATEGORY(xbt_cfg); 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"); + 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(); all_existing_models->push_back(surf_host_model); @@ -35,96 +35,78 @@ namespace simgrid { namespace surf { HostL07Model::HostL07Model() : HostModel() { - maxminSystem_ = lmm_system_new(1); + maxminSystem_ = new simgrid::kernel::lmm::System(true /* lazy */); + maxminSystem_->solve_fun = &simgrid::kernel::lmm::bottleneck_solve; 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, nullptr)); } -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 = nullptr; - lmm_system_free(maxminSystem_); - maxminSystem_ = nullptr; +CpuL07Model::CpuL07Model(HostL07Model* hmodel, lmm_system_t sys) : CpuModel(), hostModel_(hmodel) +{ + maxminSystem_ = sys; } -NetworkL07Model::NetworkL07Model(HostL07Model *hmodel, lmm_system_t sys) - : NetworkModel() - , p_hostModel(hmodel) - { - maxminSystem_ = sys; - } -NetworkL07Model::~NetworkL07Model() + +CpuL07Model::~CpuL07Model() { - surf_network_model = nullptr; - maxminSystem_ = nullptr; // Avoid multi-free + maxminSystem_ = nullptr; } +NetworkL07Model::NetworkL07Model(HostL07Model* hmodel, lmm_system_t sys) : NetworkModel(), hostModel_(hmodel) +{ + maxminSystem_ = sys; + loopback_ = NetworkL07Model::createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE); +} -double HostL07Model::next_occuring_event(double /*now*/) +NetworkL07Model::~NetworkL07Model() { - L07Action *action; + maxminSystem_ = nullptr; +} - ActionList *running_actions = getRunningActionSet(); - double min = 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::nextOccuringEvent(double now) +{ + double min = HostModel::nextOccuringEventFull(now); + for (Action const& action : *getRunningActionSet()) { + 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.getStartTime(), 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::updateActionsState(double /*now*/, double delta) +{ + for (auto it = std::begin(*getRunningActionSet()); it != std::end(*getRunningActionSet());) { + 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.isSuspended() == 0)) { + action.updateBound(); + maxminSystem_->update_variable_weight(action.getVariable(), 1.0); } } - 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.getRemains(), + action.getVariable()->get_value() * delta); + action.updateRemains(action.getVariable()->get_value() * delta); - if (action->getMaxDuration() != NO_MAX_DURATION) - action->updateMaxDuration(delta); + if (action.getMaxDuration() > NO_MAX_DURATION) + action.updateMaxDuration(delta); - XBT_DEBUG("Action (%p) : remains (%g).", action, action->getRemains()); + XBT_DEBUG("Action (%p) : remains (%g).", &action, action.getRemains()); /* In the next if cascade, the action can be finished either because: * - The amount of remaining work reached 0 @@ -132,31 +114,25 @@ 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(Action::State::done); - } else if ((action->getMaxDuration() != NO_MAX_DURATION) && - (action->getMaxDuration() <= 0)) { - action->finish(); - action->setState(Action::State::done); + if (((action.getRemains() <= 0) && (action.getVariable()->get_weight() > 0)) || + ((action.getMaxDuration() > NO_MAX_DURATION) && (action.getMaxDuration() <= 0))) { + action.finish(Action::State::done); } else { /* Need to check that none of the model has failed */ - lmm_constraint_t cnst = nullptr; 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(Action::State::failed); + kernel::lmm::Constraint* cnst = action.getVariable()->get_constraint(i); + while (cnst != nullptr) { + i++; + void* constraint_id = cnst->get_id(); + if (static_cast(constraint_id)->isOff()) { + XBT_DEBUG("Action (%p) Failed!!", &action); + action.finish(Action::State::failed); break; } + cnst = action.getVariable()->get_constraint(i); } } } - return; } Action *HostL07Model::executeParallelTask(int host_nb, sg_host_t *host_list, @@ -164,79 +140,69 @@ Action *HostL07Model::executeParallelTask(int host_nb, sg_host_t *host_list, 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) + , 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 != nullptr) { - xbt_dict_t ptask_parallel_task_link_set = xbt_dict_new_homogeneous(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)->routeTo(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, nullptr); - delete route; + for (auto const& link : route) + affected_links.insert(link->getCname()); } } } - 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->variable_ = lmm_variable_new(model->getMaxminSystem(), this, 1.0, - (rate > 0 ? rate : -1.0), - host_nb + nb_link); + setVariable(model->getMaxminSystem()->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->getMaxminSystem()->update_variable_weight(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]); + model->getMaxminSystem()->expand(host_list[i]->pimpl_cpu->constraint(), getVariable(), flops_amount[i]); 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)->routeTo(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, nullptr); - - 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->getMaxminSystem()->expand_add(link->constraint(), this->getVariable(), + bytes_amount[i * host_nb + j]); + } } } } @@ -245,20 +211,20 @@ L07Action::L07Action(Model *model, int host_nb, sg_host_t *host_list, this->setCost(1.0); this->setRemains(0.0); } - xbt_free(host_list); + delete[] host_list; } -Action *NetworkL07Model::communicate(kernel::routing::NetCard *src, kernel::routing::NetCard *dst, double size, double rate) +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); + 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; - return p_hostModel->executeParallelTask(2, host_list, flops_amount, bytes_amount, rate); + return hostModel_->executeParallelTask(2, host_list, flops_amount, bytes_amount, rate); } Cpu *CpuL07Model::createCpu(simgrid::s4u::Host *host, std::vector *speedPerPstate, int core) @@ -266,84 +232,84 @@ Cpu *CpuL07Model::createCpu(simgrid::s4u::Host *host, std::vector *spee return new CpuL07(this, host, speedPerPstate, core); } -Link* NetworkL07Model::createLink(const char *name, double bandwidth, double latency, - e_surf_link_sharing_policy_t policy, xbt_dict_t properties) +LinkImpl* NetworkL07Model::createLink(const std::string& name, double bandwidth, double latency, + e_surf_link_sharing_policy_t policy) { - return new LinkL07(this, name, properties, bandwidth, latency, policy); + return new LinkL07(this, name, bandwidth, latency, policy); } /************ * Resource * ************/ -CpuL07::CpuL07(CpuL07Model *model, simgrid::s4u::Host *host, std::vector *speedPerPstate, int core) - : Cpu(model, host, speedPerPstate, core) +CpuL07::CpuL07(CpuL07Model* model, simgrid::s4u::Host* host, std::vector* speedPerPstate, int core) + : Cpu(model, host, model->getMaxminSystem()->constraint_new(this, speedPerPstate->front()), speedPerPstate, core) { - constraint_ = lmm_constraint_new(model->getMaxminSystem(), this, speedPerPstate->front()); } 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, + e_surf_link_sharing_policy_t policy) + : LinkImpl(model, name, model->getMaxminSystem()->constraint_new(this, bandwidth)) { - m_bandwidth.peak = bandwidth; - m_latency.peak = latency; + bandwidth_.peak = bandwidth; + latency_.peak = latency; if (policy == SURF_LINK_FATPIPE) - lmm_constraint_shared(getConstraint()); + constraint()->unshare(); - Link::onCreation(this); + s4u::Link::onCreation(this->piface_); } 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(); flops_amount[0] = size; - return static_cast(getModel())->p_hostModel->executeParallelTask(1, host_list, flops_amount, nullptr, -1); + return static_cast(model())->hostModel_->executeParallelTask(1, host_list, flops_amount, nullptr, -1); } Action *CpuL07::sleep(double duration) { L07Action *action = static_cast(execution_start(1.0)); - action->maxDuration_ = duration; - action->suspended_ = 2; - lmm_update_variable_weight(getModel()->getMaxminSystem(), action->getVariable(), 0.0); + action->setMaxDuration(duration); + action->suspended_ = Action::SuspendStates::sleeping; + model()->getMaxminSystem()->update_variable_weight(action->getVariable(), 0.0); return action; } bool CpuL07::isUsed(){ - return lmm_constraint_used(getModel()->getMaxminSystem(), getConstraint()); + return model()->getMaxminSystem()->constraint_used(constraint()); } /** @brief take into account changes of speed (either load or max) */ void CpuL07::onSpeedChange() { - lmm_variable_t var = nullptr; - lmm_element_t elem = nullptr; + kernel::lmm::Variable* var = nullptr; + const_lmm_element_t elem = nullptr; - lmm_update_constraint_bound(getModel()->getMaxminSystem(), getConstraint(), speed_.peak * speed_.scale); - while ((var = lmm_get_var_from_cnst (getModel()->getMaxminSystem(), getConstraint(), &elem))) { - Action *action = static_cast(lmm_variable_id(var)); + model()->getMaxminSystem()->update_constraint_bound(constraint(), speed_.peak * speed_.scale); + while ((var = constraint()->get_variable(&elem))) { + Action* action = static_cast(var->get_id()); - lmm_update_variable_bound(getModel()->getMaxminSystem(), action->getVariable(), speed_.scale * speed_.peak); - } + model()->getMaxminSystem()->update_variable_bound(action->getVariable(), speed_.scale * speed_.peak); + } Cpu::onSpeedChange(); } bool LinkL07::isUsed(){ - return lmm_constraint_used(getModel()->getMaxminSystem(), getConstraint()); + return model()->getMaxminSystem()->constraint_used(constraint()); } -void CpuL07::apply_event(tmgr_trace_iterator_t triggered, double value){ - XBT_DEBUG("Updating cpu %s (%p) with value %g", getName(), this, value); +void CpuL07::apply_event(tmgr_trace_event_t triggered, double value) +{ + XBT_DEBUG("Updating cpu %s (%p) with value %g", getCname(), this, value); if (triggered == speed_.event) { speed_.scale = value; onSpeedChange(); @@ -361,98 +327,97 @@ void CpuL07::apply_event(tmgr_trace_iterator_t triggered, double value){ } } -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", getCname(), this, value); + if (triggered == bandwidth_.event) { + setBandwidth(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) { + setLatency(value); + tmgr_trace_event_unref(&latency_.event); - } else if (triggered == m_stateEvent) { + } else if (triggered == stateEvent_) { if (value > 0) turnOn(); else turnOff(); - tmgr_trace_event_unref(&m_stateEvent); + tmgr_trace_event_unref(&stateEvent_); } else { xbt_die("Unknown event ! \n"); } } -void LinkL07::updateBandwidth(double value) +void LinkL07::setBandwidth(double value) { - m_bandwidth.peak = value; - lmm_update_constraint_bound(getModel()->getMaxminSystem(), getConstraint(), m_bandwidth.peak * m_bandwidth.scale); + bandwidth_.peak = value; + model()->getMaxminSystem()->update_constraint_bound(constraint(), bandwidth_.peak * bandwidth_.scale); } -void LinkL07::updateLatency(double value) +void LinkL07::setLatency(double value) { - lmm_variable_t var = nullptr; + kernel::lmm::Variable* var = nullptr; L07Action *action; - lmm_element_t elem = nullptr; + const_lmm_element_t 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 = 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 != nullptr) { - 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)->routeTo(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 = sg_tcp_gamma / (2.0 * lat_current); XBT_DEBUG("action (%p) : lat_bound = %g", this, lat_bound); - if ((m_latency == 0.0) && (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) + getModel()->getMaxminSystem()->update_variable_bound(getVariable(), lat_bound); else - lmm_update_variable_bound(getModel()->getMaxminSystem(), getVariable(), std::min(m_rate, lat_bound)); + getModel()->getMaxminSystem()->update_variable_bound(getVariable(), std::min(rate_, lat_bound)); } } int L07Action::unref() { refcount_--; - if (!refcount_) { - if (action_hook.is_linked()) - stateSet_->erase(stateSet_->iterator_to(*this)); + if (not refcount_) { + if (stateSetHook_.is_linked()) + simgrid::xbt::intrusive_erase(*stateSet_, *this); if (getVariable()) - lmm_variable_free(getModel()->getMaxminSystem(), getVariable()); + getModel()->getMaxminSystem()->variable_free(getVariable()); delete this; return 1; }