X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttv%2Flttv%2Ftraceset-process.c;h=dc45b17d3a88c043f23f5bdfed06ceae150b7f4f;hb=993046ef12d5b804119ef2f742cb7fa2f9835218;hp=b49542f9fb7aea400464c472fbb562f6931fdc49;hpb=88bf15f0f2a239186b5cf6fcf8711786907ca483;p=lttv.git

diff --git a/lttv/lttv/traceset-process.c b/lttv/lttv/traceset-process.c
index b49542f9..dc45b17d 100644
--- 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;
 			}
@@ -243,6 +243,8 @@ guint lttv_process_traceset_seek_n_backward(LttvTraceset *ts,
         beginPos.bt_pos = &pos;
         beginPos.iter = ts->iter;
         beginPos.bt_pos->type = BT_SEEK_BEGIN;
+        beginPos.timestamp = G_MAXUINT64;
+        beginPos.cpu_id = INT_MAX;
         /*Save initial position of the traceset*/
         initialPos = lttv_traceset_create_current_position (ts);
         
@@ -274,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);