{
unsigned count = 0;
gint last_ret = 0;
- LttvTracesetPosition *currentPos;
struct bt_ctf_event *bt_event;
LttvEvent event;
-
+ LttTime endPositionTime;
+
+ //TODO ybrosseau 2013-10-17: Compare with end_position directly when its possible
+ if(end_position) {
+ endPositionTime = lttv_traceset_position_get_time(end_position);
+ }
while(TRUE) {
if(last_ret == TRUE || ((count >= nb_events) && (nb_events != G_MAXULONG))) {
if((bt_event = bt_ctf_iter_read_event(traceset->iter)) != NULL) {
- LttTime time = ltt_time_from_uint64(bt_ctf_get_timestamp_raw(bt_event));
+ LttTime time = ltt_time_from_uint64(bt_ctf_get_timestamp(bt_event));
if(ltt_time_compare(end, time) <= 0) {
break;
}
-
- currentPos = lttv_traceset_create_current_position(traceset);
- if(lttv_traceset_position_compare(currentPos,end_position ) == 0){
- lttv_traceset_destroy_position(currentPos);
+ //TODO ybrosseau 2013-10-17: Compare with end_position directly when its possible
+ if(end_position && (ltt_time_compare(endPositionTime, time) <= 0)) {
break;
}
- lttv_traceset_destroy_position(currentPos);
count++;
event.bt_event = bt_event;
- /* Retreive the associated state */
+ /* Retrieve the associated state */
event.state = g_ptr_array_index(traceset->state_trace_handle_index,
bt_ctf_event_get_handle_id(bt_event));
count = 0;
do {
if((ret = lttv_traceset_position_compare(currentPos,initialPos)) == 1){
- bt_iter_next(bt_ctf_get_iter(ts->iter));
- lttv_traceset_destroy_position(currentPos);
- currentPos = lttv_traceset_create_current_position(ts);
- count++;
+ if(bt_iter_next(bt_ctf_get_iter(ts->iter)) == 0) {
+ if(bt_ctf_iter_read_event(ts->iter) > 0) {
+ lttv_traceset_destroy_position(currentPos);
+ currentPos = lttv_traceset_create_current_position(ts);
+ count++;
+ } else {
+ break;
+ }
+
+ } else {
+
+ //No more event available
+ break;
+ }
}
}while(ret != 0);