X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5ce7954780a1bff9dec8111b835749decb85a158..4a8bc21517c2e7759a0036d879338f84ed6bf56e:/src/surf/ptask_L07.cpp?ds=sidebyside diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp index 804119c1e2..5943f79ddb 100644 --- a/src/surf/ptask_L07.cpp +++ b/src/surf/ptask_L07.cpp @@ -18,14 +18,13 @@ 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(not surf_cpu_model_pm, "CPU model type already defined"); - xbt_assert(not surf_network_model, "network model type already defined"); + xbt_assert(not surf_cpu_model_pm, "Cannot switch to ptasks: CPU model already defined"); + xbt_assert(not surf_network_model, "Cannot switch to ptasks: network model already defined"); surf_host_model = new simgrid::surf::HostL07Model(); - all_existing_models->push_back(surf_host_model); + all_existing_models.push_back(surf_host_model); } - namespace simgrid { namespace surf { @@ -43,7 +42,7 @@ HostL07Model::~HostL07Model() } CpuL07Model::CpuL07Model(HostL07Model* hmodel, kernel::lmm::System* sys) - : CpuModel(Model::UpdateAlgo::Full), hostModel_(hmodel) + : CpuModel(Model::UpdateAlgo::FULL), hostModel_(hmodel) { set_maxmin_system(sys); } @@ -54,10 +53,10 @@ CpuL07Model::~CpuL07Model() } NetworkL07Model::NetworkL07Model(HostL07Model* hmodel, kernel::lmm::System* sys) - : NetworkModel(Model::UpdateAlgo::Full), hostModel_(hmodel) + : NetworkModel(Model::UpdateAlgo::FULL), hostModel_(hmodel) { set_maxmin_system(sys); - loopback_ = NetworkL07Model::createLink("__loopback__", 498000000, 0.000015, s4u::Link::SharingPolicy::FATPIPE); + loopback_ = NetworkL07Model::create_link("__loopback__", 498000000, 0.000015, s4u::Link::SharingPolicy::FATPIPE); } NetworkL07Model::~NetworkL07Model() @@ -68,7 +67,7 @@ NetworkL07Model::~NetworkL07Model() double HostL07Model::next_occuring_event(double now) { double min = HostModel::next_occuring_event_full(now); - for (kernel::resource::Action const& action : *get_running_action_set()) { + 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_; @@ -82,7 +81,7 @@ double HostL07Model::next_occuring_event(double now) void HostL07Model::update_actions_state(double /*now*/, double delta) { - for (auto it = std::begin(*get_running_action_set()); it != std::end(*get_running_action_set());) { + 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) { @@ -94,6 +93,7 @@ void HostL07Model::update_actions_state(double /*now*/, double delta) 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.get_remains(), @@ -113,7 +113,7 @@ void HostL07Model::update_actions_state(double /*now*/, double delta) 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::done); + action.finish(kernel::resource::Action::State::FINISHED); } else { /* Need to check that none of the model has failed */ int i = 0; @@ -123,7 +123,7 @@ void HostL07Model::update_actions_state(double /*now*/, double delta) 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); + action.finish(kernel::resource::Action::State::FAILED); break; } cnst = action.get_variable()->get_constraint(i); @@ -145,13 +145,16 @@ L07Action::L07Action(kernel::resource::Model* model, int host_nb, sg_host_t* hos 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->set_last_update(); - 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++; - } + this->hostList_.reserve(host_nb); + for (int i = 0; i < host_nb; i++) + this->hostList_.push_back(host_list[i]); + + if (flops_amount != nullptr) + for (int i = 0; i < host_nb; i++) + if (flops_amount[i] > 0) + nb_used_host++; /* Compute the number of affected resources... */ if(bytes_amount != nullptr) { @@ -164,7 +167,7 @@ L07Action::L07Action(kernel::resource::Model* model, int host_nb, sg_host_t* hos double lat=0.0; std::vector route; - hostList_->at(i)->routeTo(hostList_->at(j), route, &lat); + hostList_.at(i)->route_to(hostList_.at(j), route, &lat); latency = std::max(latency, lat); for (auto const& link : route) @@ -184,15 +187,16 @@ L07Action::L07Action(kernel::resource::Model* model, int host_nb, sg_host_t* hos if (latency_ > 0) model->get_maxmin_system()->update_variable_weight(get_variable(), 0.0); - for (int i = 0; i < host_nb; i++) - model->get_maxmin_system()->expand(host_list[i]->pimpl_cpu->get_constraint(), get_variable(), flops_amount[i]); + if (flops_amount != nullptr) + for (int i = 0; i < host_nb; i++) + model->get_maxmin_system()->expand(host_list[i]->pimpl_cpu->get_constraint(), get_variable(), flops_amount[i]); - if(bytes_amount != nullptr) { + 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); + hostList_.at(i)->route_to(hostList_.at(j), route, nullptr); for (auto const& link : route) model->get_maxmin_system()->expand_add(link->get_constraint(), this->get_variable(), @@ -206,7 +210,6 @@ L07Action::L07Action(kernel::resource::Model* model, int host_nb, sg_host_t* hos this->set_cost(1.0); this->set_remains(0.0); } - delete[] host_list; } kernel::resource::Action* NetworkL07Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) @@ -219,16 +222,18 @@ kernel::resource::Action* NetworkL07Model::communicate(s4u::Host* src, s4u::Host host_list[1] = dst; bytes_amount[1] = size; - return hostModel_->execute_parallel(2, host_list, flops_amount, bytes_amount, rate); + kernel::resource::Action* res = hostModel_->execute_parallel(2, host_list, flops_amount, bytes_amount, rate); + static_cast(res)->free_arrays_ = true; + return res; } -Cpu *CpuL07Model::createCpu(simgrid::s4u::Host *host, std::vector *speedPerPstate, int core) +Cpu* CpuL07Model::create_cpu(simgrid::s4u::Host* host, std::vector* speed_per_pstate, int core) { - return new CpuL07(this, host, speedPerPstate, core); + return new CpuL07(this, host, speed_per_pstate, core); } -kernel::resource::LinkImpl* NetworkL07Model::createLink(const std::string& name, double bandwidth, double latency, - s4u::Link::SharingPolicy policy) +kernel::resource::LinkImpl* NetworkL07Model::create_link(const std::string& name, double bandwidth, double latency, + s4u::Link::SharingPolicy policy) { return new LinkL07(this, name, bandwidth, latency, policy); } @@ -237,8 +242,9 @@ kernel::resource::LinkImpl* NetworkL07Model::createLink(const std::string& name, * Resource * ************/ -CpuL07::CpuL07(CpuL07Model* model, simgrid::s4u::Host* host, std::vector* speedPerPstate, int core) - : Cpu(model, host, model->get_maxmin_system()->constraint_new(this, speedPerPstate->front()), speedPerPstate, core) +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) { } @@ -259,13 +265,15 @@ LinkL07::LinkL07(NetworkL07Model* model, const std::string& name, double bandwid kernel::resource::Action* CpuL07::execution_start(double size) { - sg_host_t* host_list = new sg_host_t[1](); - double* flops_amount = new double[1](); + sg_host_t host_list[1] = {get_host()}; - host_list[0] = getHost(); + double* flops_amount = new double[1](); flops_amount[0] = size; - return static_cast(get_model())->hostModel_->execute_parallel(1, host_list, flops_amount, nullptr, -1); + kernel::resource::Action* res = + static_cast(get_model())->hostModel_->execute_parallel(1, host_list, flops_amount, nullptr, -1); + static_cast(res)->free_arrays_ = true; + return res; } kernel::resource::Action* CpuL07::sleep(double duration) @@ -284,7 +292,8 @@ bool CpuL07::is_used() } /** @brief take into account changes of speed (either load or max) */ -void CpuL07::onSpeedChange() { +void CpuL07::on_speed_change() +{ kernel::lmm::Variable* var = nullptr; const kernel::lmm::Element* elem = nullptr; @@ -295,7 +304,7 @@ void CpuL07::onSpeedChange() { get_model()->get_maxmin_system()->update_variable_bound(action->get_variable(), speed_.scale * speed_.peak); } - Cpu::onSpeedChange(); + Cpu::on_speed_change(); } bool LinkL07::is_used() @@ -308,15 +317,18 @@ 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; - onSpeedChange(); + on_speed_change(); tmgr_trace_event_unref(&speed_.event); - } else if (triggered == stateEvent_) { - if (value > 0) - turn_on(); - else - turn_off(); - tmgr_trace_event_unref(&stateEvent_); + } else if (triggered == state_event_) { + if (value > 0) { + if (is_off()) { + XBT_VERB("Restart processes on host %s", get_host()->get_cname()); + get_host()->turn_on(); + } + } else + get_host()->turn_off(); + tmgr_trace_event_unref(&state_event_); } else { xbt_die("Unknown event!\n"); @@ -327,26 +339,26 @@ 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) { - setBandwidth(value); + set_bandwidth(value); tmgr_trace_event_unref(&bandwidth_.event); } else if (triggered == latency_.event) { - setLatency(value); + set_latency(value); tmgr_trace_event_unref(&latency_.event); - } else if (triggered == stateEvent_) { + } else if (triggered == state_event_) { if (value > 0) turn_on(); else turn_off(); - tmgr_trace_event_unref(&stateEvent_); + tmgr_trace_event_unref(&state_event_); } else { xbt_die("Unknown event ! \n"); } } -void LinkL07::setBandwidth(double value) +void LinkL07::set_bandwidth(double value) { bandwidth_.peak = value; LinkImpl::on_bandwidth_change(); @@ -354,7 +366,7 @@ void LinkL07::setBandwidth(double value) get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), bandwidth_.peak * bandwidth_.scale); } -void LinkL07::setLatency(double value) +void LinkL07::set_latency(double value) { kernel::lmm::Variable* var = nullptr; L07Action *action; @@ -372,17 +384,19 @@ LinkL07::~LinkL07() = default; * Action * **********/ -L07Action::~L07Action(){ - delete hostList_; - delete[] communicationAmount_; - delete[] computationAmount_; +L07Action::~L07Action() +{ + if (free_arrays_) { + delete[] computationAmount_; + delete[] communicationAmount_; + } } void L07Action::updateBound() { double lat_current = 0.0; - int hostNb = hostList_->size(); + int hostNb = hostList_.size(); if (communicationAmount_ != nullptr) { for (int i = 0; i < hostNb; i++) { @@ -391,7 +405,7 @@ void L07Action::updateBound() if (communicationAmount_[i * hostNb + j] > 0) { double lat = 0.0; std::vector route; - hostList_->at(i)->routeTo(hostList_->at(j), route, &lat); + hostList_.at(i)->route_to(hostList_.at(j), route, &lat); lat_current = std::max(lat_current, lat * communicationAmount_[i * hostNb + j]); }