From ea5d1dc99544231b4e2085ad706fcc1fa6260faa Mon Sep 17 00:00:00 2001
From: Julien Desfossez <jdesfossez@efficios.com>
Date: Wed, 29 Aug 2012 19:35:15 -0400
Subject: [PATCH] cleanup namespace of filter lists

Signed-off-by: Julien Desfossez <jdesfossez@efficios.com>
---
 src/common.c        | 12 ++++++------
 src/common.h        |  4 ++--
 src/lttngtop.c      | 18 ++++--------------
 src/lttngtoptypes.h |  4 ++++
 4 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/src/common.c b/src/common.c
index 021f2f1..e3e814b 100644
--- 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 e0d4f4a..7e11cc6 100644
--- 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 51c5a98..c31b9fd 100644
--- 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 43b3381..21e65a2 100644
--- a/src/lttngtoptypes.h
+++ b/src/lttngtoptypes.h
@@ -190,4 +190,8 @@ struct kprobes {
 	int count;
 };
 
+struct hosts {
+	char *hostname;
+};
+
 #endif /* LTTNGTOPTYPES_H */
-- 
2.34.1