sync with babeltrace api changes

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

diff --git a/src/common.c b/src/common.c
index 3f9e2add74b6bdfd4ea4dacccdfcd6ee2cb0154f..9f89391b612af6a485fcc6a1167fcf63527dcf99 100644 (file)
--- 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);
@@ -131,7 +131,7 @@ uint64_t get_context_vppid(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);
@@ -578,7 +578,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, ppid, vtid, vpid, vppid;

diff --git a/src/cputop.c b/src/cputop.c
index 754179cd361a9f0b820451ac12a9c6c5d321d81a..65cafb5fdb992703a01c0d72422207be724caa45 100644 (file)
--- a/src/cputop.c
+++ b/src/cputop.c
@@ -50,7 +50,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;
@@ -105,7 +105,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 55a6167bfab962a2a1bfc8ead0135f10820aee2f..367fdee6ef2e281c2cbcbde3bc0019b74872ac08 100644 (file)
--- a/src/iostreamtop.c
+++ b/src/iostreamtop.c
@@ -267,7 +267,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;
@@ -312,7 +312,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;
@@ -358,7 +358,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;
@@ -406,7 +406,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;
@@ -451,7 +451,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;
@@ -493,7 +493,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 3e556b9c4a76233e1fd6c7a00b5f92253a39bad6..1378d6674294f6cb994ed7094ac78a2a4ace24e0 100644 (file)
--- a/src/lttngtop.c
+++ b/src/lttngtop.c
@@ -349,12 +349,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;
@@ -389,7 +389,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));
 
@@ -779,7 +779,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;