Fix seek n backward that did not check the end of a trace

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

diff --git a/lttv/lttv/traceset-process.c b/lttv/lttv/traceset-process.c
index 02b014180b6b7521039aa3fc31fc3de3f1f2c501..dc45b17d3a88c043f23f5bdfed06ceae150b7f4f 100644 (file)
--- a/lttv/lttv/traceset-process.c
+++ b/lttv/lttv/traceset-process.c
@@ -74,7 +74,7 @@ guint lttv_process_traceset_middle(LttvTraceset *traceset,
 
                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;
                        }
@@ -276,10 +276,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) != NULL) {
+                                       lttv_traceset_destroy_position(currentPos);
+                                       currentPos = lttv_traceset_create_current_position(ts);
+                                       count++;
+                                       } else  {
+                                               break;
+                                       }
+                                       
+                               } else {
+
+                                       //No more event available
+                                       break;
+                               }
                         }
                 }while(ret != 0);