prepare the 0.3 release

[lttngtop.git] / src / iostreamtop.c

diff --git a/src/iostreamtop.c b/src/iostreamtop.c
index bda9c7ce9d8c098b86b6116ba85385e92b084c00..44fe37b89995aadc722ca5786d3f859a5830b4e8 100644 (file)
--- a/src/iostreamtop.c
+++ b/src/iostreamtop.c
@@ -48,7 +48,8 @@ void add_file(struct processtop *proc, struct files *file, int fd)
                if (tmp_file == NULL)
                        g_ptr_array_index(proc->process_files_table, fd) = file;
                else {
-                       if (strcmp(tmp_file->name, file->name) != 0) {
+                       if (!tmp_file->name ||
+                                       strcmp(tmp_file->name, file->name) != 0) {
                                size = proc->process_files_table->len;
                                g_ptr_array_set_size(proc->process_files_table,
                                                                size+1);
@@ -102,7 +103,7 @@ void insert_file(struct processtop *proc, int fd)
                return;
        if (fd >= proc->process_files_table->len) {
                tmp = g_new0(struct files, 1);
-               tmp->name = "Unknown";
+               tmp->name = NULL;
                tmp->read = 0;
                tmp->write = 0;
                tmp->fd = fd;
@@ -112,7 +113,7 @@ void insert_file(struct processtop *proc, int fd)
                tmp = g_ptr_array_index(proc->process_files_table, fd);
                if (tmp == NULL) {
                        tmp = g_new0(struct files, 1);
-                       tmp->name = "Unknown";
+                       tmp->name = NULL;
                        tmp->read = 0;
                        tmp->write = 0;
                        tmp->fd = fd;
@@ -123,7 +124,7 @@ void insert_file(struct processtop *proc, int fd)
                        if (parent) {
                                tmp_parent = g_ptr_array_index(
                                        parent->process_files_table, fd);
-                               if (tmp_parent &&
+                               if (tmp_parent && tmp->name && tmp_parent->name &&
                                   (strcmp(tmp->name, tmp_parent->name)) != 0)
                                        tmp->name = strdup(tmp_parent->name);
                        }
@@ -139,6 +140,12 @@ void close_file(struct processtop *proc, int fd)
        if (file != NULL) {
                file->flag = __NR_close;
                lttngtop.nbfiles--;
+               /*
+               if (file->name) {
+                       free(file->name);
+                       file->name = NULL;
+               }
+               */
        }
        lttngtop.nbclosedfiles++;
 }
@@ -189,14 +196,19 @@ void show_history(struct file_history *history)
 }
 
 int update_iostream_ret(struct lttngtop *ctx, int tid, char *comm,
-               unsigned long timestamp, uint64_t cpu_id, int ret)
+               unsigned long timestamp, uint64_t cpu_id, int ret,
+               char *hostname)
 {
        struct processtop *tmp;
        struct files *tmpfile;
        int err = 0;
 
-       tmp = get_proc(ctx, tid, comm, timestamp);
+       tmp = get_proc(ctx, tid, comm, timestamp, hostname);
 
+       if (!tmp) {
+               err = -1;
+               goto end;
+       }
        if (tmp->syscall_info != NULL) {
                if (tmp->syscall_info->type == __NR_read
                        && ret > 0) {
@@ -223,6 +235,8 @@ int update_iostream_ret(struct lttngtop *ctx, int tid, char *comm,
                g_free(tmp->syscall_info);
                tmp->syscall_info = NULL;
        }
+
+end:
        return err;
 }
 
@@ -260,11 +274,12 @@ 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;
        uint64_t cpu_id;
+       char *hostname;
 
        timestamp = bt_ctf_get_timestamp(call_data);
        if (timestamp == -1ULL)
@@ -283,13 +298,15 @@ enum bt_cb_ret handle_exit_syscall(struct bt_ctf_event *call_data,
        }
 
        cpu_id = get_cpu_id(call_data);
+       hostname = get_context_hostname(call_data);
 
        /*
         * if we encounter an exit_syscall and
         * it is not for a syscall read or write
         * we just abort the execution of this callback
         */
-       if ((update_iostream_ret(&lttngtop, tid, comm, timestamp, cpu_id, ret)) < 0)
+       if ((update_iostream_ret(&lttngtop, tid, comm, timestamp, cpu_id,
+                                       ret, hostname)) < 0)
                return BT_CB_ERROR_CONTINUE;
 
        return BT_CB_OK;
@@ -302,12 +319,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;
-       char *procname;
+       char *procname, *hostname;
        int fd;
 
        timestamp = bt_ctf_get_timestamp(call_data);
@@ -318,6 +335,7 @@ enum bt_cb_ret handle_sys_write(struct bt_ctf_event *call_data,
        cpu_id = get_cpu_id(call_data);
 
        procname = get_context_comm(call_data);
+       hostname = get_context_hostname(call_data);
 
        scope = bt_ctf_get_top_level_scope(call_data,
                        BT_EVENT_FIELDS);
@@ -328,11 +346,15 @@ enum bt_cb_ret handle_sys_write(struct bt_ctf_event *call_data,
                goto error;
        }
 
-       tmp = get_proc(&lttngtop, tid, procname, timestamp);
+       tmp = get_proc(&lttngtop, tid, procname, timestamp, hostname);
+       if (!tmp)
+               goto end;
+
        tmp->syscall_info = create_syscall_info(__NR_write, cpu_id, tid, fd);
 
        insert_file(tmp, fd);
 
+end:
        return BT_CB_OK;
 
 error:
@@ -343,12 +365,13 @@ 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;
        char *procname;
        int fd;
+       char *hostname;
 
        timestamp = bt_ctf_get_timestamp(call_data);
        if (timestamp == -1ULL)
@@ -358,6 +381,7 @@ enum bt_cb_ret handle_sys_read(struct bt_ctf_event *call_data,
        cpu_id = get_cpu_id(call_data);
 
        procname = get_context_comm(call_data);
+       hostname = get_context_hostname(call_data);
 
        scope = bt_ctf_get_top_level_scope(call_data,
                        BT_EVENT_FIELDS);
@@ -368,28 +392,31 @@ enum bt_cb_ret handle_sys_read(struct bt_ctf_event *call_data,
                goto error;
        }
 
-       tmp = get_proc(&lttngtop, tid, procname, timestamp);
+       tmp = get_proc(&lttngtop, tid, procname, timestamp, hostname);
+       if (!tmp)
+               goto end;
+
        tmp->syscall_info = create_syscall_info(__NR_read, cpu_id, tid, fd);
 
        insert_file(tmp, fd);
 
+end:
        return BT_CB_OK;
 
 error:
        return BT_CB_ERROR_STOP;
 }
 
-
 enum bt_cb_ret handle_sys_open(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;
-       char *procname;
+       char *procname, *hostname;
        char *file;
 
        timestamp = bt_ctf_get_timestamp(call_data);
@@ -400,6 +427,7 @@ enum bt_cb_ret handle_sys_open(struct bt_ctf_event *call_data,
        cpu_id = get_cpu_id(call_data);
 
        procname = get_context_comm(call_data);
+       hostname = get_context_hostname(call_data);
 
        scope = bt_ctf_get_top_level_scope(call_data,
                        BT_EVENT_FIELDS);
@@ -410,27 +438,69 @@ enum bt_cb_ret handle_sys_open(struct bt_ctf_event *call_data,
                goto error;
        }
 
-       tmp = get_proc(&lttngtop, tid, procname, timestamp);
+       tmp = get_proc(&lttngtop, tid, procname, timestamp, hostname);
+       if (!tmp)
+               goto end;
+
        tmp->syscall_info = create_syscall_info(__NR_open, cpu_id, tid, -1);
 
        tmp->files_history = create_file(tmp->files_history, file);
 
+end:
        return BT_CB_OK;
 
 error:
        return BT_CB_ERROR_STOP;
 }
 
+enum bt_cb_ret handle_sys_socket(struct bt_ctf_event *call_data,
+               void *private_data)
+{
+
+       struct processtop *tmp;
+       unsigned long timestamp;
+       uint64_t cpu_id;
+       int64_t tid;
+       char *procname, *hostname;
+       char *file;
+
+       timestamp = bt_ctf_get_timestamp(call_data);
+       if (timestamp == -1ULL)
+               goto error;
+
+       tid = get_context_tid(call_data);
+       cpu_id = get_cpu_id(call_data);
+
+       procname = get_context_comm(call_data);
+       hostname = get_context_hostname(call_data);
+
+       file = strdup("socket");
+
+       tmp = get_proc(&lttngtop, tid, procname, timestamp, hostname);
+       if (!tmp)
+               goto end;
+
+       tmp->syscall_info = create_syscall_info(__NR_open, cpu_id, tid, -1);
+
+       tmp->files_history = create_file(tmp->files_history, file);
+
+end:
+       return BT_CB_OK;
+
+error:
+       return BT_CB_ERROR_STOP;
+}
 
 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;
        char *procname;
        int fd;
+       char *hostname;
 
        timestamp = bt_ctf_get_timestamp(call_data);
        if (timestamp == -1ULL)
@@ -439,6 +509,7 @@ enum bt_cb_ret handle_sys_close(struct bt_ctf_event *call_data,
        tid = get_context_tid(call_data);
 
        procname = get_context_comm(call_data);
+       hostname = get_context_hostname(call_data);
 
        scope = bt_ctf_get_top_level_scope(call_data,
                        BT_EVENT_FIELDS);
@@ -449,10 +520,13 @@ enum bt_cb_ret handle_sys_close(struct bt_ctf_event *call_data,
                goto error;
        }
 
-       tmp = get_proc(&lttngtop, tid, procname, timestamp);
+       tmp = get_proc(&lttngtop, tid, procname, timestamp, hostname);
+       if (!tmp)
+               goto end;
 
        close_file(tmp, fd);
 
+end:
        return BT_CB_OK;
 
 error:
@@ -462,12 +536,12 @@ 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;
        int64_t pid;
-       char *file_name;
+       char *file_name, *hostname;
        int fd;
 
        timestamp = bt_ctf_get_timestamp(call_data);
@@ -500,12 +574,17 @@ enum bt_cb_ret handle_statedump_file_descriptor(struct bt_ctf_event *call_data,
                fprintf(stderr, "Missing file name context info\n");
                goto error;
        }
+       hostname = get_context_hostname(call_data);
+
+       parent = get_proc_pid(&lttngtop, pid, pid, timestamp, hostname);
+       if (!parent)
+               goto end;
 
-       parent = get_proc_pid(&lttngtop, pid, pid, timestamp);
        parent->files_history = create_file(parent->files_history, file_name);
        file = parent->files_history->file;
        edit_file(parent, file, fd);
 
+end:
        return BT_CB_OK;
 
 error: