X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/863d7ae03c294566165effc8a6eff7fed7cb3e9f..aec830b8423c13c5c31e3db71361a449bfacd8ed:/src/surf/ptask_L07.cpp diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp index 0c026b4538..3707a56128 100644 --- a/src/surf/ptask_L07.cpp +++ b/src/surf/ptask_L07.cpp @@ -1,5 +1,4 @@ -/* Copyright (c) 2007-2010, 2013-2017. 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. */ @@ -35,7 +34,7 @@ namespace simgrid { namespace surf { HostL07Model::HostL07Model() : HostModel() { - maxminSystem_ = new simgrid::kernel::lmm::s_lmm_system_t(true /* lazy */); + 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_); @@ -43,15 +42,11 @@ HostL07Model::HostL07Model() : HostModel() { HostL07Model::~HostL07Model() { - delete maxminSystem_; - maxminSystem_ = nullptr; delete surf_network_model; delete surf_cpu_model_pm; } -CpuL07Model::CpuL07Model(HostL07Model *hmodel,lmm_system_t sys) - : CpuModel() - , hostModel_(hmodel) +CpuL07Model::CpuL07Model(HostL07Model* hmodel, lmm_system_t sys) : CpuModel(), hostModel_(hmodel) { maxminSystem_ = sys; } @@ -61,9 +56,7 @@ CpuL07Model::~CpuL07Model() maxminSystem_ = nullptr; } -NetworkL07Model::NetworkL07Model(HostL07Model *hmodel, lmm_system_t sys) - : NetworkModel() - , hostModel_(hmodel) +NetworkL07Model::NetworkL07Model(HostL07Model* hmodel, lmm_system_t sys) : NetworkModel(), hostModel_(hmodel) { maxminSystem_ = sys; loopback_ = NetworkL07Model::createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE); @@ -77,7 +70,7 @@ NetworkL07Model::~NetworkL07Model() double HostL07Model::nextOccuringEvent(double now) { double min = HostModel::nextOccuringEventFull(now); - for (Action const& action : *getRunningActionSet()) { + for (kernel::resource::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_; @@ -122,17 +115,17 @@ void HostL07Model::updateActionsState(double /*now*/, double delta) if (((action.getRemains() <= 0) && (action.getVariable()->get_weight() > 0)) || ((action.getMaxDuration() > NO_MAX_DURATION) && (action.getMaxDuration() <= 0))) { - action.finish(Action::State::done); + action.finish(kernel::resource::Action::State::done); } else { /* Need to check that none of the model has failed */ int i = 0; - lmm_constraint_t cnst = action.getVariable()->get_constraint(i); + 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()) { + if (static_cast(constraint_id)->isOff()) { XBT_DEBUG("Action (%p) Failed!!", &action); - action.finish(Action::State::failed); + action.finish(kernel::resource::Action::State::failed); break; } cnst = action.getVariable()->get_constraint(i); @@ -141,17 +134,15 @@ 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) { +kernel::resource::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); } -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) +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) */ @@ -220,7 +211,7 @@ L07Action::L07Action(Model *model, int host_nb, sg_host_t *host_list, delete[] host_list; } -Action* NetworkL07Model::communicate(s4u::Host* src, s4u::Host* 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 = new sg_host_t[2](); double* flops_amount = new double[2](); @@ -268,7 +259,7 @@ LinkL07::LinkL07(NetworkL07Model* model, const std::string& name, double bandwid s4u::Link::onCreation(this->piface_); } -Action *CpuL07::execution_start(double size) +kernel::resource::Action* CpuL07::execution_start(double size) { sg_host_t* host_list = new sg_host_t[1](); double* flops_amount = new double[1](); @@ -279,11 +270,11 @@ Action *CpuL07::execution_start(double size) return static_cast(model())->hostModel_->executeParallelTask(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->setMaxDuration(duration); - action->suspended_ = 2; + action->suspended_ = kernel::resource::Action::SuspendStates::sleeping; model()->getMaxminSystem()->update_variable_weight(action->getVariable(), 0.0); return action; @@ -295,12 +286,12 @@ bool CpuL07::isUsed(){ /** @brief take into account changes of speed (either load or max) */ void CpuL07::onSpeedChange() { - lmm_variable_t var = nullptr; + kernel::lmm::Variable* var = nullptr; const_lmm_element_t elem = nullptr; model()->getMaxminSystem()->update_constraint_bound(constraint(), speed_.peak * speed_.scale); while ((var = constraint()->get_variable(&elem))) { - Action* action = static_cast(var->get_id()); + kernel::resource::Action* action = static_cast(var->get_id()); model()->getMaxminSystem()->update_variable_bound(action->getVariable(), speed_.scale * speed_.peak); } @@ -364,7 +355,7 @@ void LinkL07::setBandwidth(double value) void LinkL07::setLatency(double value) { - lmm_variable_t var = nullptr; + kernel::lmm::Variable* var = nullptr; L07Action *action; const_lmm_element_t elem = nullptr; @@ -408,7 +399,7 @@ void L07Action::updateBound() } double lat_bound = sg_tcp_gamma / (2.0 * lat_current); XBT_DEBUG("action (%p) : lat_bound = %g", this, lat_bound); - if ((latency_ <= 0.0) && (suspended_ == 0)) { + if ((latency_ <= 0.0) && (suspended_ == Action::SuspendStates::not_suspended)) { if (rate_ < 0) getModel()->getMaxminSystem()->update_variable_bound(getVariable(), lat_bound); else @@ -420,7 +411,7 @@ int L07Action::unref() { refcount_--; if (not refcount_) { - if (action_hook.is_linked()) + if (stateSetHook_.is_linked()) simgrid::xbt::intrusive_erase(*stateSet_, *this); if (getVariable()) getModel()->getMaxminSystem()->variable_free(getVariable());