A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ContextBoost: move static fields where they belong to.
[simgrid.git]
/
src
/
surf
/
ptask_L07.cpp
diff --git
a/src/surf/ptask_L07.cpp
b/src/surf/ptask_L07.cpp
index
c72048b
..
f11d8df
100644
(file)
--- a/
src/surf/ptask_L07.cpp
+++ b/
src/surf/ptask_L07.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2007-2010, 2013-201
5
. The SimGrid Team.
+/* Copyright (c) 2007-2010, 2013-201
7
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-12,7
+12,6
@@
#include "ptask_L07.hpp"
#include "cpu_interface.hpp"
#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);
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host);
XBT_LOG_EXTERNAL_CATEGORY(xbt_cfg);
@@
-23,8
+22,8
@@
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.");
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_host_model = new simgrid::surf::HostL07Model();
all_existing_models->push_back(surf_host_model);
@@
-41,30
+40,38
@@
HostL07Model::HostL07Model() : HostModel() {
surf_cpu_model_pm = new CpuL07Model(this,maxminSystem_);
}
surf_cpu_model_pm = new CpuL07Model(this,maxminSystem_);
}
-HostL07Model::~HostL07Model() = default;
+HostL07Model::~HostL07Model()
+{
+ lmm_system_free(maxminSystem_);
+ maxminSystem_ = nullptr;
+ delete surf_network_model;
+ delete surf_cpu_model_pm;
+}
CpuL07Model::CpuL07Model(HostL07Model *hmodel,lmm_system_t sys)
: CpuModel()
, hostModel_(hmodel)
CpuL07Model::CpuL07Model(HostL07Model *hmodel,lmm_system_t sys)
: CpuModel()
, hostModel_(hmodel)
- {
- maxminSystem_ = sys;
- }
-CpuL07Model::~CpuL07Model() {
- lmm_system_free(maxminSystem_);
+{
+ maxminSystem_ = sys;
+}
+
+CpuL07Model::~CpuL07Model()
+{
maxminSystem_ = nullptr;
}
maxminSystem_ = nullptr;
}
+
NetworkL07Model::NetworkL07Model(HostL07Model *hmodel, lmm_system_t sys)
: NetworkModel()
, hostModel_(hmodel)
NetworkL07Model::NetworkL07Model(HostL07Model *hmodel, lmm_system_t sys)
: NetworkModel()
, hostModel_(hmodel)
- {
- maxminSystem_ = sys;
- loopback_ = createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE);
- }
-NetworkL07Model::~NetworkL07Model()
{
{
- maxminSystem_ = nullptr; // Avoid multi-free
+ maxminSystem_ = sys;
+ loopback_ = createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE);
}
}
+NetworkL07Model::~NetworkL07Model()
+{
+ maxminSystem_ = nullptr;
+}
double HostL07Model::nextOccuringEvent(double now)
{
double HostL07Model::nextOccuringEvent(double now)
{
@@
-100,7
+107,7
@@
void HostL07Model::updateActionsState(double /*now*/, double delta) {
} else {
action->latency_ = 0.0;
}
} else {
action->latency_ = 0.0;
}
- if ((action->latency_
=
= 0.0) && (action->isSuspended() == 0)) {
+ if ((action->latency_
<
= 0.0) && (action->isSuspended() == 0)) {
action->updateBound();
lmm_update_variable_weight(maxminSystem_, action->getVariable(), 1.0);
}
action->updateBound();
lmm_update_variable_weight(maxminSystem_, action->getVariable(), 1.0);
}
@@
-109,7
+116,7
@@
void HostL07Model::updateActionsState(double /*now*/, double delta) {
action, action->getRemains(), lmm_variable_getvalue(action->getVariable()) * delta);
action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta);
action, action->getRemains(), lmm_variable_getvalue(action->getVariable()) * delta);
action->updateRemains(lmm_variable_getvalue(action->getVariable()) * delta);
- if (action->getMaxDuration()
!=
NO_MAX_DURATION)
+ if (action->getMaxDuration()
>
NO_MAX_DURATION)
action->updateMaxDuration(delta);
XBT_DEBUG("Action (%p) : remains (%g).", action, action->getRemains());
action->updateMaxDuration(delta);
XBT_DEBUG("Action (%p) : remains (%g).", action, action->getRemains());
@@
-121,9
+128,8
@@
void HostL07Model::updateActionsState(double /*now*/, double delta) {
*/
if (((action->getRemains() <= 0) && (lmm_get_variable_weight(action->getVariable()) > 0)) ||
*/
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->getMaxDuration() > NO_MAX_DURATION) && (action->getMaxDuration() <= 0))) {
+ action->finish(Action::State::done);
} else {
/* Need to check that none of the model has failed */
int i = 0;
} else {
/* Need to check that none of the model has failed */
int i = 0;
@@
-133,8
+139,7
@@
void HostL07Model::updateActionsState(double /*now*/, double delta) {
void *constraint_id = lmm_constraint_id(cnst);
if (static_cast<simgrid::surf::Resource*>(constraint_id)->isOff()) {
XBT_DEBUG("Action (%p) Failed!!", action);
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);
break;
}
cnst = lmm_get_cnst_from_var(maxminSystem_, action->getVariable(), i);
@@
-160,8
+165,11
@@
L07Action::L07Action(Model *model, int host_nb, sg_host_t *host_list,
double latency = 0.0;
this->hostList_->reserve(host_nb);
double latency = 0.0;
this->hostList_->reserve(host_nb);
- for (int i = 0; i
<host_nb; i++)
+ for (int i = 0; i
< host_nb; i++) {
this->hostList_->push_back(host_list[i]);
this->hostList_->push_back(host_list[i]);
+ if (flops_amount[i] > 0)
+ nb_used_host++;
+ }
/* Compute the number of affected resources... */
if(bytes_amount != nullptr) {
/* Compute the number of affected resources... */
if(bytes_amount != nullptr) {
@@
-177,8
+185,8
@@
L07Action::L07Action(Model *model, int host_nb, sg_host_t *host_list,
hostList_->at(i)->routeTo(hostList_->at(j), &route, &lat);
latency = MAX(latency, lat);
hostList_->at(i)->routeTo(hostList_->at(j), &route, &lat);
latency = MAX(latency, lat);
- for (auto link : route)
- affected_links.insert(link->
c
name());
+ for (auto
const&
link : route)
+ affected_links.insert(link->
getC
name());
}
}
}
}
}
}
@@
-186,10
+194,6
@@
L07Action::L07Action(Model *model, int host_nb, sg_host_t *host_list,
nb_link = affected_links.size();
}
nb_link = affected_links.size();
}
- for (int i = 0; i < host_nb; i++)
- if (flops_amount[i] > 0)
- nb_used_host++;
-
XBT_DEBUG("Creating a parallel task (%p) with %d hosts and %d unique links.", this, host_nb, nb_link);
this->latency_ = latency;
XBT_DEBUG("Creating a parallel task (%p) with %d hosts and %d unique links.", this, host_nb, nb_link);
this->latency_ = latency;
@@
-210,7
+214,7
@@
L07Action::L07Action(Model *model, int host_nb, sg_host_t *host_list,
std::vector<LinkImpl*> route;
hostList_->at(i)->routeTo(hostList_->at(j), &route, nullptr);
std::vector<LinkImpl*> route;
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]);
}
lmm_expand_add(model->getMaxminSystem(), link->constraint(), this->getVariable(),
bytes_amount[i * host_nb + j]);
}
@@
-222,14
+226,14
@@
L07Action::L07Action(Model *model, int host_nb, sg_host_t *host_list,
this->setCost(1.0);
this->setRemains(0.0);
}
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)
{
}
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;
host_list[0] = src;
host_list[1] = dst;
@@
-243,7
+247,7
@@
Cpu *CpuL07Model::createCpu(simgrid::s4u::Host *host, std::vector<double> *spee
return new CpuL07(this, host, speedPerPstate, core);
}
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);
e_surf_link_sharing_policy_t policy)
{
return new LinkL07(this, name, bandwidth, latency, policy);
@@
-261,7
+265,7
@@
CpuL07::CpuL07(CpuL07Model* model, simgrid::s4u::Host* host, std::vector<double>
CpuL07::~CpuL07()=default;
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))
{
e_surf_link_sharing_policy_t policy)
: LinkImpl(model, name, lmm_constraint_new(model->getMaxminSystem(), this, bandwidth))
{
@@
-276,8
+280,8
@@
LinkL07::LinkL07(NetworkL07Model* model, const char* name, double bandwidth, dou
Action *CpuL07::execution_start(double size)
{
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;
host_list[0] = getHost();
flops_amount[0] = size;
@@
-309,7
+313,7
@@
void CpuL07::onSpeedChange() {
Action* action = static_cast<Action*>(lmm_variable_id(var));
lmm_update_variable_bound(model()->getMaxminSystem(), action->getVariable(), speed_.scale * speed_.peak);
Action* action = static_cast<Action*>(lmm_variable_id(var));
lmm_update_variable_bound(model()->getMaxminSystem(), action->getVariable(), speed_.scale * speed_.peak);
-
}
+ }
Cpu::onSpeedChange();
}
Cpu::onSpeedChange();
}
@@
-319,8
+323,9
@@
bool LinkL07::isUsed(){
return lmm_constraint_used(model()->getMaxminSystem(), constraint());
}
return lmm_constraint_used(model()->getMaxminSystem(), constraint());
}
-void CpuL07::apply_event(tmgr_trace_iterator_t triggered, double value){
- XBT_DEBUG("Updating cpu %s (%p) with value %g", cname(), this, value);
+void CpuL07::apply_event(tmgr_trace_event_t triggered, double value)
+{
+ XBT_DEBUG("Updating cpu %s (%p) with value %g", getCname(), this, value);
if (triggered == speed_.event) {
speed_.scale = value;
onSpeedChange();
if (triggered == speed_.event) {
speed_.scale = value;
onSpeedChange();
@@
-338,8
+343,9
@@
void CpuL07::apply_event(tmgr_trace_iterator_t triggered, double value){
}
}
}
}
-void LinkL07::apply_event(tmgr_trace_iterator_t triggered, double value) {
- XBT_DEBUG("Updating link %s (%p) with value=%f", cname(), this, value);
+void LinkL07::apply_event(tmgr_trace_event_t triggered, double 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);
if (triggered == bandwidth_.event) {
setBandwidth(value);
tmgr_trace_event_unref(&bandwidth_.event);
@@
-378,6
+384,7
@@
void LinkL07::setLatency(double value)
action->updateBound();
}
}
action->updateBound();
}
}
+LinkL07::~LinkL07() = default;
/**********
* Action *
/**********
* Action *
@@
-385,8
+392,8
@@
void LinkL07::setLatency(double value)
L07Action::~L07Action(){
delete hostList_;
L07Action::~L07Action(){
delete hostList_;
-
free(communicationAmount_)
;
-
free(computationAmount_)
;
+
delete[] communicationAmount_
;
+
delete[] computationAmount_
;
}
void L07Action::updateBound()
}
void L07Action::updateBound()
@@
-411,7
+418,7
@@
void L07Action::updateBound()
}
double lat_bound = sg_tcp_gamma / (2.0 * lat_current);
XBT_DEBUG("action (%p) : lat_bound = %g", this, lat_bound);
}
double lat_bound = sg_tcp_gamma / (2.0 * lat_current);
XBT_DEBUG("action (%p) : lat_bound = %g", this, lat_bound);
- if ((latency_
=
= 0.0) && (suspended_ == 0)) {
+ if ((latency_
<
= 0.0) && (suspended_ == 0)) {
if (rate_ < 0)
lmm_update_variable_bound(getModel()->getMaxminSystem(), getVariable(), lat_bound);
else
if (rate_ < 0)
lmm_update_variable_bound(getModel()->getMaxminSystem(), getVariable(), lat_bound);
else
@@
-422,7
+429,7
@@
void L07Action::updateBound()
int L07Action::unref()
{
refcount_--;
int L07Action::unref()
{
refcount_--;
- if (
!
refcount_) {
+ if (
not
refcount_) {
if (action_hook.is_linked())
stateSet_->erase(stateSet_->iterator_to(*this));
if (getVariable())
if (action_hook.is_linked())
stateSet_->erase(stateSet_->iterator_to(*this));
if (getVariable())