X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Fcommon.c;h=3051f7e3b62b0ab7ac0d5c8cf6d74d291bfc48fa;hp=7c67264ebba1fdc652a1890c82aaee3266260a89;hb=928f18a6c02cf1eaafb7b60cb72860ed68d7456b;hpb=ceb3a2216fed5f405aa77c358328f71f44ed3303

diff --git a/src/common.c b/src/common.c
index 7c67264..3051f7e 100644
--- a/src/common.c
+++ b/src/common.c
@@ -100,6 +100,12 @@ char *get_context_comm(const struct bt_ctf_event *event)
 	return comm;
 }
 
+/*
+ * 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;
@@ -132,9 +138,13 @@ struct processtop* add_proc(struct lttngtop *ctx, int tid, char *comm,
 		newproc->fileread = 0;
 		newproc->filewrite = 0;
 		newproc->syscall_info = NULL;
+		newproc->threadparent = NULL;
 		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);
+
+		ctx->nbnewthreads++;
+		ctx->nbthreads++;
 	}
 	newproc->comm = strdup(comm);
 
@@ -165,8 +175,11 @@ void death_proc(struct lttngtop *ctx, int tid, char *comm,
 {
 	struct processtop *tmp;
 	tmp = find_process_tid(ctx, tid, comm);
-	if (tmp && strcmp(tmp->comm, comm) == 0)
+	if (tmp && strcmp(tmp->comm, comm) == 0) {
 		tmp->death = timestamp;
+		ctx->nbdeadthreads++;
+		ctx->nbthreads--;
+	}
 }
 
 struct processtop* get_proc(struct lttngtop *ctx, int tid, char *comm,
@@ -179,6 +192,16 @@ struct processtop* get_proc(struct lttngtop *ctx, int tid, char *comm,
 	return add_proc(ctx, tid, comm, timestamp);
 }
 
+struct processtop *get_proc_pid(struct lttngtop *ctx, int tid, int pid,
+		unsigned long timestamp)
+{
+	struct processtop *tmp;
+	tmp = find_process_tid(ctx, tid, NULL);
+	if (tmp && tmp->pid == pid)
+		return tmp;
+	return add_proc(ctx, tid, "Unknown", timestamp);
+}
+
 void add_thread(struct processtop *parent, struct processtop *thread)
 {
 	gint i;
@@ -252,7 +275,7 @@ void reset_perf_counter(gpointer key, gpointer value, gpointer user_data)
 void copy_perf_counter(gpointer key, gpointer value, gpointer new_table)
 {
 	struct perfcounter *newperf;
-	
+
 	newperf = g_new0(struct perfcounter, 1);
 	newperf->count = ((struct perfcounter *) value)->count;
 	newperf->visible = ((struct perfcounter *) value)->visible;
@@ -297,6 +320,30 @@ void cleanup_processtop()
 	}
 }
 
+void reset_global_counters()
+{
+	lttngtop.nbnewproc = 0;
+	lttngtop.nbdeadproc = 0;
+	lttngtop.nbnewthreads = 0;
+	lttngtop.nbdeadthreads = 0;
+	lttngtop.nbnewfiles = 0;
+	lttngtop.nbclosedfiles = 0;
+}
+
+void copy_global_counters(struct lttngtop *dst)
+{
+	dst->nbproc = lttngtop.nbproc;
+	dst->nbnewproc = lttngtop.nbnewproc;
+	dst->nbdeadproc = lttngtop.nbdeadproc;
+	dst->nbthreads = lttngtop.nbthreads;
+	dst->nbnewthreads = lttngtop.nbnewthreads;
+	dst->nbdeadthreads = lttngtop.nbdeadthreads;
+	dst->nbfiles = lttngtop.nbfiles;
+	dst->nbnewfiles = lttngtop.nbnewfiles;
+	dst->nbclosedfiles = lttngtop.nbclosedfiles;
+	reset_global_counters();
+}
+
 struct lttngtop* get_copy_lttngtop(unsigned long start, unsigned long end)
 {
 	gint i, j;
@@ -309,6 +356,7 @@ struct lttngtop* get_copy_lttngtop(unsigned long start, unsigned long end)
 	dst = g_new0(struct lttngtop, 1);
 	dst->start = start;
 	dst->end = end;
+	copy_global_counters(dst);
 	dst->process_table = g_ptr_array_new();
 	dst->files_table = g_ptr_array_new();
 	dst->cpu_table = g_ptr_array_new();
@@ -357,6 +405,7 @@ struct lttngtop* get_copy_lttngtop(unsigned long start, unsigned long end)
 			 * files associated with if after the copy
 			 */
 			if (tmp->death > 0 && tmp->death < end) {
+				/* FIXME : close the files before */
 				g_ptr_array_remove(tmp->process_files_table, tmpfile);
 				g_free(tmpfile);
 			}
@@ -413,3 +462,72 @@ 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 definition *scope;
+	struct processtop *proc;
+	unsigned long timestamp;
+	int64_t pid, tid;
+	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;
+	}
+
+	scope = bt_ctf_get_top_level_scope(call_data,
+			BT_EVENT_FIELDS);
+	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;
+	}
+
+	/*
+	 * 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,
+				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);
+
+	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);
+	 */
+
+	return BT_CB_OK;
+
+error:
+	return BT_CB_ERROR_STOP;
+}