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

diff --git a/src/lttngtop.c b/src/lttngtop.c
index d51302c..6bd7d67 100644
--- a/src/lttngtop.c
+++ b/src/lttngtop.c
@@ -113,7 +113,7 @@ void *ncurses_display(void *p)
  * hook on each event to check the timestamp and refresh the display if
  * necessary
  */
-enum bt_cb_ret check_timestamp(struct ctf_event_definition *call_data, void *private_data)
+enum bt_cb_ret check_timestamp(struct bt_ctf_event *call_data, void *private_data)
 {
 	unsigned long timestamp;
 
@@ -195,7 +195,7 @@ void update_perf_value(struct processtop *proc, struct cputime *cpu,
 	}
 }
 
-void extract_perf_counter_scope(const struct ctf_event_definition *event,
+void extract_perf_counter_scope(const struct bt_ctf_event *event,
 		const struct definition *scope,
 		struct processtop *proc,
 		struct cputime *cpu)
@@ -225,7 +225,7 @@ end:
 	return;
 }
 
-void update_perf_counter(struct processtop *proc, const struct ctf_event_definition *event)
+void update_perf_counter(struct processtop *proc, const struct bt_ctf_event *event)
 {
 	struct cputime *cpu;
 	const struct definition *scope;
@@ -242,7 +242,7 @@ void update_perf_counter(struct processtop *proc, const struct ctf_event_definit
 	extract_perf_counter_scope(event, scope, proc, cpu);
 }
 
-enum bt_cb_ret fix_process_table(struct ctf_event_definition *call_data,
+enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
 		void *private_data)
 {
 	int pid, tid, ppid;
@@ -390,7 +390,7 @@ void iter_trace(struct bt_context *bt_ctx)
 {
 	struct bt_ctf_iter *iter;
 	struct bt_iter_pos begin_pos;
-	const struct ctf_event_definition *event;
+	const struct bt_ctf_event *event;
 	int ret = 0;
 
 	begin_pos.type = BT_SEEK_BEGIN;
@@ -412,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,
@@ -542,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;
@@ -561,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;
 	}