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
Remove unused type definitions.
[simgrid.git]
/
src
/
surf
/
cpu_cas01.cpp
diff --git
a/src/surf/cpu_cas01.cpp
b/src/surf/cpu_cas01.cpp
index
b594980
..
a82c956
100644
(file)
--- a/
src/surf/cpu_cas01.cpp
+++ b/
src/surf/cpu_cas01.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2009-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-201
9
. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
@@
-25,7
+25,7
@@
static simgrid::config::Flag<std::string>
{"Full", "Full update of remaining and variables. Slow but may be useful when debugging."},
}),
{"Full", "Full update of remaining and variables. Slow but may be useful when debugging."},
}),
- [](std::string const&
val
) {
+ [](std::string const&) {
xbt_assert(_sg_cfg_init_status < 2,
"Cannot change the optimization algorithm after the initialization");
});
xbt_assert(_sg_cfg_init_status < 2,
"Cannot change the optimization algorithm after the initialization");
});
@@
-115,7
+115,7
@@
void CpuCas01::on_speed_change()
Cpu::on_speed_change();
}
Cpu::on_speed_change();
}
-void CpuCas01::apply_event(
tmgr_trace_event_t
event, double value)
+void CpuCas01::apply_event(
kernel::profile::Event*
event, double value)
{
if (event == speed_.event) {
/* TODO (Hypervisor): do the same thing for constraint_core[i] */
{
if (event == speed_.event) {
/* TODO (Hypervisor): do the same thing for constraint_core[i] */
@@
-130,8
+130,8
@@
void CpuCas01::apply_event(tmgr_trace_event_t event, double value)
xbt_assert(get_core_count() == 1, "FIXME: add state change code also for constraint_core[i]");
if (value > 0) {
xbt_assert(get_core_count() == 1, "FIXME: add state change code also for constraint_core[i]");
if (value > 0) {
- if (
is_off
()) {
-
host_that_restart.push_back(get_host
());
+ if (
not is_on
()) {
+
XBT_VERB("Restart processes on host %s", get_host()->get_cname
());
get_host()->turn_on();
}
} else {
get_host()->turn_on();
}
} else {
@@
-163,12
+163,13
@@
void CpuCas01::apply_event(tmgr_trace_event_t event, double value)
/** @brief Start a new execution on this CPU lasting @param size flops and using one core */
CpuAction* CpuCas01::execution_start(double size)
{
/** @brief Start a new execution on this CPU lasting @param size flops and using one core */
CpuAction* CpuCas01::execution_start(double size)
{
- return new CpuCas01Action(get_model(), size,
is_off
(), speed_.scale * speed_.peak, get_constraint());
+ return new CpuCas01Action(get_model(), size,
not is_on
(), speed_.scale * speed_.peak, get_constraint());
}
CpuAction* CpuCas01::execution_start(double size, int requested_cores)
{
}
CpuAction* CpuCas01::execution_start(double size, int requested_cores)
{
- return new CpuCas01Action(get_model(), size, is_off(), speed_.scale * speed_.peak, get_constraint(), requested_cores);
+ return new CpuCas01Action(get_model(), size, not is_on(), speed_.scale * speed_.peak, get_constraint(),
+ requested_cores);
}
CpuAction* CpuCas01::sleep(double duration)
}
CpuAction* CpuCas01::sleep(double duration)
@@
-177,12
+178,13
@@
CpuAction* CpuCas01::sleep(double duration)
duration = std::max(duration, sg_surf_precision);
XBT_IN("(%s,%g)", get_cname(), duration);
duration = std::max(duration, sg_surf_precision);
XBT_IN("(%s,%g)", get_cname(), duration);
- CpuCas01Action* action = new CpuCas01Action(get_model(), 1.0, is_off(), speed_.scale * speed_.peak, get_constraint());
+ CpuCas01Action* action =
+ new CpuCas01Action(get_model(), 1.0, not is_on(), speed_.scale * speed_.peak, get_constraint());
// FIXME: sleep variables should not consume 1.0 in System::expand()
action->set_max_duration(duration);
action->suspended_ = kernel::resource::Action::SuspendStates::sleeping;
// FIXME: sleep variables should not consume 1.0 in System::expand()
action->set_max_duration(duration);
action->suspended_ = kernel::resource::Action::SuspendStates::sleeping;
- if (duration
< 0) // NO_MAX_DURATION
+ if (duration
== NO_MAX_DURATION)
action->set_state(simgrid::kernel::resource::Action::State::IGNORED);
get_model()->get_maxmin_system()->update_variable_weight(action->get_variable(), 0.0);
action->set_state(simgrid::kernel::resource::Action::State::IGNORED);
get_model()->get_maxmin_system()->update_variable_weight(action->get_variable(), 0.0);