cleanup namespace of filter lists

[lttngtop.git] / src / common.c

diff --git a/src/common.c b/src/common.c
index 500c80d674f9056ced114e75a54af1e04fc51fc2..e3e814be972b26d5f7e099644e52ec667a7f7852 100644 (file)
--- a/src/common.c
+++ b/src/common.c
@@ -175,7 +175,7 @@ struct processtop *find_process_tid(struct lttngtop *ctx, int tid, char *comm)
 }
 
 struct processtop* add_proc(struct lttngtop *ctx, int tid, char *comm,
-               unsigned long timestamp)
+               unsigned long timestamp, char *hostname)
 {
        struct processtop *newproc;
 
@@ -207,6 +207,15 @@ struct processtop* add_proc(struct lttngtop *ctx, int tid, char *comm,
                ctx->nbthreads++;
        }
        newproc->comm = strdup(comm);
+       if (hostname) {
+               if (newproc->hostname && strcmp(newproc->hostname, hostname) != 0) {
+                       free(newproc->hostname);
+               }
+               newproc->hostname = strdup(hostname);
+               if (lookup_hostname_list(hostname)) {
+                       add_filter_tid_list(tid, newproc);
+               }
+       }
 
        return newproc;
 }
@@ -225,10 +234,7 @@ struct processtop* update_proc(struct processtop* proc, int pid, int tid,
                        free(proc->comm);
                        proc->comm = strdup(comm);
                }
-               if (hostname) {
-                       if (proc->hostname && strcmp(proc->hostname, hostname) != 0) {
-                               free(proc->hostname);
-                       }
+               if (hostname && !proc->hostname) {
                        proc->hostname = strdup(hostname);
                        if (lookup_hostname_list(hostname)) {
                                add_filter_tid_list(tid, proc);
@@ -258,23 +264,25 @@ void death_proc(struct lttngtop *ctx, int tid, char *comm,
 }
 
 struct processtop* get_proc(struct lttngtop *ctx, int tid, char *comm,
-               unsigned long timestamp)
+               unsigned long timestamp, char *hostname)
 {
        struct processtop *tmp;
+
        tmp = find_process_tid(ctx, tid, comm);
-       if (tmp && strcmp(tmp->comm, comm) == 0)
+       if (tmp && strcmp(tmp->comm, comm) == 0) {
                return tmp;
-       return add_proc(ctx, tid, comm, timestamp);
+       }
+       return add_proc(ctx, tid, comm, timestamp, hostname);
 }
 
 struct processtop *get_proc_pid(struct lttngtop *ctx, int tid, int pid,
-               unsigned long timestamp)
+               unsigned long timestamp, char *hostname)
 {
        struct processtop *tmp;
        tmp = find_process_tid(ctx, tid, NULL);
        if (tmp && tmp->pid == pid)
                return tmp;
-       return add_proc(ctx, tid, "Unknown", timestamp);
+       return add_proc(ctx, tid, "Unknown", timestamp, hostname);
 }
 
 void add_thread(struct processtop *parent, struct processtop *thread)
@@ -565,7 +573,7 @@ enum bt_cb_ret handle_statedump_process_state(struct bt_ctf_event *call_data,
        struct processtop *proc;
        unsigned long timestamp;
        int64_t pid, tid, ppid, vtid, vpid, vppid;
-       char *procname;
+       char *procname, *hostname = NULL;
 
        timestamp = bt_ctf_get_timestamp(call_data);
        if (timestamp == -1ULL)
@@ -618,11 +626,17 @@ enum bt_cb_ret handle_statedump_process_state(struct bt_ctf_event *call_data,
                fprintf(stderr, "Missing process name context info\n");
                goto error;
        }
+       /*
+       hostname = bt_ctf_get_char_array(bt_ctf_get_field(call_data,
+                               scope, "_hostname"));
+       if (bt_ctf_field_get_error()) {
+       }
+       */
 
        proc = find_process_tid(&lttngtop, tid, procname);
        if (proc == NULL)
-               proc = add_proc(&lttngtop, tid, procname, timestamp);
-       update_proc(proc, pid, tid, ppid, vpid, vtid, vppid, procname, NULL);
+               proc = add_proc(&lttngtop, tid, procname, timestamp, hostname);
+       update_proc(proc, pid, tid, ppid, vpid, vtid, vppid, procname, hostname);
 
        if (proc) {
                free(proc->comm);
@@ -655,18 +669,26 @@ struct tm format_timestamp(uint64_t timestamp)
 
 int *lookup_tid_list(int tid)
 {
-       if (!tid_list)
+       if (!tid_filter_list)
                return NULL;
 
-       return g_hash_table_lookup(tid_list, (gpointer) &tid);
+       return g_hash_table_lookup(tid_filter_list, (gpointer) &tid);
 }
 
 char *lookup_hostname_list(const char *hostname)
 {
-       if (!hostname || !hostname_list)
+       if (!hostname || !hostname_filter_list)
                return NULL;
 
-       return g_hash_table_lookup(hostname_list, (gpointer) hostname);
+       return g_hash_table_lookup(hostname_filter_list, (gpointer) hostname);
+}
+
+void remove_hostname_list(const char *hostname)
+{
+       if (!hostname || !hostname_filter_list)
+               return;
+
+       g_hash_table_remove(hostname_filter_list, (gpointer) hostname);
 }
 
 int *lookup_filter_tid_list(int tid)