From: Francis Deslauriers <francis.deslauriers@polymtl.ca>
Date: Thu, 9 Aug 2012 20:34:20 +0000 (-0400)
Subject: Fix compatibility with d40ee8ec4ac9998f Babeltrace API cleanup name get_timestamp
X-Git-Tag: v1.5-beta1~45
X-Git-Url: https://git.lttng.org/?p=lttv.git;a=commitdiff_plain;h=762e15b0a733522038a5673e68ba24be8ea1d41b

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 be5f9365..8c1b6d80 100644
--- 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 6ad93419..758f7af3 100644
--- 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 67ba3025..2347bf2d 100644
--- 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 02b01418..a41edc2a 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;
 			}
diff --git a/lttv/lttv/traceset.c b/lttv/lttv/traceset.c
index af65190e..f91010e0 100644
--- 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)