X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Fcommon.c;h=021f2f1217b2316bd383e1a1ec146df492b70fd4;hp=f6c20c9c8dee3487dd480bfa37d6bb0cb570d2b4;hb=1d2391b4818d470a92437e77892b0c5d7c10a466;hpb=c8d75a13bc5c025053b0c2c14fa1a7dfdaa1b448

diff --git a/src/common.c b/src/common.c
index f6c20c9..021f2f1 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;
 
@@ -200,11 +200,22 @@ struct processtop* add_proc(struct lttngtop *ctx, int tid, char *comm,
 		g_ptr_array_add(ctx->process_table, newproc);
 		g_hash_table_insert(ctx->process_hash_table,
 				(gpointer) (unsigned long) tid, newproc);
-
+		if (lookup_tid_list(tid)) {
+			add_filter_tid_list(tid, newproc);
+		}
 		ctx->nbnewthreads++;
 		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;
 }
@@ -223,11 +234,11 @@ 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);
+			}
 		}
 	}
 	return proc;
@@ -253,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)
@@ -430,6 +443,7 @@ struct lttngtop* get_copy_lttngtop(unsigned long start, unsigned long end)
 	struct processtop *tmp, *tmp2, *new;
 	struct cputime *tmpcpu, *newcpu;
 	struct files *tmpfile, *newfile;
+	struct kprobes *tmpprobe, *newprobe;
 
 	dst = g_new0(struct lttngtop, 1);
 	dst->start = start;
@@ -438,6 +452,7 @@ struct lttngtop* get_copy_lttngtop(unsigned long start, unsigned long end)
 	dst->process_table = g_ptr_array_new();
 	dst->files_table = g_ptr_array_new();
 	dst->cpu_table = g_ptr_array_new();
+	dst->kprobes_table = g_ptr_array_new();
 	dst->process_hash_table = g_hash_table_new(g_direct_hash, g_direct_equal);
 	g_hash_table_foreach(lttngtop.process_hash_table, copy_process_table,
 			dst->process_hash_table);
@@ -520,6 +535,15 @@ struct lttngtop* get_copy_lttngtop(unsigned long start, unsigned long end)
 		 */
 		g_ptr_array_add(dst->cpu_table, newcpu);
 	}
+	if (lttngtop.kprobes_table) {
+		for (i = 0; i < lttngtop.kprobes_table->len; i++) {
+			tmpprobe = g_ptr_array_index(lttngtop.kprobes_table, i);
+			newprobe = g_new0(struct kprobes, 1);
+			memcpy(newprobe, tmpprobe, sizeof(struct kprobes));
+			tmpprobe->count = 0;
+			g_ptr_array_add(dst->kprobes_table, newprobe);
+		}
+	}
 	/* FIXME : better algo */
 	/* create the threads index if required */
 	for (i = 0; i < dst->process_table->len; i++) {
@@ -549,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)
@@ -602,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);
@@ -639,13 +669,45 @@ struct tm format_timestamp(uint64_t timestamp)
 
 int *lookup_tid_list(int tid)
 {
+	if (!tid_list)
+		return NULL;
+
 	return g_hash_table_lookup(tid_list, (gpointer) &tid);
 }
 
 char *lookup_hostname_list(const char *hostname)
 {
-	if (!hostname)
+	if (!hostname || !hostname_list)
 		return NULL;
 
 	return g_hash_table_lookup(hostname_list, (gpointer) hostname);
 }
+
+void remove_hostname_list(const char *hostname)
+{
+	if (!hostname || !hostname_list)
+		return;
+
+	g_hash_table_remove(hostname_list, (gpointer) hostname);
+}
+
+int *lookup_filter_tid_list(int tid)
+{
+	return g_hash_table_lookup(global_filter_list, (gpointer) &tid);
+}
+
+void add_filter_tid_list(int tid, struct processtop *newproc)
+{
+	unsigned long *hash_tid;
+
+	hash_tid = malloc(sizeof(unsigned long));
+	*hash_tid = tid;
+	g_hash_table_insert(global_filter_list,
+			(gpointer) (unsigned long) hash_tid, newproc);
+}
+
+void remove_filter_tid_list(int tid)
+{
+	g_hash_table_remove(global_filter_list,
+			(gpointer) (unsigned long) &tid);
+}