X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Fcommon.c;h=4860b7aef76d406d1f8f44f97ae3fcdea9c0c133;hp=43e258be683d49bc8101fdd8654d9898b20df0de;hb=57bff78803b67f5b9736d18f57b88b6b6191975e;hpb=30b646c4e7aab1e1bee8fef60619a61bd80bedad

diff --git a/src/common.c b/src/common.c
index 43e258b..4860b7a 100644
--- a/src/common.c
+++ b/src/common.c
@@ -84,6 +84,51 @@ uint64_t get_context_ppid(const struct bt_ctf_event *event)
 	return ppid;
 }
 
+uint64_t get_context_vtid(const struct bt_ctf_event *event)
+{
+	const struct definition *scope;
+	uint64_t vtid;
+
+	scope = bt_ctf_get_top_level_scope(event, BT_STREAM_EVENT_CONTEXT);
+	vtid = bt_ctf_get_int64(bt_ctf_get_field(event,
+				scope, "_vtid"));
+	if (bt_ctf_field_get_error()) {
+		return -1ULL;
+	}
+
+	return vtid;
+}
+
+uint64_t get_context_vpid(const struct bt_ctf_event *event)
+{
+	const struct definition *scope;
+	uint64_t vpid;
+
+	scope = bt_ctf_get_top_level_scope(event, BT_STREAM_EVENT_CONTEXT);
+	vpid = bt_ctf_get_int64(bt_ctf_get_field(event,
+				scope, "_vpid"));
+	if (bt_ctf_field_get_error()) {
+		return -1ULL;
+	}
+
+	return vpid;
+}
+
+uint64_t get_context_vppid(const struct bt_ctf_event *event)
+{
+	const struct definition *scope;
+	uint64_t vppid;
+
+	scope = bt_ctf_get_top_level_scope(event, BT_STREAM_EVENT_CONTEXT);
+	vppid = bt_ctf_get_int64(bt_ctf_get_field(event,
+				scope, "_vppid"));
+	if (bt_ctf_field_get_error()) {
+		return -1ULL;
+	}
+
+	return vppid;
+}
+
 char *get_context_comm(const struct bt_ctf_event *event)
 {
 	const struct bt_definition *scope;
@@ -119,9 +164,13 @@ struct processtop* add_proc(struct lttngtop *ctx, int tid, char *comm,
 {
 	struct processtop *newproc;
 
+	if (opt_tid && !lookup_tid_list(tid))
+		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);
+
 	if (!newproc) {
 		newproc = g_new0(struct processtop, 1);
 		newproc->tid = tid;
@@ -149,12 +198,15 @@ struct processtop* add_proc(struct lttngtop *ctx, int tid, char *comm,
 }
 
 struct processtop* update_proc(struct processtop* proc, int pid, int tid,
-		int ppid, char *comm)
+		int ppid, int vpid, int vtid, int vppid, char *comm)
 {
 	if (proc) {
 		proc->pid = pid;
 		proc->tid = tid;
 		proc->ppid = ppid;
+		proc->vpid = vpid;
+		proc->vtid = vtid;
+		proc->vppid = vppid;
 		if (strcmp(proc->comm, comm) != 0) {
 			free(proc->comm);
 			proc->comm = strdup(comm);
@@ -207,6 +259,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)
@@ -475,7 +530,7 @@ enum bt_cb_ret handle_statedump_process_state(struct bt_ctf_event *call_data,
 	const struct bt_definition *scope;
 	struct processtop *proc;
 	unsigned long timestamp;
-	int64_t pid, tid;
+	int64_t pid, tid, ppid, vtid, vpid, vppid;
 	char *procname;
 
 	timestamp = bt_ctf_get_timestamp(call_data);
@@ -490,23 +545,37 @@ enum bt_cb_ret handle_statedump_process_state(struct bt_ctf_event *call_data,
 		fprintf(stderr, "Missing pid context info\n");
 		goto error;
 	}
-
-	scope = bt_ctf_get_top_level_scope(call_data,
-			BT_EVENT_FIELDS);
+	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;
+	}
 	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()) {
+		fprintf(stderr, "Missing vtid context info\n");
+		goto error;
+	}
+	vpid = bt_ctf_get_int64(bt_ctf_get_field(call_data,
+				scope, "_vpid"));
+	if (bt_ctf_field_get_error()) {
+		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 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,
@@ -519,18 +588,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);
 
-	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;
 
@@ -554,3 +618,8 @@ struct tm format_timestamp(uint64_t timestamp)
 
 	return tm;
 }
+
+int *lookup_tid_list(int tid)
+{
+	return g_hash_table_lookup(tid_list, (gpointer) &tid);
+}