A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow to mark actors as daemon
[simgrid.git]
/
src
/
surf
/
trace_mgr.cpp
diff --git
a/src/surf/trace_mgr.cpp
b/src/surf/trace_mgr.cpp
index
32558c2
..
ddd0708
100644
(file)
--- a/
src/surf/trace_mgr.cpp
+++ b/
src/surf/trace_mgr.cpp
@@
-9,86
+9,73
@@
#include "xbt/str.h"
#include "xbt/dict.h"
#include "src/surf/trace_mgr.hpp"
#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 <math.h>
#include "surf_private.h"
#include "xbt/RngStream.h"
#include <math.h>
+#include <unordered_map>
+#include <boost/algorithm/string/join.hpp>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_trace, surf, "Surf trace management");
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::
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()
{
xbt_heap_free(p_heap);
}
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;
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;
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(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);
- 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) {
xbt_dynar_foreach(list, cpt, val) {
+ s_tmgr_event_t event;
linecount++;
xbt_str_trim(val, " \t\n\r\x0B");
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;
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) {
- 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){
s_tmgr_event_t first_event;
first_event.delta=event.delta;
first_event.value=-1.0;
last_event->delta = event.delta - last_event->delta;
} 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);
+
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;
}
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;
xbt_dynar_free(&list);
return trace;
@@
-96,66
+83,47
@@
tmgr_trace_t tmgr_trace_new_from_string(const char *id, const char *input, doubl
tmgr_trace_t tmgr_trace_new_from_file(const char *filename)
{
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");
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);
char *tstr = xbt_str_from_file(f);
fclose(f);
- trace = tmgr_trace_new_from_string(filename, tstr, 0.);
+ t
mgr_trace_t t
race = tmgr_trace_new_from_string(filename, tstr, 0.);
xbt_free(tstr);
return trace;
}
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;
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;
event.delta = 0.0;
event.value = 0.0;
-
xbt_dynar_push(trace->event_list, &
event);
+
trace->event_list.push_back(
event);
return trace;
}
void tmgr_trace_free(tmgr_trace_t trace)
{
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)
{
}
/** @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;
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, start_time);
@@
-171,26
+139,26
@@
double simgrid::trace_mgr::future_evt_set::next_date() const
return -1.0;
}
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)
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);
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_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;
*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 */
xbt_heap_push(p_heap, trace_iterator, event_date + event->delta);
trace_iterator->idx++;
} else if (event->delta > 0) { /* Last element, checking for periodicity */
@@
-203,9
+171,12
@@
tmgr_trace_iterator_t simgrid::trace_mgr::future_evt_set::pop_leq(
return trace_iterator;
}
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_iterator_t *trace_event)