Fix compatibility with d40ee8ec4ac9998f Babeltrace API cleanup name get_timestamp

Signed-off-by: Francis Deslauriers <francis.deslauriers@polymtl.ca>
Signed-off-by: Yannick Brosseau <yannick.brosseau@gmail.com>

diff --git a/lttv/lttv/event.c b/lttv/lttv/event.c
index be5f936503e9349ece54005db9a0a8519db0e0ae..8c1b6d8021e359af29ccba2d1c3f15b932324325 100644 (file)
--- a/lttv/lttv/event.c
+++ b/lttv/lttv/event.c
@@ -7,7 +7,7 @@
 
 LttTime lttv_event_get_timestamp(LttvEvent *event)
 {
-  return ltt_time_from_uint64(bt_ctf_get_timestamp_raw(event->bt_event));
+  return ltt_time_from_uint64(bt_ctf_get_timestamp(event->bt_event));
 }
 
 //TODO ybrosseau find a way to return an error code

diff --git a/lttv/lttv/print.c b/lttv/lttv/print.c
index 6ad93419db09fdc28de9f98fff1be751c8fbd668..758f7af30a51930f2d6f6b54a0e67346447a3b1a 100644 (file)
--- a/lttv/lttv/print.c
+++ b/lttv/lttv/print.c
@@ -444,7 +444,7 @@ void lttv_event_to_string(LttvEvent *event, GString *a_string,
        g_string_set_size(a_string,0);
        if(long_version){
                g_string_append_printf(a_string, "%llu %s: ", 
-                                      bt_ctf_get_timestamp_raw(event->bt_event), 
+                                      bt_ctf_get_timestamp(event->bt_event), 
                                       bt_ctf_event_name(event->bt_event));
        }
        g_string_append_printf(a_string, "{ %s }", cpuId_str->str);

diff --git a/lttv/lttv/state.c b/lttv/lttv/state.c
index 67ba3025076bb283cf6dbdd9033a244838d4c93d..2347bf2da3ea2691f5ed7276483a721fbe5f0a4f 100644 (file)
--- a/lttv/lttv/state.c
+++ b/lttv/lttv/state.c
@@ -411,7 +411,7 @@ static void restore_init_state(LttvTraceState *self)
 
        start_time = ltt_time_from_uint64(
                            bt_trace_handle_get_timestamp_begin(self->trace->traceset->context, 
-                                                               self->trace->id));
+                                                               self->trace->id,BT_CLOCK_REAL));
 
 
        //lttv_process_trace_seek_time(&self->parent, ltt_time_zero);

diff --git a/lttv/lttv/traceset-process.c b/lttv/lttv/traceset-process.c
index 02b014180b6b7521039aa3fc31fc3de3f1f2c501..a41edc2a9c3cb4c73d13335b453670f2517d5904 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;
                        }

diff --git a/lttv/lttv/traceset.c b/lttv/lttv/traceset.c
index af65190e0c1e069f67840e0a2dabe4b3cb0d8a60..f91010e02aeecc84deafadd8ee80ad826e7df05f 100644 (file)
--- a/lttv/lttv/traceset.c
+++ b/lttv/lttv/traceset.c
@@ -72,7 +72,7 @@ LttvTraceset *lttv_traceset_new(void)
 
        ts->time_span.start_time = ltt_time_zero;
         ts->time_span.end_time = ltt_time_zero;
-
+       lttv_traceset_get_time_span_real(ts);
        return ts;
 }
 
@@ -550,7 +550,8 @@ guint64 lttv_traceset_get_timestamp_begin(LttvTraceset *traceset)
                 {
                         currentTrace = g_ptr_array_index(traceset->traces,i);
                         timestamp_cur = bt_trace_handle_get_timestamp_begin(bt_ctx,
-                                                                        currentTrace->id);
+                                                                       currentTrace->id,
+                                                                       BT_CLOCK_REAL);
                         if(timestamp_cur < timestamp_min)
                                 timestamp_min = timestamp_cur;
                 }
@@ -582,7 +583,8 @@ guint64 lttv_traceset_get_timestamp_end(LttvTraceset *traceset)
                {
                        currentTrace = g_ptr_array_index(traceset->traces,i);
                        timestamp_cur = bt_trace_handle_get_timestamp_end(bt_ctx,
-                                                                       currentTrace->id);
+                                                                       currentTrace->id,
+                                                                       BT_CLOCK_REAL);
                        if(timestamp_cur > timestamp_max){
                                timestamp_max = timestamp_cur;
                        }
@@ -604,7 +606,7 @@ TimeInterval lttv_traceset_get_time_span_real(LttvTraceset *ts)
                ts->time_span.start_time = ltt_time_from_uint64(
                                lttv_traceset_get_timestamp_first_event(ts));
                ts->time_span.end_time = ltt_time_from_uint64(
-                               lttv_traceset_get_timestamp_last_event(ts));
+                                       lttv_traceset_get_timestamp_end(ts));
        }
         return ts->time_span;
 #else
@@ -644,7 +646,7 @@ int set_values_position(const LttvTracesetPosition *pos)
        struct bt_ctf_event *event = bt_ctf_iter_read_event(pos->iter);
 
        if(event != NULL){
-               ((LttvTracesetPosition *)pos)->timestamp = bt_ctf_get_timestamp_raw(event); 
+               ((LttvTracesetPosition *)pos)->timestamp = bt_ctf_get_timestamp(event); 
                
                LttvEvent lttv_event;
                lttv_event.bt_event = event;
@@ -659,6 +661,7 @@ int set_values_position(const LttvTracesetPosition *pos)
        lttv_traceset_seek_to_position(&previous_pos);
        /*We must desallocate because the function bt_iter_get_pos() does a g_new */
        bt_iter_free_pos(previous_pos.bt_pos);
+       return 1;
 }
 
 guint64 lttv_traceset_position_get_timestamp(const LttvTracesetPosition *pos)