#include "surf_private.h"
#include "xbt/RngStream.h"
#include <math.h>
+#include <unordered_map>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_trace, surf, "Surf trace management");
-static xbt_dict_t trace_list = NULL;
+static std::unordered_map<const char *, simgrid::trace_mgr::trace*> trace_list;
+simgrid::trace_mgr::trace::trace()
+{
+ event_list = xbt_dynar_new(sizeof(s_tmgr_event_t), nullptr);
+}
+
+simgrid::trace_mgr::trace::~trace()
+{
+ xbt_dynar_free(&event_list);
+}
simgrid::trace_mgr::future_evt_set::future_evt_set()
{
}
xbt_heap_free(p_heap);
}
-tmgr_trace_t tmgr_trace_new_from_string(const char *id, const char *input, double periodicity)
+tmgr_trace_t tmgr_trace_new_from_string(const char *name, const char *input, double periodicity)
{
- tmgr_trace_t trace = NULL;
int linecount = 0;
- s_tmgr_event_t event;
- tmgr_event_t last_event = NULL;
- xbt_dynar_t list;
+ tmgr_event_t last_event = nullptr;
unsigned int cpt;
char *val;
- if (trace_list) {
- trace = (tmgr_trace_t)xbt_dict_get_or_null(trace_list, id);
- if (trace) {
- XBT_WARN("Ignoring redefinition of trace %s", id);
- return trace;
- }
- }
-
- xbt_assert(periodicity >= 0,
- "Invalid periodicity %g (must be positive)", periodicity);
+ xbt_assert(trace_list.find(name) == trace_list.end(), "Refusing to define trace %s twice", name);
+ xbt_assert(periodicity >= 0, "Invalid periodicity %g (must be positive)", periodicity);
- trace = xbt_new0(s_tmgr_trace_t, 1);
- trace->event_list = xbt_dynar_new(sizeof(s_tmgr_event_t), NULL);
-
- list = xbt_str_split(input, "\n\r");
+ tmgr_trace_t trace = new simgrid::trace_mgr::trace();
+ xbt_dynar_t list = xbt_str_split(input, "\n\r");
xbt_dynar_foreach(list, cpt, val) {
+ s_tmgr_event_t event;
linecount++;
xbt_str_trim(val, " \t\n\r\x0B");
- if (val[0] == '#' || val[0] == '\0' || val[0] == '%')
+ if (val[0] == '#' || val[0] == '\0' || val[0] == '%') // pass comments
continue;
if (sscanf(val, "PERIODICITY " "%lg" "\n", &periodicity) == 1)
continue;
- if (sscanf(val, "%lg" " " "%lg" "\n", &event.delta, &event.value) != 2)
- xbt_die("%s:%d: Syntax error in trace\n%s", id, linecount, input);
+ xbt_assert(sscanf(val, "%lg" " " "%lg" "\n", &event.delta, &event.value) == 2,
+ "%s:%d: Syntax error in trace\n%s", name, linecount, input);
if (last_event) {
- if (last_event->delta > event.delta) {
- xbt_die("%s:%d: Invalid trace: Events must be sorted, "
- "but time %g > time %g.\n%s",
- id, linecount, last_event->delta, event.delta, input);
- }
+ xbt_assert(last_event->delta <= event.delta,
+ "%s:%d: Invalid trace: Events must be sorted, but time %g > time %g.\n%s",
+ name, linecount, last_event->delta, event.delta, input);
+
last_event->delta = event.delta - last_event->delta;
} else {
if(event.delta > 0.0){
if (last_event)
last_event->delta = periodicity;
- if (!trace_list)
- trace_list = xbt_dict_new_homogeneous((void (*)(void *)) tmgr_trace_free);
-
- xbt_dict_set(trace_list, id, (void *) trace, NULL);
+ trace_list.insert({xbt_strdup(name), trace});
xbt_dynar_free(&list);
return trace;
tmgr_trace_t tmgr_trace_new_from_file(const char *filename)
{
- tmgr_trace_t trace = NULL;
-
- if ((!filename) || (strcmp(filename, "") == 0))
- return NULL;
-
- if (trace_list) {
- trace = (tmgr_trace_t)xbt_dict_get_or_null(trace_list, filename);
- if (trace) {
- XBT_WARN("Ignoring redefinition of trace %s", filename);
- return trace;
- }
- }
+ xbt_assert(filename && filename[0], "Cannot parse a trace from the null or empty filename");
+ xbt_assert(trace_list.find(filename) == trace_list.end(), "Refusing to define trace %s twice", filename);
FILE *f = surf_fopen(filename, "r");
- xbt_assert(f != NULL,
+ xbt_assert(f != nullptr,
"Cannot open file '%s' (path=%s)", filename, xbt_str_join(surf_path, ":"));
char *tstr = xbt_str_from_file(f);
fclose(f);
- trace = tmgr_trace_new_from_string(filename, tstr, 0.);
+ tmgr_trace_t trace = tmgr_trace_new_from_string(filename, tstr, 0.);
xbt_free(tstr);
return trace;
}
-tmgr_trace_t tmgr_empty_trace_new(void)
+tmgr_trace_t tmgr_empty_trace_new()
{
- tmgr_trace_t trace = NULL;
+ tmgr_trace_t trace = new simgrid::trace_mgr::trace();
s_tmgr_event_t event;
-
- trace = xbt_new0(s_tmgr_trace_t, 1);
- trace->event_list = xbt_dynar_new(sizeof(s_tmgr_event_t), NULL);
-
event.delta = 0.0;
event.value = 0.0;
xbt_dynar_push(trace->event_list, &event);
void tmgr_trace_free(tmgr_trace_t trace)
{
- if (!trace)
- return;
-
- xbt_dynar_free(&(trace->event_list));
- free(trace);
+ delete trace;
}
/** @brief Registers a new trace into the future event set, and get an iterator over the integrated trace */
tmgr_trace_iterator_t simgrid::trace_mgr::future_evt_set::add_trace(tmgr_trace_t trace, double start_time, surf::Resource *resource)
{
- tmgr_trace_iterator_t trace_iterator = NULL;
+ tmgr_trace_iterator_t trace_iterator = nullptr;
trace_iterator = xbt_new0(s_tmgr_trace_event_t, 1);
trace_iterator->trace = trace;
return -1.0;
}
-/** @brief Retrieves the next occurring event, or NULL if none happens before #date */
+/** @brief Retrieves the next occurring event, or nullptr if none happens before #date */
tmgr_trace_iterator_t simgrid::trace_mgr::future_evt_set::pop_leq(
double date, double *value, simgrid::surf::Resource **resource)
{
double event_date = next_date();
if (event_date > date)
- return NULL;
+ return nullptr;
tmgr_trace_iterator_t trace_iterator = (tmgr_trace_iterator_t)xbt_heap_pop(p_heap);
- if (trace_iterator == NULL)
- return NULL;
+ if (trace_iterator == nullptr)
+ return nullptr;
tmgr_trace_t trace = trace_iterator->trace;
*resource = trace_iterator->resource;
return trace_iterator;
}
-void tmgr_finalize(void)
+void tmgr_finalize()
{
- xbt_dict_free(&trace_list);
+ for (auto kv : trace_list) {
+ xbt_free((char*)kv.first);
+ delete kv.second;
+ }
}
void tmgr_trace_event_unref(tmgr_trace_iterator_t *trace_event)
