From: Julien Desfossez <jdesfossez@efficios.com>
Date: Wed, 27 Feb 2013 15:14:50 +0000 (-0500)
Subject: sync with babeltrace api changes
X-Git-Tag: v0.3~121
X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=commitdiff_plain;h=2e0a1190d76a53891ca22cfd6082d9b45581d83e

sync with babeltrace api changes

Signed-off-by: Julien Desfossez <jdesfossez@efficios.com>
---

diff --git a/src/common.c b/src/common.c
index c939847..f741a29 100644
--- a/src/common.c
+++ b/src/common.c
@@ -23,7 +23,7 @@
 
 uint64_t get_cpu_id(const struct bt_ctf_event *event)
 {
-	const struct definition *scope;
+	const struct bt_definition *scope;
 	uint64_t cpu_id;
 
 	scope = bt_ctf_get_top_level_scope(event, BT_STREAM_PACKET_CONTEXT);
@@ -38,7 +38,7 @@ uint64_t get_cpu_id(const struct bt_ctf_event *event)
 
 uint64_t get_context_tid(const struct bt_ctf_event *event)
 {
-	const struct definition *scope;
+	const struct bt_definition *scope;
 	uint64_t tid;
 
 	scope = bt_ctf_get_top_level_scope(event, BT_STREAM_EVENT_CONTEXT);
@@ -54,7 +54,7 @@ uint64_t get_context_tid(const struct bt_ctf_event *event)
 
 uint64_t get_context_pid(const struct bt_ctf_event *event)
 {
-	const struct definition *scope;
+	const struct bt_definition *scope;
 	uint64_t pid;
 
 	scope = bt_ctf_get_top_level_scope(event, BT_STREAM_EVENT_CONTEXT);
@@ -70,7 +70,7 @@ uint64_t get_context_pid(const struct bt_ctf_event *event)
 
 uint64_t get_context_ppid(const struct bt_ctf_event *event)
 {
-	const struct definition *scope;
+	const struct bt_definition *scope;
 	uint64_t ppid;
 
 	scope = bt_ctf_get_top_level_scope(event, BT_STREAM_EVENT_CONTEXT);
@@ -86,7 +86,7 @@ uint64_t get_context_ppid(const struct bt_ctf_event *event)
 
 char *get_context_comm(const struct bt_ctf_event *event)
 {
-	const struct definition *scope;
+	const struct bt_definition *scope;
 	char *comm;
 
 	scope = bt_ctf_get_top_level_scope(event, BT_STREAM_EVENT_CONTEXT);
@@ -464,7 +464,7 @@ struct lttngtop* get_copy_lttngtop(unsigned long start, unsigned long end)
 enum bt_cb_ret handle_statedump_process_state(struct bt_ctf_event *call_data,
 		void *private_data)
 {
-	const struct definition *scope;
+	const struct bt_definition *scope;
 	struct processtop *proc;
 	unsigned long timestamp;
 	int64_t pid, tid;
diff --git a/src/cputop.c b/src/cputop.c
index eb7afb3..a0ff279 100644
--- a/src/cputop.c
+++ b/src/cputop.c
@@ -48,7 +48,7 @@ void update_cputop_data(unsigned long timestamp, int64_t cpu, int prev_pid,
 enum bt_cb_ret handle_sched_switch(struct bt_ctf_event *call_data,
 		void *private_data)
 {
-	const struct definition *scope;
+	const struct bt_definition *scope;
 	unsigned long timestamp;
 	uint64_t cpu_id;
 	char *prev_comm, *next_comm;
@@ -102,7 +102,7 @@ error:
 enum bt_cb_ret handle_sched_process_free(struct bt_ctf_event *call_data,
 		void *private_data)
 {
-	const struct definition *scope;
+	const struct bt_definition *scope;
 	unsigned long timestamp;
 	char *comm;
 	int tid;
diff --git a/src/iostreamtop.c b/src/iostreamtop.c
index bda9c7c..e280a33 100644
--- a/src/iostreamtop.c
+++ b/src/iostreamtop.c
@@ -260,7 +260,7 @@ struct file_history *create_file(struct file_history *history, char *file_name)
 enum bt_cb_ret handle_exit_syscall(struct bt_ctf_event *call_data,
 		void *private_data)
 {
-	const struct definition *scope;
+	const struct bt_definition *scope;
 	unsigned long timestamp;
 	char *comm;
 	uint64_t ret, tid;
@@ -302,7 +302,7 @@ error:
 enum bt_cb_ret handle_sys_write(struct bt_ctf_event *call_data,
 		void *private_data)
 {
-	const struct definition *scope;
+	const struct bt_definition *scope;
 	struct processtop *tmp;
 	unsigned long timestamp;
 	uint64_t cpu_id;
@@ -343,7 +343,7 @@ enum bt_cb_ret handle_sys_read(struct bt_ctf_event *call_data,
 		void *private_data)
 {
 	struct processtop *tmp;
-	const struct definition *scope;
+	const struct bt_definition *scope;
 	unsigned long timestamp;
 	uint64_t cpu_id;
 	int64_t tid;
@@ -385,7 +385,7 @@ enum bt_cb_ret handle_sys_open(struct bt_ctf_event *call_data,
 {
 
 	struct processtop *tmp;
-	const struct definition *scope;
+	const struct bt_definition *scope;
 	unsigned long timestamp;
 	uint64_t cpu_id;
 	int64_t tid;
@@ -425,7 +425,7 @@ error:
 enum bt_cb_ret handle_sys_close(struct bt_ctf_event *call_data,
 		void *private_data)
 {
-	const struct definition *scope;
+	const struct bt_definition *scope;
 	struct processtop *tmp;
 	unsigned long timestamp;
 	int64_t tid;
@@ -462,7 +462,7 @@ error:
 enum bt_cb_ret handle_statedump_file_descriptor(struct bt_ctf_event *call_data,
 		void *private_data)
 {
-	const struct definition *scope;
+	const struct bt_definition *scope;
 	struct processtop *parent;
 	struct files *file;
 	unsigned long timestamp;
diff --git a/src/lttngtop.c b/src/lttngtop.c
index f78a865..fa412ae 100644
--- a/src/lttngtop.c
+++ b/src/lttngtop.c
@@ -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));
 
@@ -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;