X-Git-Url: http://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Fcommon.c;h=bc3fff3d55b3e0d5023e3ff910658637fa82c435;hp=500c80d674f9056ced114e75a54af1e04fc51fc2;hb=467097ac13d432cc25af5c93fec285ac23d25304;hpb=da4353bbbb28c19bd28447018edb94845ae71673

diff --git a/src/common.c b/src/common.c
index 500c80d..bc3fff3 100644
--- 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,16 @@ 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 (is_hostname_filtered(hostname)) {
+			add_filter_tid_list(tid, newproc);
+		}
+		add_hostname_list(hostname, 0);
+	}
 
 	return newproc;
 }
@@ -225,14 +235,12 @@ 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)) {
+			if (is_hostname_filtered(hostname)) {
 				add_filter_tid_list(tid, proc);
 			}
+			add_hostname_list(hostname, 0);
 		}
 	}
 	return proc;
@@ -258,23 +266,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 +575,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 +628,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 +671,28 @@ 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)
+struct host *lookup_hostname_list(const char *hostname)
 {
-	if (!hostname || !hostname_list)
+	if (!hostname || !global_host_list)
 		return NULL;
 
-	return g_hash_table_lookup(hostname_list, (gpointer) hostname);
+	return g_hash_table_lookup(global_host_list, (gpointer) hostname);
+}
+
+int is_hostname_filtered(const char *hostname)
+{
+	struct host *host;
+
+	host = lookup_hostname_list(hostname);
+	if (host)
+		return host->filter;
+	return 0;
 }
 
 int *lookup_filter_tid_list(int tid)
@@ -689,3 +715,18 @@ void remove_filter_tid_list(int tid)
 	g_hash_table_remove(global_filter_list,
 			(gpointer) (unsigned long) &tid);
 }
+
+void add_hostname_list(char *hostname, int filter)
+{
+	struct host *host;
+
+	if (lookup_hostname_list(hostname))
+		return;
+
+	host = g_new0(struct host, 1);
+	host->hostname = strdup(hostname);
+	host->filter = filter;
+	g_hash_table_insert(global_host_list,
+			(gpointer) host->hostname,
+			(gpointer) host);
+}