double date, double *value, simgrid::surf::Resource **resource)
{
double event_date = next_date();
- tmgr_trace_iterator_t trace_iterator = NULL;
- tmgr_event_t event = NULL;
- tmgr_trace_t trace = NULL;
- double event_delta;
-
if (event_date > date)
return NULL;
- if (!(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;
- trace = trace_iterator->trace;
+ tmgr_trace_t trace = trace_iterator->trace;
*resource = trace_iterator->resource;
- switch(trace->type) {
- case e_trace_list:
+ if (trace->type == 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->s_list.event_list, trace_iterator->idx);
*value = event->value;
} else { /* We don't need this trace_event anymore */
trace_iterator->free_me = 1;
}
- break;
-
- case e_trace_probabilist:
- //FIXME : not tested yet
+ } else if (trace->type == e_trace_probabilist) { //FIXME : not tested yet
+ double event_delta;
if(trace->s_probabilist.is_state_trace) {
*value = (double) trace->s_probabilist.next_event;
if(trace->s_probabilist.next_event == 0) {
xbt_heap_push(p_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;
- }
+ } else
+ THROW_IMPOSSIBLE;
return trace_iterator;
}