prepare the 0.3 release

[lttngtop.git] / src / iostreamtop.c

diff --git a/src/iostreamtop.c b/src/iostreamtop.c
index f20fcecd81ec752a88b6ddf25559ab82d752aa81..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++;
 }