-/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-2019. 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. */
void surf_presolve()
{
double next_event_date = -1.0;
- tmgr_trace_event_t event = nullptr;
+ simgrid::kernel::profile::Event* event = nullptr;
double value = -1.0;
simgrid::kernel::resource::Resource* resource = nullptr;
XBT_DEBUG ("Consume all trace events occurring before the starting time.");
- while ((next_event_date = future_evt_set->next_date()) != -1.0) {
+ while ((next_event_date = future_evt_set.next_date()) != -1.0) {
if (next_event_date > NOW)
break;
- while ((event = future_evt_set->pop_leq(next_event_date, &value, &resource))) {
+ while ((event = future_evt_set.pop_leq(next_event_date, &value, &resource))) {
if (value >= 0)
resource->apply_event(event, value);
}
}
XBT_DEBUG ("Set every models in the right state by updating them to 0.");
- for (auto const& model : *all_existing_models)
+ for (auto const& model : all_existing_models)
model->update_actions_state(NOW, 0.0);
}
double model_next_action_end = -1.0;
double value = -1.0;
simgrid::kernel::resource::Resource* resource = nullptr;
- tmgr_trace_event_t event = nullptr;
+ simgrid::kernel::profile::Event* event = nullptr;
if (max_date > 0.0) {
xbt_assert(max_date > NOW,"You asked to simulate up to %f, but that's in the past already", max_date);
time_delta = next_event_virt;
}
- for (auto const& model : *all_existing_models) {
+ for (auto const& model : all_existing_models) {
if (model != surf_host_model && model != surf_vm_model && model != surf_network_model &&
model != surf_storage_model) {
double next_event_model = model->next_occuring_event(NOW);
XBT_DEBUG("Looking for next trace event");
while (1) { // Handle next occurring events until none remains
- double next_event_date = future_evt_set->next_date();
+ double next_event_date = future_evt_set.next_date();
XBT_DEBUG("Next TRACE event: %f", next_event_date);
if (not surf_network_model->next_occuring_event_is_idempotent()) { // NS3, I see you
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))) {
+ while ((event = future_evt_set.pop_leq(next_event_date, &value, &resource))) {
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 = NOW + time_delta;
// Inform the models of the date change
- for (auto const& model : *all_existing_models)
+ for (auto const& model : all_existing_models)
model->update_actions_state(NOW, time_delta);
simgrid::s4u::on_time_advance(time_delta);