X-Git-Url: http://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Fcommon.c;h=1fc74be4084f41fe771ae5dd41b84bae485522fc;hp=cde69a0b0a0eab09521aeb30f1d74e3513093864;hb=246d59926e23f5cdf6f017ae7544f2582b666ef7;hpb=96aa77debf3aee00361101fb2e76781c65f02ba9

diff --git a/src/common.c b/src/common.c
index cde69a0..1fc74be 100644
--- a/src/common.c
+++ b/src/common.c
@@ -145,6 +145,21 @@ char *get_context_comm(const struct bt_ctf_event *event)
 	return comm;
 }
 
+char *get_context_hostname(const struct bt_ctf_event *event)
+{
+	const struct definition *scope;
+	char *hostname;
+
+	scope = bt_ctf_get_top_level_scope(event, BT_STREAM_EVENT_CONTEXT);
+	hostname = bt_ctf_get_char_array(bt_ctf_get_field(event,
+				scope, "_hostname"));
+	if (bt_ctf_field_get_error()) {
+		return NULL;
+	}
+
+	return hostname;
+}
+
 /*
  * To get the parent process, put the pid in the tid field
  * because the parent process gets pid = tid
@@ -164,9 +179,6 @@ struct processtop* add_proc(struct lttngtop *ctx, int tid, char *comm,
 {
 	struct processtop *newproc;
 
-	if (opt_pid && tid != opt_pid)
-		return NULL;
-
 	/* if the PID already exists, we just rename the process */
 	/* FIXME : need to integrate with clone/fork/exit to be accurate */
 	newproc = find_process_tid(ctx, tid, comm);
@@ -198,7 +210,7 @@ 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)
+		int ppid, int vpid, int vtid, int vppid, char *comm, char *hostname)
 {
 	if (proc) {
 		proc->pid = pid;
@@ -211,6 +223,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);
+			}
+			proc->hostname = strdup(hostname);
+		}
 	}
 	return proc;
 }
@@ -412,6 +430,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;
@@ -420,6 +439,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);
@@ -502,6 +522,13 @@ struct lttngtop* get_copy_lttngtop(unsigned long start, unsigned long end)
 		 */
 		g_ptr_array_add(dst->cpu_table, newcpu);
 	}
+	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++) {
@@ -588,7 +615,7 @@ enum bt_cb_ret handle_statedump_process_state(struct bt_ctf_event *call_data,
 	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);
+	update_proc(proc, pid, tid, ppid, vpid, vtid, vppid, procname, NULL);
 
 	if (proc) {
 		free(proc->comm);
@@ -618,3 +645,16 @@ struct tm format_timestamp(uint64_t timestamp)
 
 	return tm;
 }
+
+int *lookup_tid_list(int tid)
+{
+	return g_hash_table_lookup(tid_list, (gpointer) &tid);
+}
+
+char *lookup_hostname_list(const char *hostname)
+{
+	if (!hostname)
+		return NULL;
+
+	return g_hash_table_lookup(hostname_list, (gpointer) hostname);
+}