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
include cleanups (mostly surf/surf.hpp)
[simgrid.git]
/
src
/
plugins
/
link_energy.cpp
diff --git
a/src/plugins/link_energy.cpp
b/src/plugins/link_energy.cpp
index
f97f316
..
636b8bf
100644
(file)
--- a/
src/plugins/link_energy.cpp
+++ b/
src/plugins/link_energy.cpp
@@
-10,7
+10,6
@@
#include "simgrid/simix.hpp"
#include "src/surf/network_interface.hpp"
#include "src/surf/surf_interface.hpp"
#include "simgrid/simix.hpp"
#include "src/surf/network_interface.hpp"
#include "src/surf/surf_interface.hpp"
-#include "surf/surf.hpp"
#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/split.hpp>
#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/split.hpp>
@@
-60,7
+59,7
@@
class LinkEnergy {
public:
static xbt::Extension<simgrid::s4u::Link, LinkEnergy> EXTENSION_ID;
public:
static xbt::Extension<simgrid::s4u::Link, LinkEnergy> EXTENSION_ID;
- explicit LinkEnergy(s4u::Link* ptr) : link_(ptr), last_updated_(s
urf_
get_clock()) {}
+ explicit LinkEnergy(s4u::Link* ptr) : link_(ptr), last_updated_(s
imgrid::s4u::Engine::
get_clock()) {}
void init_watts_range_list();
double get_consumed_energy();
void init_watts_range_list();
double get_consumed_energy();
@@
-75,7
+74,7
@@
void LinkEnergy::update()
init_watts_range_list();
double power = get_power();
init_watts_range_list();
double power = get_power();
- double now = s
urf_
get_clock();
+ double now = s
imgrid::s4u::Engine::
get_clock();
total_energy_ += power * (now - last_updated_);
last_updated_ = now;
}
total_energy_ += power * (now - last_updated_);
last_updated_ = now;
}
@@
-138,7
+137,7
@@
double LinkEnergy::get_power() const
double LinkEnergy::get_consumed_energy()
{
double LinkEnergy::get_consumed_energy()
{
- if (last_updated_ < s
urf_
get_clock()) // We need to simcall this as it modifies the environment
+ if (last_updated_ < s
imgrid::s4u::Engine::
get_clock()) // We need to simcall this as it modifies the environment
kernel::actor::simcall(std::bind(&LinkEnergy::update, this));
return this->total_energy_;
}
kernel::actor::simcall(std::bind(&LinkEnergy::update, this));
return this->total_energy_;
}