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

diff --git a/src/common.c b/src/common.c
index eca4d49..f6c20c9 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
@@ -167,6 +182,7 @@ struct processtop* add_proc(struct lttngtop *ctx, int tid, char *comm,
 	/* 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);
+
 	if (!newproc) {
 		newproc = g_new0(struct processtop, 1);
 		newproc->tid = tid;
@@ -194,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;
@@ -207,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;
 }
@@ -255,6 +277,9 @@ void add_thread(struct processtop *parent, struct processtop *thread)
 	gint i;
 	struct processtop *tmp;
 
+	if (!parent)
+		return;
+
 	for (i = 0; i < parent->threads->len; i++) {
 		tmp = g_ptr_array_index(parent->threads, i);
 		if (tmp == thread)
@@ -541,17 +566,15 @@ 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 pid context info\n");
+		fprintf(stderr, "Missing ppid context info\n");
 		goto error;
 	}
-
 	tid = bt_ctf_get_int64(bt_ctf_get_field(call_data,
 				scope, "_tid"));
 	if (bt_ctf_field_get_error()) {
 		fprintf(stderr, "Missing tid context info\n");
 		goto error;
 	}
-
 	vtid = bt_ctf_get_int64(bt_ctf_get_field(call_data,
 				scope, "_vtid"));
 	if (bt_ctf_field_get_error()) {
@@ -561,23 +584,16 @@ enum bt_cb_ret handle_statedump_process_state(struct bt_ctf_event *call_data,
 	vpid = bt_ctf_get_int64(bt_ctf_get_field(call_data,
 				scope, "_vpid"));
 	if (bt_ctf_field_get_error()) {
-		fprintf(stderr, "Missing vtid context info\n");
+		fprintf(stderr, "Missing vpid context info\n");
 		goto error;
 	}
 	vppid = bt_ctf_get_int64(bt_ctf_get_field(call_data,
 				scope, "_vppid"));
 	if (bt_ctf_field_get_error()) {
-		fprintf(stderr, "Missing vtid context info\n");
+		fprintf(stderr, "Missing vppid context info\n");
 		goto error;
 	}
 
-	/*
-	 * FIXME
-	 * I first tried with bt_ctf_get_string but doesn`t work at all
-	 * It couldn`t find the field _name because it is an integer in
-	 * the metadata and not a string like _filename for the
-	 * statedump_file_descriptor
-	 */
 	scope = bt_ctf_get_top_level_scope(call_data,
 			BT_EVENT_FIELDS);
 	procname = bt_ctf_get_char_array(bt_ctf_get_field(call_data,
@@ -590,19 +606,13 @@ 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);
 
-	free(proc->comm);
-	proc->comm = strdup(procname);
-	proc->pid = pid;
-
-	/*
-	 * FIXME
-	 * I would like to free procname because it is duplicated
-	 * when the process is created but it segfaults...
-	 *
-	 * free(procname);
-	 */
+	if (proc) {
+		free(proc->comm);
+		proc->comm = strdup(procname);
+		proc->pid = pid;
+	}
 
 	return BT_CB_OK;
 
@@ -626,3 +636,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);
+}