X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ad32fd753f73b8a8a14242781eb011e78446995a..cf2a7c6a685a2a56113882f9cf278849e315fd32:/src/surf/trace_mgr.cpp diff --git a/src/surf/trace_mgr.cpp b/src/surf/trace_mgr.cpp index 32558c2bfc..b9fdbb9796 100644 --- a/src/surf/trace_mgr.cpp +++ b/src/surf/trace_mgr.cpp @@ -5,159 +5,151 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "xbt/sysdep.h" +#include "xbt/dict.h" #include "xbt/log.h" #include "xbt/str.h" -#include "xbt/dict.h" + +#include "src/surf/surf_interface.hpp" #include "src/surf/trace_mgr.hpp" #include "surf_private.h" #include "xbt/RngStream.h" +#include +#include +#include +#include #include +#include +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_trace, surf, "Surf trace management"); -static xbt_dict_t trace_list = NULL; +namespace tmgr = simgrid::trace_mgr; + +static std::unordered_map trace_list; + +static inline bool doubleEq(double d1, double d2) +{ + return fabs(d1 - d2) < 0.0001; +} +namespace simgrid { +namespace trace_mgr { -simgrid::trace_mgr::future_evt_set::future_evt_set() +bool DatedValue::operator==(DatedValue e2) { + return (doubleEq(date_, e2.date_)) && (doubleEq(value_, e2.value_)); +} +std::ostream& operator<<(std::ostream& out, const DatedValue& e) +{ + out << e.date_ << " " << e.value_; + return out; } +trace::trace() = default; +trace::~trace() = default; +future_evt_set::future_evt_set() = default; 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, std::string 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; - 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); + tmgr::DatedValue* last_event; - trace = xbt_new0(s_tmgr_trace_t, 1); - trace->event_list = xbt_dynar_new(sizeof(s_tmgr_event_t), NULL); + xbt_assert(trace_list.find(name) == trace_list.end(), "Refusing to define trace %s twice", name); - list = xbt_str_split(input, "\n\r"); + tmgr_trace_t trace = new simgrid::trace_mgr::trace(); - xbt_dynar_foreach(list, cpt, val) { + std::vector list; + boost::split(list, input, boost::is_any_of("\n\r")); + for (auto val : list) { + tmgr::DatedValue event; linecount++; - xbt_str_trim(val, " \t\n\r\x0B"); - if (val[0] == '#' || val[0] == '\0' || val[0] == '%') + boost::trim(val); + if (val[0] == '#' || val[0] == '\0' || val[0] == '%') // pass comments continue; - - if (sscanf(val, "PERIODICITY " "%lg" "\n", &periodicity) == 1) + if (sscanf(val.c_str(), "PERIODICITY %lg\n", &periodicity) == 1) + continue; + if (sscanf(val.c_str(), "WAITFOR %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.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) { - 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); - } - last_event->delta = event.delta - last_event->delta; + 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_; } else { - if(event.delta > 0.0){ - s_tmgr_event_t first_event; - first_event.delta=event.delta; - first_event.value=-1.0; - xbt_dynar_push(trace->event_list, &first_event); - } + /* 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()); + } + if (last_event) { + if (periodicity > 0) { + last_event->date_ = periodicity + trace->event_list.at(0).date_; + } else { + last_event->date_ = -1; } - xbt_dynar_push(trace->event_list, &event); - last_event = (tmgr_event_t)xbt_dynar_get_ptr(trace->event_list, xbt_dynar_length(trace->event_list) - 1); } - 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; + 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); - if ((!filename) || (strcmp(filename, "") == 0)) - return NULL; + std::ifstream* f = surf_ifsopen(filename); + xbt_assert(!f->fail(), "Cannot open file '%s' (path=%s)", filename, (boost::join(surf_path, ":")).c_str()); - 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; - } - } + std::stringstream buffer; + buffer << f->rdbuf(); + tmgr_trace_t trace = tmgr_trace_new_from_string(filename, buffer.str(), -1); - FILE *f = surf_fopen(filename, "r"); - xbt_assert(f != NULL, - "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.); - xbt_free(tstr); + delete f; return trace; } -tmgr_trace_t tmgr_empty_trace_new(void) +tmgr_trace_t tmgr_empty_trace_new() { - tmgr_trace_t trace = NULL; - 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); + 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) { - 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_event_t simgrid::trace_mgr::future_evt_set::add_trace(tmgr_trace_t trace, surf::Resource* resource) { - tmgr_trace_iterator_t trace_iterator = NULL; + tmgr_trace_event_t trace_iterator = nullptr; trace_iterator = xbt_new0(s_tmgr_trace_event_t, 1); trace_iterator->trace = trace; trace_iterator->idx = 0; trace_iterator->resource = resource; - xbt_assert((trace_iterator->idx < xbt_dynar_length(trace->event_list)), "Your trace should have at least one event!"); + xbt_assert((trace_iterator->idx < trace->event_list.size()), "Your trace should have at least one event!"); - xbt_heap_push(p_heap, trace_iterator, start_time); + xbt_heap_push(p_heap, trace_iterator, 0. /*start_time*/); return trace_iterator; } @@ -171,44 +163,47 @@ double simgrid::trace_mgr::future_evt_set::next_date() const return -1.0; } -/** @brief Retrieves the next occurring event, or NULL 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) +/** @brief Retrieves the next occurring event, or nullptr if none happens before #date */ +tmgr_trace_event_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; + tmgr_trace_event_t trace_iterator = (tmgr_trace_event_t)xbt_heap_pop(p_heap); + if (trace_iterator == nullptr) + return nullptr; tmgr_trace_t trace = trace_iterator->trace; *resource = trace_iterator->resource; - tmgr_event_t event = (tmgr_event_t)xbt_dynar_get_ptr(trace->event_list, trace_iterator->idx); + tmgr::DatedValue dateVal = trace->event_list.at(trace_iterator->idx); - *value = event->value; + *value = dateVal.value_; - if (trace_iterator->idx < xbt_dynar_length(trace->event_list) - 1) { - xbt_heap_push(p_heap, trace_iterator, event_date + event->delta); + if (trace_iterator->idx < trace->event_list.size() - 1) { + xbt_heap_push(p_heap, trace_iterator, event_date + dateVal.date_); trace_iterator->idx++; - } else if (event->delta > 0) { /* Last element, checking for periodicity */ - xbt_heap_push(p_heap, trace_iterator, event_date + event->delta); - trace_iterator->idx = 1; /* not 0 as the first event is a placeholder to handle when events really start */ - } else { /* We don't need this trace_event anymore */ + } else if (dateVal.date_ > 0) { /* Last element. Shall we loop? */ + xbt_heap_push(p_heap, trace_iterator, event_date + dateVal.date_); + trace_iterator->idx = 1; /* idx=0 is a placeholder to store when events really start */ + } else { /* If we don't loop, we don't need this trace_event anymore */ trace_iterator->free_me = 1; } 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) +void tmgr_trace_event_unref(tmgr_trace_event_t* trace_event) { if ((*trace_event)->free_me) { xbt_free(*trace_event);