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
travis: pybind11 is not in xenial either
[simgrid.git]
/
src
/
plugins
/
link_energy.cpp
diff --git
a/src/plugins/link_energy.cpp
b/src/plugins/link_energy.cpp
index 8bf16970b445191aa6d92b2e3785af92a288e484..08e0a736a77a57b046f7aef6f608cd58e1685cb7 100644
(file)
--- a/
src/plugins/link_energy.cpp
+++ b/
src/plugins/link_energy.cpp
@@
-72,6
+72,9
@@
simgrid::xbt::Extension<simgrid::s4u::Link, LinkEnergy> LinkEnergy::EXTENSION_ID
void LinkEnergy::update()
{
void LinkEnergy::update()
{
+ if (!inited_)
+ init_watts_range_list();
+
double power = get_power();
double now = surf_get_clock();
total_energy_ += power * (now - last_updated_);
double power = get_power();
double now = surf_get_clock();
total_energy_ += power * (now - last_updated_);
@@
-80,7
+83,6
@@
void LinkEnergy::update()
void LinkEnergy::init_watts_range_list()
{
void LinkEnergy::init_watts_range_list()
{
-
if (inited_)
return;
inited_ = true;
if (inited_)
return;
inited_ = true;
@@
-114,8
+116,6
@@
void LinkEnergy::init_watts_range_list()
} catch (std::invalid_argument& ia) {
throw std::invalid_argument(std::string("Invalid busy power value for link ") + this->link_->get_cname());
}
} catch (std::invalid_argument& ia) {
throw std::invalid_argument(std::string("Invalid busy power value for link ") + this->link_->get_cname());
}
-
- update();
}
}
}
}