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
Fix misspelling of "occurring".
[simgrid.git]
/
src
/
surf
/
cpu_ti.cpp
diff --git
a/src/surf/cpu_ti.cpp
b/src/surf/cpu_ti.cpp
index
eb5574a
..
b97d8fa
100644
(file)
--- a/
src/surf/cpu_ti.cpp
+++ b/
src/surf/cpu_ti.cpp
@@
-291,7
+291,7
@@
kernel::resource::Cpu* CpuTiModel::create_cpu(s4u::Host* host, const std::vector
return new CpuTi(this, host, speed_per_pstate, core);
}
return new CpuTi(this, host, speed_per_pstate, core);
}
-double CpuTiModel::next_occuring_event(double now)
+double CpuTiModel::next_occur
r
ing_event(double now)
{
double min_action_duration = -1;
{
double min_action_duration = -1;
@@
-314,7
+314,7
@@
double CpuTiModel::next_occuring_event(double now)
void CpuTiModel::update_actions_state(double now, double /*delta*/)
{
while (not get_action_heap().empty() && double_equals(get_action_heap().top_date(), now, sg_surf_precision)) {
void CpuTiModel::update_actions_state(double now, double /*delta*/)
{
while (not get_action_heap().empty() && double_equals(get_action_heap().top_date(), now, sg_surf_precision)) {
-
CpuTiAction
* action = static_cast<CpuTiAction*>(get_action_heap().pop());
+
auto
* action = static_cast<CpuTiAction*>(get_action_heap().pop());
XBT_DEBUG("Action %p: finish", action);
action->finish(kernel::resource::Action::State::FINISHED);
/* update remaining amount of all actions */
XBT_DEBUG("Action %p: finish", action);
action->finish(kernel::resource::Action::State::FINISHED);
/* update remaining amount of all actions */
@@
-350,8
+350,8
@@
void CpuTi::set_speed_profile(kernel::profile::Profile* profile)
if (profile && profile->event_list.size() > 1) {
kernel::profile::DatedValue val = profile->event_list.back();
if (val.date_ < 1e-12) {
if (profile && profile->event_list.size() > 1) {
kernel::profile::DatedValue val = profile->event_list.back();
if (val.date_ < 1e-12) {
-
simgrid::kernel::profile::Profile* prof
= new simgrid::kernel::profile::Profile();
- speed_.event
= prof->schedule(&profile::future_evt_set, this);
+
auto* prof
= new simgrid::kernel::profile::Profile();
+ speed_.event = prof->schedule(&profile::future_evt_set, this);
}
}
}
}
}
}
@@
-414,14
+414,14
@@
void CpuTi::update_actions_finish_time(double now)
continue;
/* bogus priority, skip it */
continue;
/* bogus priority, skip it */
- if (action.get_
priori
ty() <= 0)
+ if (action.get_
sharing_penal
ty() <= 0)
continue;
/* action suspended, skip it */
if (not action.is_running())
continue;
continue;
/* action suspended, skip it */
if (not action.is_running())
continue;
- sum_priority_ += 1.0 / action.get_
priori
ty();
+ sum_priority_ += 1.0 / action.get_
sharing_penal
ty();
}
for (CpuTiAction& action : action_set_) {
}
for (CpuTiAction& action : action_set_) {
@@
-431,9
+431,9
@@
void CpuTi::update_actions_finish_time(double now)
continue;
/* verify if the action is really running on cpu */
continue;
/* verify if the action is really running on cpu */
- if (action.is_running() && action.get_
priori
ty() > 0) {
+ if (action.is_running() && action.get_
sharing_penal
ty() > 0) {
/* total area needed to finish the action. Used in trace integration */
/* total area needed to finish the action. Used in trace integration */
- double total_area = (action.get_remains() * sum_priority_ * action.get_
priori
ty()) / speed_.peak;
+ double total_area = (action.get_remains() * sum_priority_ * action.get_
sharing_penal
ty()) / speed_.peak;
action.set_finish_time(speed_integrated_trace_->solve(now, total_area));
/* verify which event will happen before (max_duration or finish time) */
action.set_finish_time(speed_integrated_trace_->solve(now, total_area));
/* verify which event will happen before (max_duration or finish time) */
@@
-487,7
+487,7
@@
void CpuTi::update_remaining_amount(double now)
continue;
/* bogus priority, skip it */
continue;
/* bogus priority, skip it */
- if (action.get_
priori
ty() <= 0)
+ if (action.get_
sharing_penal
ty() <= 0)
continue;
/* action suspended, skip it */
continue;
/* action suspended, skip it */
@@
-503,7
+503,7
@@
void CpuTi::update_remaining_amount(double now)
continue;
/* update remaining */
continue;
/* update remaining */
- action.update_remains(area_total / (sum_priority_ * action.get_
priori
ty()));
+ action.update_remains(area_total / (sum_priority_ * action.get_
sharing_penal
ty()));
XBT_DEBUG("Update remaining action(%p) remaining %f", &action, action.get_remains_no_update());
}
last_update_ = now;
XBT_DEBUG("Update remaining action(%p) remaining %f", &action, action.get_remains_no_update());
}
last_update_ = now;
@@
-512,7
+512,7
@@
void CpuTi::update_remaining_amount(double now)
kernel::resource::CpuAction* CpuTi::execution_start(double size)
{
XBT_IN("(%s,%g)", get_cname(), size);
kernel::resource::CpuAction* CpuTi::execution_start(double size)
{
XBT_IN("(%s,%g)", get_cname(), size);
-
CpuTiAction
* action = new CpuTiAction(this, size);
+
auto
* action = new CpuTiAction(this, size);
action_set_.push_back(*action); // Actually start the action
action_set_.push_back(*action); // Actually start the action
@@
-526,7
+526,7
@@
kernel::resource::CpuAction* CpuTi::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);
-
CpuTiAction
* action = new CpuTiAction(this, 1.0);
+
auto
* action = new CpuTiAction(this, 1.0);
action->set_max_duration(duration);
action->set_suspend_state(kernel::resource::Action::SuspendStates::SLEEPING);
action->set_max_duration(duration);
action->set_suspend_state(kernel::resource::Action::SuspendStates::SLEEPING);
@@
-624,10
+624,10
@@
void CpuTiAction::set_max_duration(double duration)
XBT_OUT();
}
XBT_OUT();
}
-void CpuTiAction::set_
priority(double priori
ty)
+void CpuTiAction::set_
sharing_penalty(double sharing_penal
ty)
{
{
- XBT_IN("(%p,%g)", this,
priori
ty);
- set_
priority_no_update(priori
ty);
+ XBT_IN("(%p,%g)", this,
sharing_penal
ty);
+ set_
sharing_penalty_no_update(sharing_penal
ty);
cpu_->set_modified(true);
XBT_OUT();
}
cpu_->set_modified(true);
XBT_OUT();
}