maxmin_system_.reset(system);
}
-double Model::next_occuring_event(double now)
+double Model::next_occurring_event(double now)
{
// FIXME: set the good function once and for all
if (update_algorithm_ == Model::UpdateAlgo::LAZY)
- return next_occuring_event_lazy(now);
+ return next_occurring_event_lazy(now);
else if (update_algorithm_ == Model::UpdateAlgo::FULL)
- return next_occuring_event_full(now);
+ return next_occurring_event_full(now);
else
xbt_die("Invalid cpu update mechanism!");
}
-double Model::next_occuring_event_lazy(double now)
+double Model::next_occurring_event_lazy(double now)
{
XBT_DEBUG("Before share resources, the size of modified actions set is %zu", maxmin_system_->modified_set_->size());
maxmin_system_->lmm_solve();
continue;
/* bogus priority, skip it */
- if (action->get_priority() <= 0 || action->get_type() == ActionHeap::Type::latency)
+ if (action->get_sharing_penalty() <= 0 || action->get_type() == ActionHeap::Type::latency)
continue;
action->update_remains_lazy(now);
max_duration_flag = true;
}
- XBT_DEBUG("Action(%p) corresponds to variable %d", action, action->get_variable()->id_int);
+ XBT_DEBUG("Action(%p) corresponds to variable %d", action, action->get_variable()->rank_);
XBT_DEBUG("Action(%p) Start %f. May finish at %f (got a share of %f). Max_duration %f", action,
action->get_start_time(), min, share, action->get_max_duration());
}
}
-double Model::next_occuring_event_full(double /*now*/)
+double Model::next_occurring_event_full(double /*now*/)
{
maxmin_system_->solve();
{
if (list->empty())
return nullptr;
- simgrid::kernel::resource::Action* res = &list->front();
+ Action* res = &list->front();
list->pop_front();
return res;
}
THROW_UNIMPLEMENTED;
}
-} // namespace surf
+} // namespace resource
} // namespace kernel
} // namespace simgrid