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
Comment unused function parameters.
[simgrid.git]
/
src
/
plugins
/
host_load.cpp
diff --git
a/src/plugins/host_load.cpp
b/src/plugins/host_load.cpp
index
54d5fc9
..
86d6f1a
100644
(file)
--- a/
src/plugins/host_load.cpp
+++ b/
src/plugins/host_load.cpp
@@
-26,7
+26,7
@@
public:
: host_(ptr)
, last_updated_(surf_get_clock())
, last_reset_(surf_get_clock())
: host_(ptr)
, last_updated_(surf_get_clock())
, last_reset_(surf_get_clock())
- , current_speed_(host_->get
S
peed())
+ , current_speed_(host_->get
_s
peed())
, current_flops_(host_->pimpl_cpu->get_constraint()->get_usage())
, theor_max_flops_(0)
, was_prev_idle_(current_flops_ == 0)
, current_flops_(host_->pimpl_cpu->get_constraint()->get_usage())
, theor_max_flops_(0)
, was_prev_idle_(current_flops_ == 0)
@@
-81,7
+81,7
@@
void HostLoad::update()
}
theor_max_flops_ += current_speed_ * host_->get_core_count() * (now - last_updated_);
}
theor_max_flops_ += current_speed_ * host_->get_core_count() * (now - last_updated_);
- current_speed_ = host_->get
S
peed();
+ current_speed_ = host_->get
_s
peed();
last_updated_ = now;
was_prev_idle_ = (current_flops_ == 0);
}
last_updated_ = now;
was_prev_idle_ = (current_flops_ == 0);
}
@@
-98,7
+98,7
@@
double HostLoad::get_current_load()
{
// We don't need to call update() here because it is called every time an action terminates or starts
// FIXME: Can this happen at the same time? stop -> call to getCurrentLoad, load = 0 -> next action starts?
{
// We don't need to call update() here because it is called every time an action terminates or starts
// FIXME: Can this happen at the same time? stop -> call to getCurrentLoad, load = 0 -> next action starts?
- return current_flops_ / static_cast<double>(host_->get
S
peed() * host_->get_core_count());
+ return current_flops_ / static_cast<double>(host_->get
_s
peed() * host_->get_core_count());
}
/*
}
/*
@@
-112,7
+112,7
@@
void HostLoad::reset()
computed_flops_ = 0;
theor_max_flops_ = 0;
current_flops_ = host_->pimpl_cpu->get_constraint()->get_usage();
computed_flops_ = 0;
theor_max_flops_ = 0;
current_flops_ = host_->pimpl_cpu->get_constraint()->get_usage();
- current_speed_ = host_->get
S
peed();
+ current_speed_ = host_->get
_s
peed();
was_prev_idle_ = (current_flops_ == 0);
}
} // namespace plugin
was_prev_idle_ = (current_flops_ == 0);
}
} // namespace plugin
@@
-132,7
+132,7
@@
static void on_host_change(simgrid::s4u::Host& host)
}
/* This callback is called when an action (computation, idle, ...) terminates */
}
/* This callback is called when an action (computation, idle, ...) terminates */
-static void on_action_state_change(simgrid::surf::CpuAction* action)
+static void on_action_state_change(simgrid::surf::CpuAction* action
, simgrid::kernel::resource::Action::State /*previous*/
)
{
for (simgrid::surf::Cpu* const& cpu : action->cpus()) {
simgrid::s4u::Host* host = cpu->get_host();
{
for (simgrid::surf::Cpu* const& cpu : action->cpus()) {
simgrid::s4u::Host* host = cpu->get_host();