X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Flttngtop.c;h=fa412ae6313b8fb98a54c6caecdef466e6a7ab33;hb=2e0a1190d76a53891ca22cfd6082d9b45581d83e;hp=521e085ebd6dbd8996072de9a20cc907aa54089a;hpb=094632060f50c0a268794c70e0650167c5c51fb8;p=lttngtop.git

diff --git a/src/lttngtop.c b/src/lttngtop.c
index 521e085..fa412ae 100644
--- a/src/lttngtop.c
+++ b/src/lttngtop.c
@@ -121,7 +121,7 @@ enum bt_cb_ret check_timestamp(struct bt_ctf_event *call_data, void *private_dat
 {
 	unsigned long timestamp;
 
-	timestamp = bt_ctf_get_real_timestamp(call_data);
+	timestamp = bt_ctf_get_timestamp(call_data);
 	if (timestamp == -1ULL)
 		goto error;
 
@@ -190,12 +190,12 @@ void update_perf_value(struct processtop *proc, struct cputime *cpu,
 }
 
 void extract_perf_counter_scope(const struct bt_ctf_event *event,
-		const struct definition *scope,
+		const struct bt_definition *scope,
 		struct processtop *proc,
 		struct cputime *cpu)
 {
-	struct definition const * const *list = NULL;
-	const struct definition *field;
+	struct bt_definition const * const *list = NULL;
+	const struct bt_definition *field;
 	unsigned int count;
 	struct perfcounter *perfcounter;
 	GHashTableIter iter;
@@ -230,7 +230,7 @@ end:
 void update_perf_counter(struct processtop *proc, const struct bt_ctf_event *event)
 {
 	struct cputime *cpu;
-	const struct definition *scope;
+	const struct bt_definition *scope;
 
 	cpu = get_cpu(get_cpu_id(event));
 
@@ -252,7 +252,7 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
 	struct processtop *parent, *child;
 	unsigned long timestamp;
 
-	timestamp = bt_ctf_get_real_timestamp(call_data);
+	timestamp = bt_ctf_get_timestamp(call_data);
 	if (timestamp == -1ULL)
 		goto error;
 
@@ -451,7 +451,7 @@ end_iter:
  */
 int bt_context_add_traces_recursive(struct bt_context *ctx, const char *path,
 		const char *format_str,
-		void (*packet_seek)(struct stream_pos *pos,
+		void (*packet_seek)(struct bt_stream_pos *pos,
 			size_t offset, int whence))
 {
 	FTS *tree;
@@ -544,7 +544,7 @@ static int check_field_requirements(const struct bt_ctf_field_decl *const * fiel
 				(*tid_check)++;
 		}
 		if (*pid_check == 0) {
-			if (strncmp(name, "tid", 3) == 0)
+			if (strncmp(name, "pid", 3) == 0)
 				(*pid_check)++;
 		}
 		if (*ppid_check == 0) {