* under the terms of the license (GNU LGPL) which comes with this package. */
#include "ptask_L07.hpp"
+#include "src/kernel/resource/profile/Event.hpp"
#include "surf/surf.hpp"
#include "xbt/config.hpp"
}
if ((action.latency_ <= 0.0) && (action.is_suspended() == 0)) {
action.updateBound();
- get_maxmin_system()->update_variable_weight(action.get_variable(), 1.0);
+ get_maxmin_system()->update_variable_penalty(action.get_variable(), 1.0);
action.set_last_update();
}
}
* If it's not done, it may have failed.
*/
- if (((action.get_remains() <= 0) && (action.get_variable()->get_weight() > 0)) ||
+ if (((action.get_remains() <= 0) && (action.get_variable()->get_penalty() > 0)) ||
((action.get_max_duration() != NO_MAX_DURATION) && (action.get_max_duration() <= 0))) {
action.finish(kernel::resource::Action::State::FINISHED);
continue;
kernel::lmm::Constraint* cnst = action.get_variable()->get_constraint(i);
while (cnst != nullptr) {
i++;
- void* constraint_id = cnst->get_id();
- if (not static_cast<simgrid::kernel::resource::Resource*>(constraint_id)->is_on()) {
+ kernel::resource::Resource* constraint_id = cnst->get_id();
+ if (not constraint_id->is_on()) {
XBT_DEBUG("Action (%p) Failed!!", &action);
action.finish(kernel::resource::Action::State::FAILED);
break;
}
}
-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)
+kernel::resource::CpuAction* HostL07Model::execute_parallel(const std::vector<s4u::Host*>& 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);
+ return new L07Action(this, host_list, flops_amount, bytes_amount, rate);
}
-L07Action::L07Action(kernel::resource::Model* model, size_t host_nb, s4u::Host* const* host_list,
+L07Action::L07Action(kernel::resource::Model* model, const std::vector<s4u::Host*>& host_list,
const double* flops_amount, const double* bytes_amount, double rate)
: CpuAction(model, 1, 0), computationAmount_(flops_amount), communicationAmount_(bytes_amount), rate_(rate)
{
double latency = 0.0;
this->set_last_update();
- hostList_.insert(hostList_.end(), host_list, host_list + host_nb);
+ hostList_.insert(hostList_.end(), host_list.begin(), host_list.end());
if (flops_amount != nullptr)
- used_host_nb += std::count_if(flops_amount, flops_amount + host_nb, [](double x) { return x > 0.0; });
+ used_host_nb += std::count_if(flops_amount, flops_amount + host_list.size(), [](double x) { return x > 0.0; });
/* Compute the number of affected resources... */
if(bytes_amount != nullptr) {
std::unordered_set<const char*> affected_links;
- for (size_t k = 0; k < host_nb * host_nb; k++) {
+ for (size_t k = 0; k < host_list.size() * host_list.size(); k++) {
if (bytes_amount[k] <= 0)
continue;
double lat = 0.0;
std::vector<kernel::resource::LinkImpl*> route;
- hostList_[k / host_nb]->route_to(hostList_[k % host_nb], route, &lat);
+ hostList_[k / host_list.size()]->route_to(hostList_[k % host_list.size()], route, &lat);
latency = std::max(latency, lat);
for (auto const& link : route)
link_nb = affected_links.size();
}
- XBT_DEBUG("Creating a parallel task (%p) with %zu hosts and %zu unique links.", this, host_nb, link_nb);
+ XBT_DEBUG("Creating a parallel task (%p) with %zu hosts and %zu unique links.", this, host_list.size(), link_nb);
latency_ = latency;
- set_variable(model->get_maxmin_system()->variable_new(this, 1.0, (rate > 0 ? rate : -1.0), host_nb + link_nb));
+ set_variable(
+ model->get_maxmin_system()->variable_new(this, 1.0, (rate > 0 ? rate : -1.0), host_list.size() + link_nb));
if (latency_ > 0)
- model->get_maxmin_system()->update_variable_weight(get_variable(), 0.0);
+ model->get_maxmin_system()->update_variable_penalty(get_variable(), 0.0);
/* Expand 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 (size_t i = 0; i < host_nb; i++)
+ for (size_t i = 0; i < host_list.size(); 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 (size_t k = 0; k < host_nb * host_nb; k++) {
+ for (size_t k = 0; k < host_list.size() * host_list.size(); k++) {
if (bytes_amount[k] <= 0.0)
continue;
std::vector<kernel::resource::LinkImpl*> route;
- hostList_[k / host_nb]->route_to(hostList_[k % host_nb], route, nullptr);
+ hostList_[k / host_list.size()]->route_to(hostList_[k % host_list.size()], route, nullptr);
for (auto const& link : route)
model->get_maxmin_system()->expand_add(link->get_constraint(), this->get_variable(), bytes_amount[k]);
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]();
+ std::vector<s4u::Host*> host_list = {src, dst};
double* flops_amount = new double[2]();
double* bytes_amount = new double[4]();
- host_list[0] = src;
- host_list[1] = dst;
bytes_amount[1] = size;
- kernel::resource::Action* res = hostModel_->execute_parallel(2, host_list, flops_amount, bytes_amount, rate);
+ kernel::resource::Action* res = hostModel_->execute_parallel(host_list, flops_amount, bytes_amount, rate);
static_cast<L07Action*>(res)->free_arrays_ = true;
return res;
}
-Cpu* CpuL07Model::create_cpu(simgrid::s4u::Host* host, std::vector<double>* speed_per_pstate, int core)
+kernel::resource::Cpu* CpuL07Model::create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate, int core)
{
return new CpuL07(this, host, speed_per_pstate, core);
}
* Resource *
************/
-CpuL07::CpuL07(CpuL07Model* model, simgrid::s4u::Host* host, std::vector<double>* speed_per_pstate, int core)
- : Cpu(model, host, model->get_maxmin_system()->constraint_new(this, speed_per_pstate->front()), speed_per_pstate,
+CpuL07::CpuL07(CpuL07Model* model, simgrid::s4u::Host* host, const std::vector<double>& speed_per_pstate, int core)
+ : Cpu(model, host, model->get_maxmin_system()->constraint_new(this, speed_per_pstate.front()), speed_per_pstate,
core)
{
}
s4u::Link::on_creation(this->piface_);
}
-kernel::resource::Action* CpuL07::execution_start(double size)
+kernel::resource::CpuAction* CpuL07::execution_start(double size)
{
- sg_host_t host_list[1] = {get_host()};
+ std::vector<s4u::Host*> host_list = {get_host()};
- double* flops_amount = new double[1]();
+ double* flops_amount = new double[host_list.size()]();
flops_amount[0] = size;
- kernel::resource::Action* res =
- static_cast<CpuL07Model*>(get_model())->hostModel_->execute_parallel(1, host_list, flops_amount, nullptr, -1);
+ kernel::resource::CpuAction* res =
+ static_cast<CpuL07Model*>(get_model())->hostModel_->execute_parallel(host_list, flops_amount, nullptr, -1);
static_cast<L07Action*>(res)->free_arrays_ = true;
return res;
}
-kernel::resource::Action* CpuL07::sleep(double duration)
+kernel::resource::CpuAction* CpuL07::sleep(double duration)
{
L07Action *action = static_cast<L07Action*>(execution_start(1.0));
action->set_max_duration(duration);
- action->suspended_ = kernel::resource::Action::SuspendStates::sleeping;
- get_model()->get_maxmin_system()->update_variable_weight(action->get_variable(), 0.0);
+ action->set_suspend_state(kernel::resource::Action::SuspendStates::SLEEPING);
+ get_model()->get_maxmin_system()->update_variable_penalty(action->get_variable(), 0.0);
return action;
}
}
double lat_bound = kernel::resource::NetworkModel::cfg_tcp_gamma / (2.0 * lat_current);
XBT_DEBUG("action (%p) : lat_bound = %g", this, lat_bound);
- if ((latency_ <= 0.0) && (suspended_ == Action::SuspendStates::not_suspended)) {
+ if ((latency_ <= 0.0) && is_running()) {
if (rate_ < 0)
get_model()->get_maxmin_system()->update_variable_bound(get_variable(), lat_bound);
else
