X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Fcommon.c;h=456e0a5c2086c029741a2b6693cf8b770b96253e;hp=e3e814be972b26d5f7e099644e52ec667a7f7852;hb=8fe4d0cfce4c1b1ace5aed2b2b1521caca113bd5;hpb=ea5d1dc99544231b4e2085ad706fcc1fa6260faa

diff --git a/src/common.c b/src/common.c
index e3e814b..456e0a5 100644
--- a/src/common.c
+++ b/src/common.c
@@ -45,8 +45,12 @@ uint64_t get_context_tid(const struct bt_ctf_event *event)
 	tid = bt_ctf_get_int64(bt_ctf_get_field(event,
 				scope, "_tid"));
 	if (bt_ctf_field_get_error()) {
-		fprintf(stderr, "Missing tid context info\n");
-		return -1ULL;
+		tid = bt_ctf_get_int64(bt_ctf_get_field(event,
+					scope, "_vtid"));
+		if (bt_ctf_field_get_error()) {
+			fprintf(stderr, "Missing tid context info\n");
+			return -1ULL;
+		}
 	}
 
 	return tid;
@@ -61,8 +65,13 @@ uint64_t get_context_pid(const struct bt_ctf_event *event)
 	pid = bt_ctf_get_int64(bt_ctf_get_field(event,
 				scope, "_pid"));
 	if (bt_ctf_field_get_error()) {
-		fprintf(stderr, "Missing pid context info\n");
-		return -1ULL;
+		/* Try UST pid */
+		pid = bt_ctf_get_int64(bt_ctf_get_field(event,
+					scope, "_vpid"));
+		if (bt_ctf_field_get_error()) {
+			fprintf(stderr, "Missing pid context info\n");
+			return -1ULL;
+		}
 	}
 
 	return pid;
@@ -77,7 +86,6 @@ uint64_t get_context_ppid(const struct bt_ctf_event *event)
 	ppid = bt_ctf_get_int64(bt_ctf_get_field(event,
 				scope, "_ppid"));
 	if (bt_ctf_field_get_error()) {
-		fprintf(stderr, "Missing ppid context info\n");
 		return -1ULL;
 	}
 
