X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Flttngtop.c;h=6bd7d67e7b65b1b08b07870cabbf1a939e777b8b;hp=e98785a8cfe5e3c06cb65affcc2fa7ff1ecaaf0a;hb=4553b4d1cec894832e19f5702aa33e107e497365;hpb=ceb3a2216fed5f405aa77c358328f71f44ed3303

diff --git a/src/lttngtop.c b/src/lttngtop.c
index e98785a..6bd7d67 100644
--- a/src/lttngtop.c
+++ b/src/lttngtop.c
@@ -316,6 +316,11 @@ void init_lttngtop()
 	sem_init(&pause_sem, 0, 1);
 	sem_init(&end_trace_sem, 0, 0);
 
+	reset_global_counters();
+	lttngtop.nbproc = 0;
+	lttngtop.nbthreads = 0;
+	lttngtop.nbfiles = 0;
+
 	lttngtop.process_table = g_ptr_array_new();
 	lttngtop.files_table = g_ptr_array_new();
 	lttngtop.cpu_table = g_ptr_array_new();
@@ -407,6 +412,12 @@ void iter_trace(struct bt_context *bt_ctx)
 	bt_ctf_iter_add_callback(iter,
 			g_quark_from_static_string("sched_process_free"),
 			NULL, 0, handle_sched_process_free, NULL, NULL, NULL);
+	/* to get all the process from the statedumps */
+	bt_ctf_iter_add_callback(iter,
+			g_quark_from_static_string(
+				"lttng_statedump_process_state"),
+			NULL, 0, handle_statedump_process_state,
+			NULL, NULL, NULL);
 
 	/* for IO top */
 	bt_ctf_iter_add_callback(iter,
@@ -424,13 +435,12 @@ void iter_trace(struct bt_context *bt_ctx)
 	bt_ctf_iter_add_callback(iter,
 			g_quark_from_static_string("sys_close"),
 			NULL, 0, handle_sys_close, NULL, NULL, NULL);
-/*
 	bt_ctf_iter_add_callback(iter,
 			g_quark_from_static_string(
 					"lttng_statedump_file_descriptor"),
 			NULL, 0, handle_statedump_file_descriptor,
 			NULL, NULL, NULL);
-*/
+
 	while ((event = bt_ctf_iter_read_event(iter)) != NULL) {
 		ret = bt_iter_next(bt_ctf_get_iter(iter));
 		if (ret < 0)
@@ -538,6 +548,104 @@ error:
 	return ret;
 }
 
+static int check_field_requirements(const struct bt_ctf_field_decl *const * field_list,
+		int field_cnt, int *tid_check, int *pid_check,
+		int *procname_check, int *ppid_check)
+{
+	int j;
+
+	for (j = 0; j < field_cnt; j++) {
+		if (*tid_check == 0) {
+			if (strncmp(bt_ctf_get_decl_field_name(field_list[j]), "tid", 3) == 0) {
+				(*tid_check)++;
+			}
+		}
+		if (*pid_check == 0) {
+			if (strncmp(bt_ctf_get_decl_field_name(field_list[j]), "pid", 3) == 0)
+				(*pid_check)++;
+		}
+		if (*ppid_check == 0) {
+			if (strncmp(bt_ctf_get_decl_field_name(field_list[j]), "ppid", 4) == 0)
+				(*ppid_check)++;
+		}
+		if (*procname_check == 0) {
+			if (strncmp(bt_ctf_get_decl_field_name(field_list[j]), "procname", 8) == 0)
+				(*procname_check)++;
+		}
+	}
+	/* if all checks are OK, no need to continue the checks */
+	if (*tid_check == 1 && *pid_check == 1 && *ppid_check == 1 &&
+			*procname_check == 1)
+		return 0;
+
+	return -1;
+}
+
+/*
+ * check_requirements: check if the required context informations are available
+ *
+ * If each mandatory context information is available for at least in one
+ * event, return 0 otherwise return -1.
+ */
+int check_requirements(struct bt_context *ctx)
+{
+	unsigned int i, evt_cnt, field_cnt;
+	struct bt_ctf_event_decl *const * evt_list;
+	const struct bt_ctf_field_decl *const * field_list;
+	int tid_check = 0;
+	int pid_check = 0;
+	int procname_check = 0;
+	int ppid_check = 0;
+	int ret = 0;
+
+	bt_ctf_get_event_decl_list(0, ctx, &evt_list, &evt_cnt);
+	for (i = 0; i < evt_cnt; i++) {
+		bt_ctf_get_decl_fields(evt_list[i], BT_STREAM_EVENT_CONTEXT,
+				&field_list, &field_cnt);
+		ret = check_field_requirements(field_list, field_cnt,
+				&tid_check, &pid_check, &procname_check,
+				&ppid_check);
+		if (ret == 0)
+			goto end;
+
+		bt_ctf_get_decl_fields(evt_list[i], BT_EVENT_CONTEXT,
+				&field_list, &field_cnt);
+		ret = check_field_requirements(field_list, field_cnt,
+				&tid_check, &pid_check, &procname_check,
+				&ppid_check);
+		if (ret == 0)
+			goto end;
+
+		bt_ctf_get_decl_fields(evt_list[i], BT_STREAM_PACKET_CONTEXT,
+				&field_list, &field_cnt);
+		ret = check_field_requirements(field_list, field_cnt,
+				&tid_check, &pid_check, &procname_check,
+				&ppid_check);
+		if (ret == 0)
+			goto end;
+	}
+
+	if (tid_check == 0) {
+		ret = -1;
+		fprintf(stderr, "[error] missing tid context information\n");
+	}
+	if (pid_check == 0) {
+		ret = -1;
+		fprintf(stderr, "[error] missing pid context information\n");
+	}
+	if (ppid_check == 0) {
+		ret = -1;
+		fprintf(stderr, "[error] missing ppid context information\n");
+	}
+	if (procname_check == 0) {
+		ret = -1;
+		fprintf(stderr, "[error] missing procname context information\n");
+	}
+
+end:
+	return ret;
+}
+
 int main(int argc, char **argv)
 {
 	int ret;
@@ -557,7 +665,13 @@ int main(int argc, char **argv)
 	bt_ctx = bt_context_create();
 	ret = bt_context_add_traces_recursive(bt_ctx, opt_input_path, "ctf", NULL);
 	if (ret < 0) {
-		printf("[error] Opening the trace\n");
+		fprintf(stderr, "[error] Opening the trace\n");
+		goto end;
+	}
+
+	ret = check_requirements(bt_ctx);
+	if (ret < 0) {
+		fprintf(stderr, "[error] missing mandatory context informations\n");
 		goto end;
 	}