X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Flttngtop.c;h=87a4043adb6f70f5bb34bec34d72892ae0dcb848;hp=5cb418fae0fd069e25d2cd94de6b59b4597211f2;hb=fbbda4dac5b23757921dea8e2992cbb6bff5775f;hpb=c8d75a13bc5c025053b0c2c14fa1a7dfdaa1b448

diff --git a/src/lttngtop.c b/src/lttngtop.c
index 5cb418f..87a4043 100644
--- a/src/lttngtop.c
+++ b/src/lttngtop.c
@@ -156,6 +156,37 @@ void *ncurses_display(void *p)
 	}
 }
 
+void print_fields(struct bt_ctf_event *event)
+{
+	unsigned int cnt, i;
+	const struct definition *const * list;
+	const struct definition *scope;
+	enum ctf_type_id type;
+	const char *str;
+
+	scope = bt_ctf_get_top_level_scope(event, BT_EVENT_FIELDS);
+
+	bt_ctf_get_field_list(event, scope, &list, &cnt);
+	for (i = 0; i < cnt; i++) {
+		if (i != 0)
+			printf(", ");
+		printf("%s = ", bt_ctf_field_name(list[i]));
+		type = bt_ctf_field_type(list[i]);
+		if (type == CTF_TYPE_INTEGER) {
+			if (bt_ctf_get_int_signedness(list[i]) == 0)
+				printf("%" PRIu64 "", bt_ctf_get_uint64(list[i]));
+			else
+				printf("%" PRId64 "", bt_ctf_get_int64(list[i]));
+		} else if (type == CTF_TYPE_STRING) {
+			printf("%s", bt_ctf_get_string(list[i]));
+		} else if (type == CTF_TYPE_ARRAY) {
+			str = bt_ctf_get_char_array(list[i]);
+			if (!bt_ctf_field_get_error() && str)
+				printf("%s", str);
+		}
+	}
+}
+
 /*
  * hook on each event to check the timestamp and refresh the display if
  * necessary
@@ -165,10 +196,10 @@ enum bt_cb_ret print_timestamp(struct bt_ctf_event *call_data, void *private_dat
 	unsigned long timestamp;
 	struct tm start;
 	uint64_t ts_nsec_start;
-	int pid;
+	int pid, cpu_id;
 	int64_t syscall_ret;
 	const struct definition *scope;
-	const char *hostname;
+	const char *hostname, *procname;
 
 	timestamp = bt_ctf_get_timestamp(call_data);
 
@@ -189,7 +220,10 @@ enum bt_cb_ret print_timestamp(struct bt_ctf_event *call_data, void *private_dat
 			(opt_hostname && !lookup_hostname_list(hostname)))
 		goto end;
 
-	if (strcmp(bt_ctf_event_name(call_data), "exit_syscall") == 0) {
+	cpu_id = get_cpu_id(call_data);
+	procname = get_context_comm(call_data);
+
+	if ((strcmp(bt_ctf_event_name(call_data), "exit_syscall") == 0) && !last_textdump_print_newline) {
 		scope = bt_ctf_get_top_level_scope(call_data,
 				BT_EVENT_FIELDS);
 		syscall_ret = bt_ctf_get_int64(bt_ctf_get_field(call_data,
@@ -201,10 +235,18 @@ enum bt_cb_ret print_timestamp(struct bt_ctf_event *call_data, void *private_dat
 		 * print the newline in this case */
 		if (last_textdump_print_newline == 0)
 			printf("\n");
-		printf("%02d:%02d:%02d.%09" PRIu64 " %d : %s ", start.tm_hour,
-				start.tm_min, start.tm_sec, ts_nsec_start,
-				pid, bt_ctf_event_name(call_data));
-		last_textdump_print_newline = 0;
+		printf("%02d:%02d:%02d.%09" PRIu64 " (%s) (cpu %d) [%s (%d)] %s (",
+				start.tm_hour, start.tm_min, start.tm_sec,
+				ts_nsec_start, hostname, cpu_id, procname, pid,
+				bt_ctf_event_name(call_data));
+		print_fields(call_data);
+		printf(") ");
+		if (strncmp(bt_ctf_event_name(call_data), "sys_", 4) != 0) {
+			printf("\n");
+			last_textdump_print_newline = 1;
+		} else {
+			last_textdump_print_newline = 0;
+		}
 	}
 
 end:
@@ -582,7 +624,7 @@ void iter_trace(struct bt_context *bt_ctx)
 				NULL, NULL, NULL);
 	}
 
-	while ((event = bt_ctf_iter_read_event(iter, NULL)) != NULL) {
+	while ((event = bt_ctf_iter_read_event(iter)) != NULL) {
 		if (quit || reload_trace)
 			goto end_iter;
 		ret = bt_iter_next(bt_ctf_get_iter(iter));
@@ -1028,6 +1070,7 @@ int setup_live_tracing()
 		goto error_session;
 	}
 
+	memset(&ev, '\0', sizeof(struct lttng_event));
 	ev.type = LTTNG_EVENT_SYSCALL;
 	if ((ret = lttng_enable_event(handle, &ev, channel_name)) < 0) {
 		fprintf(stderr,"error enabling syscalls : %s\n",
@@ -1035,6 +1078,20 @@ int setup_live_tracing()
 		goto error_session;
 	}
 
+	/*
+	memset(&ev, '\0', sizeof(struct lttng_event));
+	ev.type = LTTNG_EVENT_PROBE;
+	sprintf(ev.attr.probe.symbol_name, "sys_open");
+	sprintf(ev.name, "probe_sys_open");
+	ev.attr.probe.addr = 0;
+	ev.attr.probe.offset = 0;
+	if ((ret = lttng_enable_event(handle, &ev, channel_name)) < 0) {
+		fprintf(stderr,"error enabling kprobes : %s\n",
+				helper_lttcomm_get_readable_code(ret));
+		goto error_session;
+	}
+	*/
+
 	kctxpid.ctx = LTTNG_EVENT_CONTEXT_PID;
 	lttng_add_context(handle, &kctxpid, NULL, NULL);
 	kctxtid.ctx = LTTNG_EVENT_CONTEXT_TID;