@@ -86,7 +94,7 @@ uint64_t get_context_ppid(const struct bt_ctf_event *event)
 
 uint64_t get_context_vtid(const struct bt_ctf_event *event)
 {
-	const struct definition *scope;
+	const struct bt_definition *scope;
 	uint64_t vtid;
 
 	scope = bt_ctf_get_top_level_scope(event, BT_STREAM_EVENT_CONTEXT);
@@ -101,7 +109,7 @@ uint64_t get_context_vtid(const struct bt_ctf_event *event)
 
 uint64_t get_context_vpid(const struct bt_ctf_event *event)
 {
-	const struct definition *scope;
+	const struct bt_definition *scope;
 	uint64_t vpid;
 
 	scope = bt_ctf_get_top_level_scope(event, BT_STREAM_EVENT_CONTEXT);
@@ -116,7 +124,7 @@ uint64_t get_context_vpid(const struct bt_ctf_event *event)
 
 uint64_t get_context_vppid(const struct bt_ctf_event *event)
 {
-	const struct definition *scope;
+	const struct bt_definition *scope;
 	uint64_t vppid;
 
 	scope = bt_ctf_get_top_level_scope(event, BT_STREAM_EVENT_CONTEXT);
@@ -147,7 +155,7 @@ char *get_context_comm(const struct bt_ctf_event *event)
 
 char *get_context_hostname(const struct bt_ctf_event *event)
 {
-	const struct definition *scope;
+	const struct bt_definition *scope;
 	char *hostname;
 
 	scope = bt_ctf_get_top_level_scope(event, BT_STREAM_EVENT_CONTEXT);
@@ -164,7 +172,7 @@ char *get_context_hostname(const struct bt_ctf_event *event)
  * To get the parent process, put the pid in the tid field
  * because the parent process gets pid = tid
  */
-struct processtop *find_process_tid(struct lttngtop *ctx, int tid, char *comm)
+struct processtop *find_process_tid(struct lttngtop *ctx, int tid, const char *comm)
 {
 	struct processtop *tmp;
 
@@ -178,6 +186,7 @@ struct processtop* add_proc(struct lttngtop *ctx, int tid, char *comm,
 		unsigned long timestamp, char *hostname)
 {
 	struct processtop *newproc;
+	struct host *host;
 
 	/* if the PID already exists, we just rename the process */
 	/* FIXME : need to integrate with clone/fork/exit to be accurate */
@@ -201,19 +210,20 @@ struct processtop* add_proc(struct lttngtop *ctx, int tid, char *comm,
 		g_hash_table_insert(ctx->process_hash_table,
 				(gpointer) (unsigned long) tid, newproc);
 		if (lookup_tid_list(tid)) {
-			add_filter_tid_list(tid, newproc);
+			add_filter_tid_list(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);
+		host = lookup_hostname_list(hostname);
+		if (!host)
+			host = add_hostname_list(hostname, 0);
+		if (!newproc->host || (newproc->host != host))
+			newproc->host = host;
+		if (is_hostname_filtered(hostname)) {
+			add_filter_tid_list(newproc);
 		}
 	}
 
@@ -223,6 +233,8 @@ struct processtop* add_proc(struct lttngtop *ctx, int tid, char *comm,
 struct processtop* update_proc(struct processtop* proc, int pid, int tid,
 		int ppid, int vpid, int vtid, int vppid, char *comm, char *hostname)
 {
+	struct host *host;
+
 	if (proc) {
 		proc->pid = pid;
 		proc->tid = tid;
@@ -234,10 +246,14 @@ struct processtop* update_proc(struct processtop* proc, int pid, int tid,
 			free(proc->comm);
 			proc->comm = strdup(comm);
 		}
-		if (hostname && !proc->hostname) {
-			proc->hostname = strdup(hostname);
-			if (lookup_hostname_list(hostname)) {
-				add_filter_tid_list(tid, proc);
+		if (hostname && !proc->host) {
+			host = lookup_hostname_list(hostname);
+			if (!host)
+				host = add_hostname_list(hostname, 0);
+			if (!proc->host || (proc->host != host))
+				proc->host = host;
+			if (is_hostname_filtered(hostname)) {
+				add_filter_tid_list(proc);
 			}
 		}
 	}
@@ -377,6 +393,7 @@ void copy_process_table(gpointer key, gpointer value, gpointer new_table)
 void rotate_perfcounter() {
 	int i;
 	struct processtop *tmp;
+
 	for (i = 0; i < lttngtop.process_table->len; i++) {
 		tmp = g_ptr_array_index(lttngtop.process_table, i);
 		g_hash_table_foreach(tmp->perf, reset_perf_counter, NULL);
@@ -590,8 +607,7 @@ enum bt_cb_ret handle_statedump_process_state(struct bt_ctf_event *call_data,
 	ppid = bt_ctf_get_int64(bt_ctf_get_field(call_data,
 				scope, "_ppid"));
 	if (bt_ctf_field_get_error()) {
-		fprintf(stderr, "Missing ppid context info\n");
-		goto error;
+		goto end;
 	}
 	tid = bt_ctf_get_int64(bt_ctf_get_field(call_data,
 				scope, "_tid"));
@@ -626,12 +642,6 @@ 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)
@@ -644,6 +654,7 @@ enum bt_cb_ret handle_statedump_process_state(struct bt_ctf_event *call_data,
 		proc->pid = pid;
 	}
 
+end:
 	return BT_CB_OK;
 
 error:
@@ -675,20 +686,22 @@ int *lookup_tid_list(int 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_filter_list)
+	if (!hostname || !global_host_list)
 		return NULL;
 
-	return g_hash_table_lookup(hostname_filter_list, (gpointer) hostname);
+	return g_hash_table_lookup(global_host_list, (gpointer) hostname);
 }
 
-void remove_hostname_list(const char *hostname)
+int is_hostname_filtered(const char *hostname)
 {
-	if (!hostname || !hostname_filter_list)
-		return;
+	struct host *host;
 
-	g_hash_table_remove(hostname_filter_list, (gpointer) hostname);
+	host = lookup_hostname_list(hostname);
+	if (host)
+		return host->filter;
+	return 0;
 }
 
 int *lookup_filter_tid_list(int tid)
@@ -696,14 +709,14 @@ 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)
+void add_filter_tid_list(struct processtop *proc)
 {
 	unsigned long *hash_tid;
 
 	hash_tid = malloc(sizeof(unsigned long));
-	*hash_tid = tid;
+	*hash_tid = proc->tid;
 	g_hash_table_insert(global_filter_list,
-			(gpointer) (unsigned long) hash_tid, newproc);
+			(gpointer) (unsigned long) hash_tid, proc);
 }
 
 void remove_filter_tid_list(int tid)
@@ -711,3 +724,37 @@ void remove_filter_tid_list(int tid)
 	g_hash_table_remove(global_filter_list,
 			(gpointer) (unsigned long) &tid);
 }
+
+struct host *add_hostname_list(char *hostname, int filter)
+{
+	struct host *host;
+
+	host = lookup_hostname_list(hostname);
+	if (host)
+		return host;
+
+	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);
+
+	return host;
+}
+
+void update_hostname_filter(struct host *host)
+{
+	struct processtop *tmp;
+	int i;
+
+	for (i = 0; i < lttngtop.process_table->len; i++) {
+		tmp = g_ptr_array_index(lttngtop.process_table, i);
+		if (tmp->host == host) {
+			if (host->filter)
+				add_filter_tid_list(tmp);
+			else
+				remove_filter_tid_list(tmp->tid);
+		}
+	}
+}