X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7fb4337fa68b21ac48b0160cc9461c5a87199598..bf6c2bfc3494a13dfeb329e9dba5145d1e33fe91:/src/surf/ptask_L07.cpp diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp index 82a7e710a6..ebbd2cfa78 100644 --- a/src/surf/ptask_L07.cpp +++ b/src/surf/ptask_L07.cpp @@ -7,6 +7,7 @@ #include #include +#include #include "ptask_L07.hpp" @@ -35,63 +36,48 @@ namespace simgrid { namespace surf { HostL07Model::HostL07Model() : HostModel() { - maxminSystem_ = lmm_system_new(1); + maxminSystem_ = lmm_system_new(true /* lazy */); + maxminSystem_->solve_fun = &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; - delete surf_network_model; -} +HostL07Model::~HostL07Model() = default; CpuL07Model::CpuL07Model(HostL07Model *hmodel,lmm_system_t sys) : CpuModel() - , p_hostModel(hmodel) + , hostModel_(hmodel) { maxminSystem_ = sys; } CpuL07Model::~CpuL07Model() { - surf_cpu_model_pm = nullptr; lmm_system_free(maxminSystem_); maxminSystem_ = nullptr; } NetworkL07Model::NetworkL07Model(HostL07Model *hmodel, lmm_system_t sys) : NetworkModel() - , p_hostModel(hmodel) + , hostModel_(hmodel) { maxminSystem_ = sys; + loopback_ = createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE); } NetworkL07Model::~NetworkL07Model() { - surf_network_model = nullptr; maxminSystem_ = nullptr; // Avoid multi-free } -double HostL07Model::next_occuring_event(double /*now*/) +double HostL07Model::nextOccuringEvent(double now) { - L07Action *action; - - 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 min = HostModel::nextOccuringEventFull(now); + for (auto it(getRunningActionSet()->begin()), itend(getRunningActionSet()->end()); it != itend ; ++it) { + L07Action *action = static_cast(&*it); + if (action->latency_ > 0 && (min < 0 || action->latency_ < min)) { + min = action->latency_; + XBT_DEBUG("Updating min with %p (start %f): %f", action, action->getStartTime(), min); } } - - XBT_DEBUG("min value : %f", min); + XBT_DEBUG("min value: %f", min); return min; } @@ -106,13 +92,13 @@ void HostL07Model::updateActionsState(double /*now*/, double delta) { ; 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); + 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)) { + if ((action->latency_ == 0.0) && (action->isSuspended() == 0)) { action->updateBound(); lmm_update_variable_weight(maxminSystem_, action->getVariable(), 1.0); } @@ -164,42 +150,42 @@ 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); + this->hostList_->reserve(host_nb); for (int i = 0; ip_netcardList->push_back(host_list[i]->pimpl_netcard); + this->hostList_->push_back(host_list[i]); /* 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); + std::vector route; + hostList_->at(i)->routeTo(hostList_->at(j), &route, &lat); latency = MAX(latency, lat); - for (auto link : *route) - xbt_dict_set(ptask_parallel_task_link_set, link->getName(), link, nullptr); - delete route; + for (auto link : route) + affected_links.insert(link->getName()); } } } - 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++) @@ -207,16 +193,13 @@ L07Action::L07Action(Model *model, int host_nb, sg_host_t *host_list, 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; + this->latency_ = latency; this->variable_ = lmm_variable_new(model->getMaxminSystem(), this, 1.0, (rate > 0 ? rate : -1.0), host_nb + nb_link); - if (this->m_latency > 0) + if (this->latency_ > 0) lmm_update_variable_weight(model->getMaxminSystem(), this->getVariable(), 0.0); for (int i = 0; i < host_nb; i++) @@ -229,14 +212,12 @@ L07Action::L07Action(Model *model, int host_nb, sg_host_t *host_list, 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); + std::vector route; + hostList_->at(i)->routeTo(hostList_->at(j), &route, nullptr); - for (auto link : *route) + for (auto link : route) lmm_expand_add(model->getMaxminSystem(), link->getConstraint(), this->getVariable(), bytes_amount[i * host_nb + j]); - - delete route; } } } @@ -248,17 +229,17 @@ L07Action::L07Action(Model *model, int host_nb, sg_host_t *host_list, xbt_free(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); - 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,30 +247,30 @@ 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) +Link* NetworkL07Model::createLink(const char* 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, lmm_constraint_new(model->getMaxminSystem(), 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 char* name, double bandwidth, double latency, + e_surf_link_sharing_policy_t policy) + : Link(model, name, lmm_constraint_new(model->getMaxminSystem(), 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()); @@ -305,7 +286,7 @@ Action *CpuL07::execution_start(double size) 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(getModel())->hostModel_->executeParallelTask(1, host_list, flops_amount, nullptr, -1); } Action *CpuL07::sleep(double duration) @@ -363,39 +344,39 @@ 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); + 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; + lmm_update_constraint_bound(getModel()->getMaxminSystem(), getConstraint(), bandwidth_.peak * bandwidth_.scale); } -void LinkL07::updateLatency(double value) +void LinkL07::setLatency(double value) { lmm_variable_t var = nullptr; L07Action *action; lmm_element_t elem = nullptr; - m_latency.peak = value; + latency_.peak = value; while ((var = lmm_get_var_from_cnst(getModel()->getMaxminSystem(), getConstraint(), &elem))) { action = static_cast(lmm_variable_id(var)); action->updateBound(); @@ -407,9 +388,9 @@ void LinkL07::updateLatency(double value) **********/ L07Action::~L07Action(){ - delete p_netcardList; - free(p_communicationAmount); - free(p_computationAmount); + delete hostList_; + free(communicationAmount_); + free(computationAmount_); } void L07Action::updateBound() @@ -418,30 +399,29 @@ void L07Action::updateBound() double lat_bound = -1.0; int i, j; - int hostNb = p_netcardList->size(); + int hostNb = hostList_->size(); - if (p_communicationAmount != nullptr) { + if (communicationAmount_ != nullptr) { for (i = 0; i < hostNb; i++) { for (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 = MAX(lat_current, lat * communicationAmount_[i * hostNb + j]); } } } } 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) + if ((latency_ == 0.0) && (suspended_ == 0)) { + if (rate_ < 0) lmm_update_variable_bound(getModel()->getMaxminSystem(), getVariable(), lat_bound); else - lmm_update_variable_bound(getModel()->getMaxminSystem(), getVariable(), std::min(m_rate, lat_bound)); + lmm_update_variable_bound(getModel()->getMaxminSystem(), getVariable(), std::min(rate_, lat_bound)); } }