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

diff --git a/src/common.c b/src/common.c
index b18eafd..4860b7a 100644
--- a/src/common.c
+++ b/src/common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 Julien Desfossez
+ * Copyright (C) 2011-2012 Julien Desfossez
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License Version 2 as
@@ -23,7 +23,7 @@
 
 uint64_t get_cpu_id(const struct bt_ctf_event *event)
 {
-	const struct definition *scope;
+	const struct bt_definition *scope;
 	uint64_t cpu_id;
 
 	scope = bt_ctf_get_top_level_scope(event, BT_STREAM_PACKET_CONTEXT);
@@ -38,7 +38,7 @@ uint64_t get_cpu_id(const struct bt_ctf_event *event)
 
 uint64_t get_context_tid(const struct bt_ctf_event *event)
 {
-	const struct definition *scope;
+	const struct bt_definition *scope;
 	uint64_t tid;
 
 	scope = bt_ctf_get_top_level_scope(event, BT_STREAM_EVENT_CONTEXT);
@@ -54,7 +54,7 @@ uint64_t get_context_tid(const struct bt_ctf_event *event)
 
 uint64_t get_context_pid(const struct bt_ctf_event *event)
 {
-	const struct definition *scope;
+	const struct bt_definition *scope;
 	uint64_t pid;
 
 	scope = bt_ctf_get_top_level_scope(event, BT_STREAM_EVENT_CONTEXT);
@@ -70,7 +70,7 @@ uint64_t get_context_pid(const struct bt_ctf_event *event)
 
 uint64_t get_context_ppid(const struct bt_ctf_event *event)
 {
-	const struct definition *scope;
+	const struct bt_definition *scope;
 	uint64_t ppid;
 
 	scope = bt_ctf_get_top_level_scope(event, BT_STREAM_EVENT_CONTEXT);
@@ -84,9 +84,54 @@ uint64_t get_context_ppid(const struct bt_ctf_event *event)
 	return ppid;
 }
 
-char *get_context_comm(const struct bt_ctf_event *event)
+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;
 	char *comm;
 
 	scope = bt_ctf_get_top_level_scope(event, BT_STREAM_EVENT_CONTEXT);
@@ -103,20 +148,15 @@ char *get_context_comm(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
- *
- * FIXME : char *comm useful ???
  */
 struct processtop *find_process_tid(struct lttngtop *ctx, int tid, char *comm)
 {
-	gint i;
 	struct processtop *tmp;
 
-	for (i = 0; i < ctx->process_table->len; i++) {
-		tmp = g_ptr_array_index(ctx->process_table, i);
-		if (tmp && tmp->tid == tid)
-			return tmp;
-	}
-	return NULL;
+	tmp = g_hash_table_lookup(ctx->process_hash_table,
+			(gconstpointer) (unsigned long) tid);
+
+	return tmp;
 }
 
 struct processtop* add_proc(struct lttngtop *ctx, int tid, char *comm,
@@ -124,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;
@@ -142,6 +186,8 @@ struct processtop* add_proc(struct lttngtop *ctx, int tid, char *comm,
 		newproc->threads = g_ptr_array_new();
 		newproc->perf = g_hash_table_new(g_str_hash, g_str_equal);
 		g_ptr_array_add(ctx->process_table, newproc);
+		g_hash_table_insert(ctx->process_hash_table,
+				(gpointer) (unsigned long) tid, newproc);
 
 		ctx->nbnewthreads++;
 		ctx->nbthreads++;
@@ -152,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);
@@ -175,6 +224,9 @@ void death_proc(struct lttngtop *ctx, int tid, char *comm,
 {
 	struct processtop *tmp;
 	tmp = find_process_tid(ctx, tid, comm);
+
+	g_hash_table_remove(ctx->process_hash_table,
+			(gpointer) (unsigned long) tid);
 	if (tmp && strcmp(tmp->comm, comm) == 0) {
 		tmp->death = timestamp;
 		ctx->nbdeadthreads++;
@@ -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)
@@ -283,6 +338,11 @@ void copy_perf_counter(gpointer key, gpointer value, gpointer new_table)
 	g_hash_table_insert((GHashTable *) new_table, strdup(key), newperf);
 }
 
+void copy_process_table(gpointer key, gpointer value, gpointer new_table)
+{
+	g_hash_table_insert((GHashTable *) new_table, key, value);
+}
+
 void rotate_perfcounter() {
 	int i;
 	struct processtop *tmp;
@@ -360,11 +420,12 @@ 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->perf_list = g_hash_table_new(g_str_hash, g_str_equal);
+	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);
 
 	rotate_cputime(end);
 
-	g_hash_table_foreach(lttngtop.perf_list, copy_perf_counter, dst->perf_list);
 	for (i = 0; i < lttngtop.process_table->len; i++) {
 		tmp = g_ptr_array_index(lttngtop.process_table, i);
 		new = g_new0(struct processtop, 1);
@@ -462,3 +523,103 @@ struct lttngtop* get_copy_lttngtop(unsigned long start, unsigned long end)
 	return dst;
 }
 
+
+enum bt_cb_ret handle_statedump_process_state(struct bt_ctf_event *call_data,
+		void *private_data)
+{
+	const struct bt_definition *scope;
+	struct processtop *proc;
+	unsigned long timestamp;
+	int64_t pid, tid, ppid, vtid, vpid, vppid;
+	char *procname;
+
+	timestamp = bt_ctf_get_timestamp(call_data);
+	if (timestamp == -1ULL)
+		goto error;
+
+	scope = bt_ctf_get_top_level_scope(call_data,
+			 BT_EVENT_FIELDS);
+	pid = bt_ctf_get_int64(bt_ctf_get_field(call_data,
+			     scope, "_pid"));
+	if (bt_ctf_field_get_error()) {
+		fprintf(stderr, "Missing pid context info\n");
+		goto error;
+	}
+	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;
+	}
+
+	scope = bt_ctf_get_top_level_scope(call_data,
+			BT_EVENT_FIELDS);
+	procname = bt_ctf_get_char_array(bt_ctf_get_field(call_data,
+				scope, "_name"));
+	if (bt_ctf_field_get_error()) {
+		fprintf(stderr, "Missing process name context info\n");
+		goto 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);
+
+	if (proc) {
+		free(proc->comm);
+		proc->comm = strdup(procname);
+		proc->pid = pid;
+	}
+
+	return BT_CB_OK;
+
+error:
+	return BT_CB_ERROR_STOP;
+}
+
+struct tm format_timestamp(uint64_t timestamp)
+{
+	struct tm tm;
+	uint64_t ts_sec = 0, ts_nsec;
+	time_t time_s;
+
+	ts_nsec = timestamp;
+	ts_sec += ts_nsec / NSEC_PER_SEC;
+	ts_nsec = ts_nsec % NSEC_PER_SEC;
+
+	time_s = (time_t) ts_sec;
+
+	localtime_r(&time_s, &tm);
+
+	return tm;
+}
+
+int *lookup_tid_list(int tid)
+{
+	return g_hash_table_lookup(tid_list, (gpointer) &tid);
+}