X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/96cedde3cdbc0b8ffc3f096a1b65d021b0226f99..12e37132d1b9b141fa8497e17b0629cfd4173c36:/src/surf/ptask_L07.cpp diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp index 1818185dbf..5b6be896af 100644 --- a/src/surf/ptask_L07.cpp +++ b/src/surf/ptask_L07.cpp @@ -121,7 +121,7 @@ void HostL07Model::update_actions_state(double /*now*/, double delta) while (cnst != nullptr) { i++; void* constraint_id = cnst->get_id(); - if (static_cast(constraint_id)->is_off()) { + if (not static_cast(constraint_id)->is_on()) { XBT_DEBUG("Action (%p) Failed!!", &action); action.finish(kernel::resource::Action::State::FAILED); break; @@ -132,36 +132,37 @@ void HostL07Model::update_actions_state(double /*now*/, double delta) } } -kernel::resource::Action* HostL07Model::execute_parallel(int host_nb, sg_host_t* host_list, double* flops_amount, - double* bytes_amount, double rate) +kernel::resource::Action* HostL07Model::execute_parallel(size_t host_nb, s4u::Host* const* host_list, + const double* flops_amount, const double* bytes_amount, + double rate) { return new L07Action(this, host_nb, host_list, flops_amount, bytes_amount, rate); } -L07Action::L07Action(kernel::resource::Model* model, int host_nb, sg_host_t* host_list, double* flops_amount, - double* bytes_amount, double rate) +L07Action::L07Action(kernel::resource::Model* model, size_t host_nb, s4u::Host* const* host_list, + const double* flops_amount, const 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) */ + size_t link_nb = 0; + size_t used_host_nb = 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++) + for (size_t 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++) + for (size_t i = 0; i < host_nb; i++) if (flops_amount[i] > 0) - nb_used_host++; + used_host_nb++; /* Compute the number of affected resources... */ 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++) { + for (size_t i = 0; i < host_nb; i++) { + for (size_t j = 0; j < host_nb; j++) { if (bytes_amount[i * host_nb + j] > 0) { double lat=0.0; @@ -176,26 +177,26 @@ L07Action::L07Action(kernel::resource::Model* model, int host_nb, sg_host_t* hos } } - nb_link = affected_links.size(); + link_nb = affected_links.size(); } - XBT_DEBUG("Creating a parallel task (%p) with %d hosts and %d unique links.", this, host_nb, nb_link); + XBT_DEBUG("Creating a parallel task (%p) with %zu hosts and %zu unique links.", this, host_nb, link_nb); latency_ = latency; - set_variable(model->get_maxmin_system()->variable_new(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 + link_nb)); if (latency_ > 0) model->get_maxmin_system()->update_variable_weight(get_variable(), 0.0); /* Expend it for the CPUs even if there is nothing to compute, to make sure that it gets expended even if there is no * communication either */ - for (int i = 0; i < host_nb; i++) + for (size_t i = 0; i < host_nb; i++) model->get_maxmin_system()->expand(host_list[i]->pimpl_cpu->get_constraint(), get_variable(), (flops_amount == nullptr ? 0.0 : flops_amount[i])); if (bytes_amount != nullptr) { - for (int i = 0; i < host_nb; i++) { - for (int j = 0; j < host_nb; j++) { + for (size_t i = 0; i < host_nb; i++) { + for (size_t 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); @@ -208,7 +209,7 @@ L07Action::L07Action(kernel::resource::Model* model, int host_nb, sg_host_t* hos } } - if (nb_link + nb_used_host == 0) { + if (link_nb + used_host_nb == 0) { this->set_cost(1.0); this->set_remains(0.0); } @@ -314,7 +315,7 @@ bool LinkL07::is_used() return get_model()->get_maxmin_system()->constraint_used(get_constraint()); } -void CpuL07::apply_event(tmgr_trace_event_t triggered, double value) +void CpuL07::apply_event(kernel::profile::Event* triggered, double value) { XBT_DEBUG("Updating cpu %s (%p) with value %g", get_cname(), this, value); if (triggered == speed_.event) { @@ -324,7 +325,7 @@ void CpuL07::apply_event(tmgr_trace_event_t triggered, double value) } else if (triggered == state_event_) { if (value > 0) { - if (is_off()) { + if (not is_on()) { XBT_VERB("Restart processes on host %s", get_host()->get_cname()); get_host()->turn_on(); } @@ -337,7 +338,7 @@ void CpuL07::apply_event(tmgr_trace_event_t triggered, double value) } } -void LinkL07::apply_event(tmgr_trace_event_t triggered, double value) +void LinkL07::apply_event(kernel::profile::Event* triggered, double value) { XBT_DEBUG("Updating link %s (%p) with value=%f", get_cname(), this, value); if (triggered == bandwidth_.event) { @@ -398,18 +399,18 @@ void L07Action::updateBound() { double lat_current = 0.0; - int hostNb = hostList_.size(); + size_t host_count = hostList_.size(); if (communicationAmount_ != nullptr) { - for (int i = 0; i < hostNb; i++) { - for (int j = 0; j < hostNb; j++) { + for (size_t i = 0; i < host_count; i++) { + for (size_t j = 0; j < host_count; j++) { - if (communicationAmount_[i * hostNb + j] > 0) { + if (communicationAmount_[i * host_count + j] > 0) { double lat = 0.0; std::vector route; hostList_.at(i)->route_to(hostList_.at(j), route, &lat); - lat_current = std::max(lat_current, lat * communicationAmount_[i * hostNb + j]); + lat_current = std::max(lat_current, lat * communicationAmount_[i * host_count + j]); } } }