return out;
}
-trace::trace() = default;
+trace::trace()
+{
+ /* Add the first fake event storing the time at which the trace begins */
+ tmgr::DatedValue val(0, -1);
+ event_list.push_back(val);
+}
trace::~trace() = default;
future_evt_set::future_evt_set() = default;
simgrid::trace_mgr::future_evt_set::~future_evt_set()
tmgr_trace_t tmgr_trace_new_from_string(const char* name, std::string input, double periodicity)
{
int linecount = 0;
- tmgr::DatedValue* last_event;
+ tmgr_trace_t trace = new simgrid::trace_mgr::trace();
+ tmgr::DatedValue* last_event = &(trace->event_list.back());
xbt_assert(trace_list.find(name) == trace_list.end(), "Refusing to define trace %s twice", name);
- tmgr_trace_t trace = new simgrid::trace_mgr::trace();
std::vector<std::string> list;
boost::split(list, input, boost::is_any_of("\n\r"));
xbt_assert(sscanf(val.c_str(), "%lg %lg\n", &event.date_, &event.value_) == 2, "%s:%d: Syntax error in trace\n%s",
name, linecount, input.c_str());
- if (last_event) {
- xbt_assert(last_event->date_ <= event.date_,
- "%s:%d: Invalid trace: Events must be sorted, but time %g > time %g.\n%s", name, linecount,
- last_event->date_, event.date_, input.c_str());
+ xbt_assert(last_event->date_ <= event.date_,
+ "%s:%d: Invalid trace: Events must be sorted, but time %g > time %g.\n%s", name, linecount,
+ last_event->date_, event.date_, input.c_str());
+ last_event->date_ = event.date_ - last_event->date_;
- last_event->date_ = event.date_ - last_event->date_;
- } else {
- /* Add the first fake event storing the time at which the trace begins */
- tmgr::DatedValue first_event(event.date_, -1.0);
- trace->event_list.push_back(first_event);
- }
trace->event_list.push_back(event);
last_event = &(trace->event_list.back());
}
return trace;
}
-tmgr_trace_t tmgr_empty_trace_new()
-{
- tmgr_trace_t trace = new simgrid::trace_mgr::trace();
- tmgr::DatedValue val(0, 0);
- trace->event_list.push_back(val);
-
- return trace;
-}
-
void tmgr_trace_free(tmgr_trace_t trace)
{
delete trace;