#include "simgrid/s4u/Engine.hpp"
#include "src/include/surf/surf.hpp"
#include "src/instr/instr_private.hpp"
+#include "src/kernel/resource/profile/FutureEvtSet.hpp"
#include "src/plugins/vm/VirtualMachineImpl.hpp"
#include <algorithm>
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 = simgrid::kernel::profile::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 = simgrid::kernel::profile::future_evt_set.pop_leq(next_event_date, &value, &resource))) {
if (value >= 0)
resource->apply_event(event, value);
}
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);
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 = simgrid::kernel::profile::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 = simgrid::kernel::profile::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);