-/* Copyright (c) 2013-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-2018. 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. */
double next_event_date = future_evt_set->next_date();
XBT_DEBUG("Next TRACE event: %f", next_event_date);
- if (not surf_network_model->nextOccuringEventIsIdempotent()) { // NS3, I see you
+ if (not surf_network_model->next_occuring_event_is_idempotent()) { // NS3, I see you
if (next_event_date != -1.0) {
time_delta = std::min(next_event_date - NOW, time_delta);
} else {
XBT_DEBUG("Updating models (min = %g, NOW = %g, next_event_date = %g)", time_delta, NOW, next_event_date);
while ((event = future_evt_set->pop_leq(next_event_date, &value, &resource))) {
- if (resource->is_used() || (watched_hosts.find(resource->getCname()) != watched_hosts.end())) {
+ if (resource->is_used() || (watched_hosts.find(resource->get_cname()) != watched_hosts.end())) {
time_delta = next_event_date - NOW;
XBT_DEBUG("This event invalidates the next_occuring_event() computation of models. Next event set to %f", time_delta);
}
NOW = next_event_date;
/* update state of the corresponding resource to the new value. Does not touch lmm.
It will be modified if needed when updating actions */
- XBT_DEBUG("Calling update_resource_state for resource %s", resource->getCname());
+ XBT_DEBUG("Calling update_resource_state for resource %s", resource->get_cname());
resource->apply_event(event, value);
NOW = round_start;
}
for (auto const& model : *all_existing_models)
model->update_actions_state(NOW, time_delta);
- simgrid::s4u::onTimeAdvance(time_delta);
+ simgrid::s4u::on_time_advance(time_delta);
TRACE_paje_dump_buffer(false);
simgrid::kernel::resource::Action* surf_model_extract_done_action_set(simgrid::kernel::resource::Model* model)
{
- return ActionListExtract(model->get_done_action_set());
+ return ActionListExtract(model->get_finished_action_set());
}
simgrid::kernel::resource::Action* surf_model_extract_failed_action_set(simgrid::kernel::resource::Model* model)
int surf_model_running_action_set_size(simgrid::kernel::resource::Model* model)
{
- return model->get_running_action_set()->size();
+ return model->get_started_action_set()->size();
}
void surf_cpu_action_set_bound(simgrid::kernel::resource::Action* action, double bound)