cleanup namespace of filter lists

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

diff --git a/src/common.c b/src/common.c
index 15f9de0864fb8675859b4ad807fd50a826eb097a..95f021012ddcbd1ff7d619e4688f458ce0cb0f95 100644 (file)
--- a/src/common.c
+++ b/src/common.c
@@ -669,26 +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_list)
+       if (!hostname || !hostname_filter_list)
                return;
 
-       g_hash_table_remove(hostname_list, (gpointer) hostname);
+       g_hash_table_remove(hostname_filter_list, (gpointer) hostname);
 }
 
 int *lookup_filter_tid_list(int tid)

diff --git a/src/common.h b/src/common.h
index e0d4f4afc598db8d30a4b4bfd33fafdf3f44b959..7e11cc6c5f8b508fe566300be5d3b0a3a53dcf21 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -35,8 +35,8 @@ GHashTable *global_filter_list;
 char *opt_tid;
 char *opt_hostname;
 char *opt_kprobes;
-GHashTable *tid_list;
-GHashTable *hostname_list;
+GHashTable *tid_filter_list;
+GHashTable *hostname_filter_list;
 
 int toggle_filter;
 

diff --git a/src/lttngtop.c b/src/lttngtop.c
index 10ee4ee2c68a6a9b95320d9447976783576b7b63..6cee4264a0608a6692e45f6885dbe658e966871a 100644 (file)
--- a/src/lttngtop.c
+++ b/src/lttngtop.c
@@ -218,16 +218,6 @@ enum bt_cb_ret print_timestamp(struct bt_ctf_event *call_data, void *private_dat
                if (!lookup_filter_tid_list(pid))
                        goto end;
 
-       /*
-       if (!opt_tid && (opt_hostname && !lookup_hostname_list(hostname)))
-               goto end;
-       if (!opt_hostname && (opt_tid && !lookup_tid_list(pid)))
-               goto end;
-       if ((opt_tid && !lookup_tid_list(pid)) &&
-                       (opt_hostname && !lookup_hostname_list(hostname)))
-               goto end;
-               */
-
        cpu_id = get_cpu_id(call_data);
        procname = get_context_comm(call_data);
 
@@ -630,25 +620,25 @@ static int parse_options(int argc, char **argv)
                                break;
                        case OPT_PID:
                                toggle_filter = 1;
-                               tid_list = g_hash_table_new(g_str_hash,
+                               tid_filter_list = g_hash_table_new(g_str_hash,
                                                g_str_equal);
                                tmp_str = strtok(opt_tid, ",");
                                while (tmp_str) {
                                        tid = malloc(sizeof(int));
                                        *tid = atoi(tmp_str);
-                                       g_hash_table_insert(tid_list,
+                                       g_hash_table_insert(tid_filter_list,
                                                        (gpointer) tid, tid);
                                        tmp_str = strtok(NULL, ",");
                                }
                                break;
                        case OPT_HOSTNAME:
                                toggle_filter = 1;
-                               hostname_list = g_hash_table_new(g_str_hash,
+                               hostname_filter_list = g_hash_table_new(g_str_hash,
                                                g_str_equal);
                                tmp_str = strtok(opt_hostname, ",");
                                while (tmp_str) {
                                        char *new_str = strdup(tmp_str);
-                                       g_hash_table_insert(hostname_list,
+                                       g_hash_table_insert(hostname_filter_list,
                                                        (gpointer) new_str,
                                                        (gpointer) new_str);
                                        tmp_str = strtok(NULL, ",");

diff --git a/src/lttngtoptypes.h b/src/lttngtoptypes.h
index 43b3381b1777110c771099741f8908d3d6e43b9f..21e65a2aea6b0bac4e1f5dc3db3258e116b5ad50 100644 (file)
--- a/src/lttngtoptypes.h
+++ b/src/lttngtoptypes.h
@@ -190,4 +190,8 @@ struct kprobes {
        int count;
 };
 
+struct hosts {
+       char *hostname;
+};
+
 #endif /* LTTNGTOPTYPES_H */