static xbt_dict_t trace_list = NULL;
-tmgr_fes_t tmgr_history_new(void)
-{
- tmgr_fes_t h;
-
- h = xbt_new0(s_tmgr_history_t, 1);
-
- h->heap = xbt_heap_new(8, xbt_free_f); /* Why 8 ? Well, why not... */
-
- return h;
+simgrid::trace_mgr::future_evt_set::future_evt_set() {
}
-void tmgr_history_free(tmgr_fes_t h)
+simgrid::trace_mgr::future_evt_set::~future_evt_set()
{
- xbt_heap_free(h->heap);
- free(h);
+ xbt_heap_free(p_heap);
}
-
+#if 0 /* probabilistic dead code. Should be reimplemented, not killed (please) */
/**
* \brief Create a #tmgr_trace_t from probabilist generators
*
return generator->next_value;
}
+#endif /* probabilistic dead code */
tmgr_trace_t tmgr_trace_new_from_string(const char *id, const char *input,
double periodicity)
"Invalid periodicity %g (must be positive)", periodicity);
trace = xbt_new0(s_tmgr_trace_t, 1);
- trace->type = e_trace_list;
- trace->s_list.event_list = xbt_dynar_new(sizeof(s_tmgr_event_t), NULL);
+ trace->event_list = xbt_dynar_new(sizeof(s_tmgr_event_t), NULL);
list = xbt_str_split(input, "\n\r");
s_tmgr_event_t first_event;
first_event.delta=event.delta;
first_event.value=-1.0;
- xbt_dynar_push(trace->s_list.event_list, &first_event);
+ xbt_dynar_push(trace->event_list, &first_event);
}
}
- xbt_dynar_push(trace->s_list.event_list, &event);
- last_event = (tmgr_event_t)xbt_dynar_get_ptr(trace->s_list.event_list, xbt_dynar_length(trace->s_list.event_list) - 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;
tmgr_trace_t tmgr_trace_new_from_file(const char *filename)
{
- char *tstr = NULL;
- FILE *f = NULL;
tmgr_trace_t trace = NULL;
if ((!filename) || (strcmp(filename, "") == 0))
}
}
- f = surf_fopen(filename, "r");
- if (f == NULL)
- xbt_die("Cannot open file '%s' (path=%s)", filename,
- xbt_str_join(surf_path, ":"));
+ FILE *f = surf_fopen(filename, "r");
+ xbt_assert(f != NULL,
+ "Cannot open file '%s' (path=%s)", filename, xbt_str_join(surf_path, ":"));
- tstr = xbt_str_from_file(f);
+ char *tstr = xbt_str_from_file(f);
fclose(f);
trace = tmgr_trace_new_from_string(filename, tstr, 0.);
xbt_free(tstr);
s_tmgr_event_t event;
trace = xbt_new0(s_tmgr_trace_t, 1);
- trace->type = e_trace_list;
- trace->s_list.event_list = xbt_dynar_new(sizeof(s_tmgr_event_t), NULL);
+ trace->event_list = xbt_dynar_new(sizeof(s_tmgr_event_t), NULL);
event.delta = 0.0;
event.value = 0.0;
- xbt_dynar_push(trace->s_list.event_list, &event);
+ xbt_dynar_push(trace->event_list, &event);
return trace;
}
if (!trace)
return;
- switch(trace->type) {
- case e_trace_list:
- xbt_dynar_free(&(trace->s_list.event_list));
- break;
- case e_trace_probabilist:
- THROW_UNIMPLEMENTED;
- break;
- }
+ xbt_dynar_free(&(trace->event_list));
free(trace);
}
-tmgr_trace_iterator_t tmgr_history_add_trace(tmgr_fes_t h,
- tmgr_trace_t trace,
- double start_time,
- unsigned int offset, void *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;
trace_iterator = xbt_new0(s_tmgr_trace_event_t, 1);
trace_iterator->trace = trace;
- trace_iterator->idx = offset;
+ trace_iterator->idx = 0;
trace_iterator->resource = resource;
- if(trace->type == e_trace_list) {
- xbt_assert((trace_iterator->idx < xbt_dynar_length(trace->s_list.event_list)),
- "You're referring to an event that does not exist!");
- }
+ xbt_assert((trace_iterator->idx < xbt_dynar_length(trace->event_list)),
+ "Your trace should have at least one event!");
- xbt_heap_push(h->heap, trace_iterator, start_time);
+ xbt_heap_push(p_heap, trace_iterator, start_time);
return trace_iterator;
}
-XBT_INLINE double tmgr_history_next_date(tmgr_fes_t h)
+/** @brief returns the date of the next occurring event (pure function) */
+double simgrid::trace_mgr::future_evt_set::next_date() const
{
- if (xbt_heap_size(h->heap))
- return (xbt_heap_maxkey(h->heap));
+ if (xbt_heap_size(p_heap))
+ return (xbt_heap_maxkey(p_heap));
else
return -1.0;
}
-tmgr_trace_iterator_t tmgr_history_get_next_event_leq(tmgr_fes_t h,
- double date,
- double *value,
- void** resource)
+/** @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)
{
- double event_date = tmgr_history_next_date(h);
- tmgr_trace_iterator_t trace_iterator = NULL;
- tmgr_event_t event = NULL;
- tmgr_trace_t trace = NULL;
- double event_delta;
-
+ double event_date = next_date();
if (event_date > date)
return NULL;
- if (!(trace_iterator = (tmgr_trace_iterator_t)xbt_heap_pop(h->heap)))
+ tmgr_trace_iterator_t trace_iterator = (tmgr_trace_iterator_t)xbt_heap_pop(p_heap);
+ if (trace_iterator == NULL)
return NULL;
- trace = trace_iterator->trace;
+ tmgr_trace_t trace = trace_iterator->trace;
*resource = trace_iterator->resource;
- switch(trace->type) {
- case e_trace_list:
-
- event = (tmgr_event_t)xbt_dynar_get_ptr(trace->s_list.event_list, trace_iterator->idx);
+ tmgr_event_t event = (tmgr_event_t)xbt_dynar_get_ptr(trace->event_list, trace_iterator->idx);
- *value = event->value;
+ *value = event->value;
- if (trace_iterator->idx < xbt_dynar_length(trace->s_list.event_list) - 1) {
- xbt_heap_push(h->heap, trace_iterator, event_date + event->delta);
- trace_iterator->idx++;
- } else if (event->delta > 0) { /* Last element, checking for periodicity */
- xbt_heap_push(h->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->free_me = 1;
- }
- break;
-
- case e_trace_probabilist:
-
- //FIXME : not tested yet
- if(trace->s_probabilist.is_state_trace) {
- *value = (double) trace->s_probabilist.next_event;
- if(trace->s_probabilist.next_event == 0) {
- event_delta = tmgr_event_generator_next_value(trace->s_probabilist.event_generator[0]);
- trace->s_probabilist.next_event = 1;
- } else {
- event_delta = tmgr_event_generator_next_value(trace->s_probabilist.event_generator[1]);
- trace->s_probabilist.next_event = 0;
- }
- } else {
- event_delta = tmgr_event_generator_next_value(trace->s_probabilist.event_generator[0]);
- *value = tmgr_event_generator_next_value(trace->s_probabilist.event_generator[1]);
- }
- xbt_heap_push(h->heap, trace_iterator, event_date + event_delta);
- XBT_DEBUG("Generating a new event at date %f, with value %f", event_date + event_delta, *value);
-
- break;
+ if (trace_iterator->idx < xbt_dynar_length(trace->event_list) - 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 = 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->free_me = 1;
}
return trace_iterator;
xbt_dict_free(&trace_list);
}
-int tmgr_trace_event_free(tmgr_trace_iterator_t trace_event)
+void tmgr_trace_event_unref(tmgr_trace_iterator_t *trace_event)
{
- if (trace_event->free_me) {
- xbt_free(trace_event);
- return 1;
+ if ((*trace_event)->free_me) {
+ xbt_free(*trace_event);
+ *trace_event = nullptr;
}
- return 0;
}