* 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 "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 <math.h>
#include <unordered_map>
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), NULL);
-}
-
-simgrid::trace_mgr::trace::~trace()
-{
- xbt_dynar_free(&event_list);
-}
-simgrid::trace_mgr::future_evt_set::future_evt_set()
-{
-}
+simgrid::trace_mgr::trace::trace()=default;
+simgrid::trace_mgr::trace::~trace()=default;
+simgrid::trace_mgr::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, const char *input, double periodicity)
{
int linecount = 0;
- tmgr_event_t last_event = NULL;
- unsigned int cpt;
- char *val;
+ tmgr_event_t last_event = nullptr;
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;
- xbt_assert(sscanf(val, "%lg" " " "%lg" "\n", &event.delta, &event.value) == 2,
+ 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);
if (last_event) {
s_tmgr_event_t first_event;
first_event.delta=event.delta;
first_event.value=-1.0;
- xbt_dynar_push(trace->event_list, &first_event);
+ trace->event_list.push_back(first_event);
}
}
- 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);
+ trace->event_list.push_back(event);
+ last_event = &(trace->event_list.back());
}
if (last_event)
last_event->delta = periodicity;
trace_list.insert({xbt_strdup(name), trace});
- xbt_dynar_free(&list);
return trace;
}
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,
- "Cannot open file '%s' (path=%s)", filename, xbt_str_join(surf_path, ":"));
+ xbt_assert(f != nullptr, "Cannot open file '%s' (path=%s)", filename, (boost::join(surf_path, ":")).c_str());
char *tstr = xbt_str_from_file(f);
fclose(f);
return trace;
}
-tmgr_trace_t tmgr_empty_trace_new(void)
+tmgr_trace_t tmgr_empty_trace_new()
{
tmgr_trace_t trace = new simgrid::trace_mgr::trace();
s_tmgr_event_t event;
event.delta = 0.0;
event.value = 0.0;
- xbt_dynar_push(trace->event_list, &event);
+ trace->event_list.push_back(event);
return 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;
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);
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;
- tmgr_event_t event = (tmgr_event_t)xbt_dynar_get_ptr(trace->event_list, trace_iterator->idx);
+ tmgr_event_t event = &(trace->event_list.at(trace_iterator->idx));
*value = event->value;
- if (trace_iterator->idx < xbt_dynar_length(trace->event_list) - 1) {
+ 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 */
return trace_iterator;
}
-void tmgr_finalize(void)
+void tmgr_finalize()
{
for (auto kv : trace_list) {
xbt_free((char*)kv.first);
