-/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2019. 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. */
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 {
while (cnst != nullptr) {
i++;
void* constraint_id = cnst->get_id();
- if (static_cast<simgrid::kernel::resource::Resource*>(constraint_id)->is_off()) {
+ if (not static_cast<simgrid::kernel::resource::Resource*>(constraint_id)->is_on()) {
XBT_DEBUG("Action (%p) Failed!!", &action);
action.finish(kernel::resource::Action::State::FAILED);
break;
}
}
-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++) {
- this->hostList_->push_back(host_list[i]);
- if (flops_amount[i] > 0)
- nb_used_host++;
- }
+ this->hostList_.reserve(host_nb);
+ for (size_t i = 0; i < host_nb; i++)
+ this->hostList_.push_back(host_list[i]);
+
+ if (flops_amount != nullptr)
+ for (size_t i = 0; i < host_nb; i++)
+ if (flops_amount[i] > 0)
+ used_host_nb++;
/* Compute the number of affected resources... */
if(bytes_amount != nullptr) {
std::unordered_set<const char*> 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;
std::vector<kernel::resource::LinkImpl*> route;
- hostList_->at(i)->route_to(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)
}
}
- 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);
- 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]);
+ /* 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 (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++) {
+ if (bytes_amount != nullptr) {
+ 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<kernel::resource::LinkImpl*> route;
- hostList_->at(i)->route_to(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(),
}
}
- if (nb_link + nb_used_host == 0) {
+ if (link_nb + used_host_nb == 0) {
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)
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<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::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] = get_host();
+ double* flops_amount = new double[1]();
flops_amount[0] = size;
- return static_cast<CpuL07Model*>(get_model())->hostModel_->execute_parallel(1, host_list, flops_amount, nullptr, -1);
+ kernel::resource::Action* res =
+ static_cast<CpuL07Model*>(get_model())->hostModel_->execute_parallel(1, host_list, flops_amount, nullptr, -1);
+ static_cast<L07Action*>(res)->free_arrays_ = true;
+ return res;
}
kernel::resource::Action* CpuL07::sleep(double duration)
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) {
tmgr_trace_event_unref(&speed_.event);
} else if (triggered == state_event_) {
- if (value > 0)
- turn_on();
- else
- turn_off();
+ if (value > 0) {
+ if (not is_on()) {
+ 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 {
}
}
-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) {
* 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();
+ 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<kernel::resource::LinkImpl*> route;
- hostList_->at(i)->route_to(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]);
+ lat_current = std::max(lat_current, lat * communicationAmount_[i * host_count + j]);
}
}
}
