sync with babeltrace api changes

[lttngtop.git] / src / iostreamtop.c

diff --git a/src/iostreamtop.c b/src/iostreamtop.c
index 7c1d611af8b74b1a7e6aa1ac566b2fbc5c8b52ad..e280a3382e8b382a7d08e18a5d96c470b6af738c 100644 (file)
--- a/src/iostreamtop.c
+++ b/src/iostreamtop.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 Mathieu Bain <mathieu.bain@polymtl.ca>
+ * Copyright (C) 2011-2012 Mathieu Bain <mathieu.bain@polymtl.ca>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License Version 2 as
@@ -31,13 +31,17 @@ void add_file(struct processtop *proc, struct files *file, int fd)
        struct files *tmp_file;
        struct processtop *parent;
        int size;
+       int i;
 
        size = proc->process_files_table->len;
        parent = proc->threadparent;
        if (parent)
                insert_file(parent, fd);
        if (size <= fd) {
-               g_ptr_array_set_size(proc->process_files_table, fd);
+               /* Add NULL file structures for undefined FDs */
+               for (i = size; i < fd; i++) {
+                       g_ptr_array_add(proc->process_files_table, NULL);
+               }
                g_ptr_array_add(proc->process_files_table, file);
        } else {
                tmp_file = g_ptr_array_index(proc->process_files_table, fd);
@@ -256,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;
@@ -298,11 +302,12 @@ 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;
-       int64_t tid, pid;
+       int64_t tid;
+       char *procname;
        int fd;
 
        timestamp = bt_ctf_get_timestamp(call_data);
@@ -312,7 +317,7 @@ enum bt_cb_ret handle_sys_write(struct bt_ctf_event *call_data,
        tid = get_context_tid(call_data);
        cpu_id = get_cpu_id(call_data);
 
-       pid = get_context_pid(call_data);
+       procname = get_context_comm(call_data);
 
        scope = bt_ctf_get_top_level_scope(call_data,
                        BT_EVENT_FIELDS);
@@ -323,7 +328,7 @@ enum bt_cb_ret handle_sys_write(struct bt_ctf_event *call_data,
                goto error;
        }
 
-       tmp = get_proc_pid(&lttngtop, tid, pid, timestamp);
+       tmp = get_proc(&lttngtop, tid, procname, timestamp);
        tmp->syscall_info = create_syscall_info(__NR_write, cpu_id, tid, fd);
 
        insert_file(tmp, fd);
@@ -338,10 +343,11 @@ 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, pid;
+       int64_t tid;
+       char *procname;
        int fd;
 
        timestamp = bt_ctf_get_timestamp(call_data);
@@ -351,7 +357,7 @@ enum bt_cb_ret handle_sys_read(struct bt_ctf_event *call_data,
        tid = get_context_tid(call_data);
        cpu_id = get_cpu_id(call_data);
 
-       pid = get_context_pid(call_data);
+       procname = get_context_comm(call_data);
 
        scope = bt_ctf_get_top_level_scope(call_data,
                        BT_EVENT_FIELDS);
@@ -362,7 +368,7 @@ enum bt_cb_ret handle_sys_read(struct bt_ctf_event *call_data,
                goto error;
        }
 
-       tmp = get_proc_pid(&lttngtop, tid, pid, timestamp);
+       tmp = get_proc(&lttngtop, tid, procname, timestamp);
        tmp->syscall_info = create_syscall_info(__NR_read, cpu_id, tid, fd);
 
        insert_file(tmp, fd);
@@ -379,10 +385,11 @@ 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, pid;
+       int64_t tid;
+       char *procname;
        char *file;
 
        timestamp = bt_ctf_get_timestamp(call_data);
@@ -392,7 +399,7 @@ enum bt_cb_ret handle_sys_open(struct bt_ctf_event *call_data,
        tid = get_context_tid(call_data);
        cpu_id = get_cpu_id(call_data);
 
-       pid = get_context_pid(call_data);
+       procname = get_context_comm(call_data);
 
        scope = bt_ctf_get_top_level_scope(call_data,
                        BT_EVENT_FIELDS);
@@ -403,7 +410,7 @@ enum bt_cb_ret handle_sys_open(struct bt_ctf_event *call_data,
                goto error;
        }
 
-       tmp = get_proc_pid(&lttngtop, tid, pid, timestamp);
+       tmp = get_proc(&lttngtop, tid, procname, timestamp);
        tmp->syscall_info = create_syscall_info(__NR_open, cpu_id, tid, -1);
 
        tmp->files_history = create_file(tmp->files_history, file);
@@ -418,10 +425,11 @@ error:
 enum bt_cb_ret handle_sys_close(struct bt_ctf_event *call_data,
                void *private_data)
 {
-       const struct definition *scope;
-       unsigned long timestamp;
-       int64_t tid, pid;
+       const struct bt_definition *scope;
        struct processtop *tmp;
+       unsigned long timestamp;
+       int64_t tid;
+       char *procname;
        int fd;
 
        timestamp = bt_ctf_get_timestamp(call_data);
@@ -430,7 +438,7 @@ enum bt_cb_ret handle_sys_close(struct bt_ctf_event *call_data,
 
        tid = get_context_tid(call_data);
 
-       pid = get_context_pid(call_data);
+       procname = get_context_comm(call_data);
 
        scope = bt_ctf_get_top_level_scope(call_data,
                        BT_EVENT_FIELDS);
@@ -441,7 +449,7 @@ enum bt_cb_ret handle_sys_close(struct bt_ctf_event *call_data,
                goto error;
        }
 
-       tmp = get_proc_pid(&lttngtop, tid, pid, timestamp);
+       tmp = get_proc(&lttngtop, tid, procname, timestamp);
 
        close_file(tmp, fd);
 
@@ -454,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;