-/* Copyright (c) 2007-2010, 2013-2015. The SimGrid Team.
+/* Copyright (c) 2007-2010, 2013-2017. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include "ptask_L07.hpp"
#include "cpu_interface.hpp"
-#include "xbt/lib.h"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host);
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(!surf_cpu_model_pm, "CPU model type already defined");
- xbt_assert(!surf_network_model, "network model type already defined");
+ xbt_assert(not surf_cpu_model_pm, "CPU model type already defined");
+ xbt_assert(not surf_network_model, "network model type already defined");
surf_host_model = new simgrid::surf::HostL07Model();
all_existing_models->push_back(surf_host_model);
surf_cpu_model_pm = new CpuL07Model(this,maxminSystem_);
}
-HostL07Model::~HostL07Model()
+HostL07Model::~HostL07Model()
{
lmm_system_free(maxminSystem_);
maxminSystem_ = nullptr;
, hostModel_(hmodel)
{
maxminSystem_ = sys;
- loopback_ = createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE);
+ loopback_ = NetworkL07Model::createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE);
}
NetworkL07Model::~NetworkL07Model()
if (((action->getRemains() <= 0) && (lmm_get_variable_weight(action->getVariable()) > 0)) ||
((action->getMaxDuration() > NO_MAX_DURATION) && (action->getMaxDuration() <= 0))) {
- action->finish();
- action->setState(Action::State::done);
+ action->finish(Action::State::done);
} else {
/* Need to check that none of the model has failed */
int i = 0;
void *constraint_id = lmm_constraint_id(cnst);
if (static_cast<simgrid::surf::Resource*>(constraint_id)->isOff()) {
XBT_DEBUG("Action (%p) Failed!!", action);
- action->finish();
- action->setState(Action::State::failed);
+ action->finish(Action::State::failed);
break;
}
cnst = lmm_get_cnst_from_var(maxminSystem_, action->getVariable(), i);
double lat=0.0;
std::vector<LinkImpl*> route;
- hostList_->at(i)->routeTo(hostList_->at(j), &route, &lat);
- latency = MAX(latency, lat);
+ hostList_->at(i)->routeTo(hostList_->at(j), route, &lat);
+ latency = std::max(latency, lat);
- for (auto link : route)
- affected_links.insert(link->cname());
+ for (auto const& link : route)
+ affected_links.insert(link->getCname());
}
}
}
}
XBT_DEBUG("Creating a parallel task (%p) with %d hosts and %d unique links.", this, host_nb, nb_link);
- this->latency_ = latency;
+ latency_ = latency;
- this->variable_ = lmm_variable_new(model->getMaxminSystem(), this, 1.0,
- (rate > 0 ? rate : -1.0),
- host_nb + nb_link);
+ setVariable(lmm_variable_new(model->getMaxminSystem(), this, 1.0, (rate > 0 ? rate : -1.0), host_nb + nb_link));
- if (this->latency_ > 0)
- lmm_update_variable_weight(model->getMaxminSystem(), this->getVariable(), 0.0);
+ if (latency_ > 0)
+ lmm_update_variable_weight(model->getMaxminSystem(), getVariable(), 0.0);
for (int i = 0; i < host_nb; i++)
- lmm_expand(model->getMaxminSystem(), host_list[i]->pimpl_cpu->constraint(), this->getVariable(), flops_amount[i]);
+ lmm_expand(model->getMaxminSystem(), host_list[i]->pimpl_cpu->constraint(), getVariable(), 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[i * host_nb + j] > 0.0) {
std::vector<LinkImpl*> route;
- hostList_->at(i)->routeTo(hostList_->at(j), &route, nullptr);
+ hostList_->at(i)->routeTo(hostList_->at(j), route, nullptr);
- for (auto link : route)
+ for (auto const& link : route)
lmm_expand_add(model->getMaxminSystem(), link->constraint(), this->getVariable(),
bytes_amount[i * host_nb + j]);
}
this->setCost(1.0);
this->setRemains(0.0);
}
- xbt_free(host_list);
+ delete[] host_list;
}
Action* NetworkL07Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate)
{
- sg_host_t*host_list = xbt_new0(sg_host_t, 2);
- double *flops_amount = xbt_new0(double, 2);
- double *bytes_amount = xbt_new0(double, 4);
+ sg_host_t* host_list = new sg_host_t[2]();
+ double* flops_amount = new double[2]();
+ double* bytes_amount = new double[4]();
host_list[0] = src;
host_list[1] = dst;
return new CpuL07(this, host, speedPerPstate, core);
}
-LinkImpl* NetworkL07Model::createLink(const char* name, double bandwidth, double latency,
+LinkImpl* NetworkL07Model::createLink(const std::string& name, double bandwidth, double latency,
e_surf_link_sharing_policy_t policy)
{
return new LinkL07(this, name, bandwidth, latency, policy);
CpuL07::~CpuL07()=default;
-LinkL07::LinkL07(NetworkL07Model* model, const char* name, double bandwidth, double latency,
+LinkL07::LinkL07(NetworkL07Model* model, const std::string& name, double bandwidth, double latency,
e_surf_link_sharing_policy_t policy)
: LinkImpl(model, name, lmm_constraint_new(model->getMaxminSystem(), this, bandwidth))
{
Action *CpuL07::execution_start(double size)
{
- sg_host_t*host_list = xbt_new0(sg_host_t, 1);
- double *flops_amount = xbt_new0(double, 1);
+ sg_host_t* host_list = new sg_host_t[1]();
+ double* flops_amount = new double[1]();
host_list[0] = getHost();
flops_amount[0] = size;
Action *CpuL07::sleep(double duration)
{
L07Action *action = static_cast<L07Action*>(execution_start(1.0));
- action->maxDuration_ = duration;
+ action->setMaxDuration(duration);
action->suspended_ = 2;
lmm_update_variable_weight(model()->getMaxminSystem(), action->getVariable(), 0.0);
Action* action = static_cast<Action*>(lmm_variable_id(var));
lmm_update_variable_bound(model()->getMaxminSystem(), action->getVariable(), speed_.scale * speed_.peak);
- }
+ }
Cpu::onSpeedChange();
}
void CpuL07::apply_event(tmgr_trace_event_t triggered, double value)
{
- XBT_DEBUG("Updating cpu %s (%p) with value %g", cname(), this, value);
+ XBT_DEBUG("Updating cpu %s (%p) with value %g", getCname(), this, value);
if (triggered == speed_.event) {
speed_.scale = value;
onSpeedChange();
void LinkL07::apply_event(tmgr_trace_event_t triggered, double value)
{
- XBT_DEBUG("Updating link %s (%p) with value=%f", cname(), this, value);
+ XBT_DEBUG("Updating link %s (%p) with value=%f", getCname(), this, value);
if (triggered == bandwidth_.event) {
setBandwidth(value);
tmgr_trace_event_unref(&bandwidth_.event);
L07Action::~L07Action(){
delete hostList_;
- free(communicationAmount_);
- free(computationAmount_);
+ delete[] communicationAmount_;
+ delete[] computationAmount_;
}
void L07Action::updateBound()
if (communicationAmount_[i * hostNb + j] > 0) {
double lat = 0.0;
std::vector<LinkImpl*> route;
- hostList_->at(i)->routeTo(hostList_->at(j), &route, &lat);
+ hostList_->at(i)->routeTo(hostList_->at(j), route, &lat);
- lat_current = MAX(lat_current, lat * communicationAmount_[i * hostNb + j]);
+ lat_current = std::max(lat_current, lat * communicationAmount_[i * hostNb + j]);
}
}
}
int L07Action::unref()
{
refcount_--;
- if (!refcount_) {
+ if (not refcount_) {
if (action_hook.is_linked())
stateSet_->erase(stateSet_->iterator_to(*this));
if (getVariable())
