{
xbt_assert(state_event_ == nullptr, "Cannot set a second state trace to %s", get_cname());
- state_event_ = future_evt_set->add_trace(trace, this);
+ state_event_ = future_evt_set.add_trace(trace, this);
}
kernel::lmm::Constraint* Resource::get_constraint() const
{
xbt_assert(speed_.event == nullptr, "Cannot set a second speed trace to Host %s", host_->get_cname());
- speed_.event = future_evt_set->add_trace(trace, this);
+ speed_.event = future_evt_set.add_trace(trace, this);
}
if (trace && trace->event_list.size() > 1) {
trace_mgr::DatedValue val = trace->event_list.back();
if (val.date_ < 1e-12)
- speed_.event = future_evt_set->add_trace(new simgrid::trace_mgr::trace(), this);
+ speed_.event = future_evt_set.add_trace(new simgrid::trace_mgr::trace(), this);
}
}
void LinkImpl::set_bandwidth_trace(tmgr_trace_t trace)
{
xbt_assert(bandwidth_.event == nullptr, "Cannot set a second bandwidth trace to Link %s", get_cname());
- bandwidth_.event = future_evt_set->add_trace(trace, this);
+ bandwidth_.event = future_evt_set.add_trace(trace, this);
}
void LinkImpl::set_latency_trace(tmgr_trace_t trace)
{
xbt_assert(latency_.event == nullptr, "Cannot set a second latency trace to Link %s", get_cname());
- latency_.event = future_evt_set->add_trace(trace, this);
+ latency_.event = future_evt_set.add_trace(trace, this);
}
/**********
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("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);
std::vector<simgrid::kernel::resource::Model*> all_existing_models; /* to destroy models correctly */
-simgrid::trace_mgr::future_evt_set *future_evt_set = nullptr;
+simgrid::trace_mgr::future_evt_set future_evt_set;
std::vector<std::string> surf_path;
std::vector<simgrid::s4u::Host*> host_that_restart;
/** set of hosts for which one want to be notified if they ever restart. */
USER_HOST_LEVEL = simgrid::s4u::Host::extension_create(nullptr);
xbt_init(argc, argv);
- if (not future_evt_set)
- future_evt_set = new simgrid::trace_mgr::future_evt_set();
sg_config_init(argc, argv);
xbt_free(surf_plugin_description);
- delete future_evt_set;
- future_evt_set = nullptr;
-
tmgr_finalize();
sg_platf_exit();
} // namespace kernel
} // namespace simgrid
typedef simgrid::kernel::resource::TraceEvent* tmgr_trace_event_t;
-extern XBT_PRIVATE simgrid::trace_mgr::future_evt_set* future_evt_set;
+extern XBT_PRIVATE simgrid::trace_mgr::future_evt_set future_evt_set;
/**
* \brief Free a trace event structure