* 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/trace_mgr.hpp"
+
#include "src/surf/surf_interface.hpp"
+#include "src/surf/trace_mgr.hpp"
#include "surf_private.h"
#include "xbt/RngStream.h"
+#include <boost/algorithm/string.hpp>
+#include <boost/algorithm/string/join.hpp>
+#include <boost/algorithm/string/split.hpp>
+#include <fstream>
#include <math.h>
+#include <sstream>
#include <unordered_map>
-#include <boost/algorithm/string/join.hpp>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_trace, surf, "Surf trace management");
-static std::unordered_map<const char *, simgrid::trace_mgr::trace*> trace_list;
+static std::unordered_map<const char*, simgrid::trace_mgr::trace*> trace_list;
simgrid::trace_mgr::trace::trace()=default;
simgrid::trace_mgr::trace::~trace()=default;
xbt_heap_free(p_heap);
}
-tmgr_trace_t tmgr_trace_new_from_string(const char *name, const char *input, double periodicity)
+tmgr_trace_t tmgr_trace_new_from_string(const char* name, std::string input, double periodicity)
{
int linecount = 0;
- tmgr_event_t last_event = nullptr;
- unsigned int cpt;
- char *val;
+ tmgr_event_t last_event = nullptr; // last event seen
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);
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) {
+ std::vector<std::string> list;
+ boost::split(list, input, boost::is_any_of("\n\r"));
+ for (auto val : list) {
s_tmgr_event_t event;
linecount++;
- xbt_str_trim(val, " \t\n\r\x0B");
+ 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;
- xbt_assert(sscanf(val, "%lg" " " "%lg" "\n", &event.delta, &event.value) == 2,
- "%s:%d: Syntax error in trace\n%s", name, linecount, input);
+ xbt_assert(sscanf(val.c_str(), "%lg %lg\n", &event.delta, &event.value) == 2, "%s:%d: Syntax error in trace\n%s",
+ name, linecount, input.c_str());
if (last_event) {
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);
+ "%s:%d: Invalid trace: Events must be sorted, but time %g > time %g.\n%s", name, linecount,
+ last_event->delta, event.delta, input.c_str());
last_event->delta = event.delta - last_event->delta;
} else {
- if(event.delta > 0.0){
+ /* We need to add the first fake event stating the time at which the trace begins */
+ if (event.delta > 0.0) {
s_tmgr_event_t first_event;
first_event.delta=event.delta;
first_event.value=-1.0;
trace->event_list.push_back(event);
last_event = &(trace->event_list.back());
}
- if (last_event)
- last_event->delta = periodicity;
+ if (last_event) {
+ last_event->delta = periodicity > 0 ? periodicity + trace->event_list.at(0).delta : -1;
+ }
trace_list.insert({xbt_strdup(name), trace});
- xbt_dynar_free(&list);
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 != nullptr, "Cannot open file '%s' (path=%s)", filename, (boost::join(surf_path, ":")).c_str());
+ std::ifstream* f = surf_ifsopen(filename);
+ xbt_assert(!f->fail(), "Cannot open file '%s' (path=%s)", filename, (boost::join(surf_path, ":")).c_str());
+
+ std::stringstream buffer;
+ buffer << f->rdbuf();
+ tmgr_trace_t trace = tmgr_trace_new_from_string(filename, buffer.str(), -1);
- char *tstr = xbt_str_from_file(f);
- fclose(f);
- tmgr_trace_t trace = tmgr_trace_new_from_string(filename, tstr, 0.);
- xbt_free(tstr);
+ delete f;
return trace;
}
}
/** @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)
+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)
if (trace_iterator->idx < trace->event_list.size() - 1) {
xbt_heap_push(p_heap, trace_iterator, event_date + event->delta);
trace_iterator->idx++;
- } else if (event->delta > 0) { /* Last element, checking for periodicity */
+ } else if (event->delta > 0) { /* Last element. Shall we loop? */
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 */
+ 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;
}
