Fix typo in comment

[lttv.git] / lttv / lttv / traceset-process.c

diff --git a/lttv/lttv/traceset-process.c b/lttv/lttv/traceset-process.c
index a41edc2a9c3cb4c73d13335b453670f2517d5904..5f6df65257a612ca7cc97f99515b0a7a76097cc0 100644 (file)
--- a/lttv/lttv/traceset-process.c
+++ b/lttv/lttv/traceset-process.c
@@ -65,7 +65,11 @@ guint lttv_process_traceset_middle(LttvTraceset *traceset,
        struct bt_ctf_event *bt_event;
        
        LttvEvent event;
-  
+       LttTime endPositionTime;
+
+       if(end_position) {
+               endPositionTime = lttv_traceset_position_get_time(end_position);
+       }
        while(TRUE) {
 
                if(last_ret == TRUE || ((count >= nb_events) && (nb_events != G_MAXULONG))) {
@@ -78,18 +82,22 @@ guint lttv_process_traceset_middle(LttvTraceset *traceset,
                        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);
                                break;
                        }
                        lttv_traceset_destroy_position(currentPos);
+                       */
+                       if(end_position && (ltt_time_compare(endPositionTime, time) <= 0)) {
+                               break;
+                       }
                        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));
                        
@@ -276,10 +284,20 @@ guint lttv_process_traceset_seek_n_backward(LttvTraceset *ts,
                 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);