X-Git-Url: http://git.liburcu.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Flttngtop.c;h=326bae832c34745517a4d680325ea496161c9853;hp=dd3130d975adac8dc736f4a3858606af29ac850f;hb=8fe4d0cfce4c1b1ace5aed2b2b1521caca113bd5;hpb=54761a45d53fe4b891dd60f17cbec0d3f85ab28d

diff --git a/src/lttngtop.c b/src/lttngtop.c
index dd3130d..326bae8 100644
--- a/src/lttngtop.c
+++ b/src/lttngtop.c
@@ -63,8 +63,11 @@ const char *opt_input_path;
 int opt_textdump;
 int opt_child;
 int opt_begin;
+int opt_all;
 
 int quit = 0;
+/* We need at least one valid trace to start processing. */
+int valid_trace = 0;
 
 struct lttngtop *copy;
 pthread_t display_thread;
@@ -73,6 +76,7 @@ pthread_t timer_thread;
 unsigned long refresh_display = 1 * NSEC_PER_SEC;
 unsigned long last_display_update = 0;
 unsigned long last_event_ts = 0;
+struct syscall *last_syscall;
 
 /* list of FDs available for being read with snapshots */
 struct bt_mmap_stream_list mmap_list;
@@ -96,6 +100,7 @@ enum {
 	OPT_RELAY_HOSTNAME,
 	OPT_KPROBES,
 	OPT_BEGIN,
+	OPT_ALL,
 };
 
 static struct poptOption long_options[] = {
@@ -109,6 +114,7 @@ static struct poptOption long_options[] = {
 	{ "relay-hostname", 'r', POPT_ARG_STRING, &opt_relay_hostname,
 		OPT_RELAY_HOSTNAME, NULL, NULL },
 	{ "kprobes", 'k', POPT_ARG_STRING, &opt_kprobes, OPT_KPROBES, NULL, NULL },
+	{ "all", 'a', POPT_ARG_NONE, NULL, OPT_ALL, NULL, NULL },
 	{ NULL, 0, 0, NULL, 0, NULL, NULL },
 };
 
@@ -175,7 +181,8 @@ void *ncurses_display(void *p)
 	}
 }
 
-void print_fields(struct bt_ctf_event *event)
+void print_fields(struct bt_ctf_event *event, const char *procname,
+		int pid)
 {
 	unsigned int cnt, i;
 	const struct bt_definition *const * list;
@@ -183,6 +190,9 @@ void print_fields(struct bt_ctf_event *event)
 	const struct bt_definition *scope;
 	enum ctf_type_id type;
 	const char *str;
+	struct processtop *current_proc;
+	struct files *current_file;
+	int fd, fd_value = -1;
 
 	scope = bt_ctf_get_top_level_scope(event, BT_EVENT_FIELDS);
 
@@ -192,12 +202,19 @@ void print_fields(struct bt_ctf_event *event)
 			printf(", ");
 		printf("%s = ", bt_ctf_field_name(list[i]));
 		l = bt_ctf_get_decl_from_def(list[i]);
+		if (strncmp(bt_ctf_field_name(list[i]), "fd", 2) == 0)
+			fd = 1;
+		else
+			fd = 0;
 		type = bt_ctf_field_type(l);
 		if (type == CTF_TYPE_INTEGER) {
-			if (bt_ctf_get_int_signedness(l) == 0)
-				printf("%" PRIu64 "", bt_ctf_get_uint64(list[i]));
-			else
-				printf("%" PRId64 "", bt_ctf_get_int64(list[i]));
+			if (bt_ctf_get_int_signedness(l) == 0) {
+				fd_value = bt_ctf_get_uint64(list[i]);
+				printf("%" PRIu64, bt_ctf_get_uint64(list[i]));
+			} else {
+				fd_value = bt_ctf_get_int64(list[i]);
+				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) {
@@ -205,6 +222,15 @@ void print_fields(struct bt_ctf_event *event)
 			if (!bt_ctf_field_get_error() && str)
 				printf("%s", str);
 		}
+		if (fd) {
+			current_proc = find_process_tid(&lttngtop, pid, procname);
+			if (!current_proc)
+				continue;
+			current_file = get_file(current_proc, fd_value);
+			if (!current_file || !current_file->name)
+				continue;
+			printf("<%s>", current_file->name);
+		}
 	}
 }
 
@@ -212,13 +238,13 @@ void print_fields(struct bt_ctf_event *event)
  * hook on each event to check the timestamp and refresh the display if
  * necessary
  */
-enum bt_cb_ret print_timestamp(struct bt_ctf_event *call_data, void *private_data)
+enum bt_cb_ret textdump(struct bt_ctf_event *call_data, void *private_data)
 {
 	unsigned long timestamp;
 	uint64_t delta;
 	struct tm start;
 	uint64_t ts_nsec_start;
-	int pid, cpu_id, tid, ret;
+	int pid, cpu_id, tid, ret, lookup, current_syscall = 0;
 	const struct bt_definition *scope;
 	const char *hostname, *procname;
 	struct cputime *cpu;
@@ -243,8 +269,12 @@ enum bt_cb_ret print_timestamp(struct bt_ctf_event *call_data, void *private_dat
 	tid = get_context_tid(call_data);
 	
 	hostname = get_context_hostname(call_data);
+	if (opt_child)
+		lookup = pid;
+	else
+		lookup = tid;
 	if (opt_tid || opt_hostname || opt_exec_name) {
-		if (!lookup_filter_tid_list(pid)) {
+		if (!lookup_filter_tid_list(lookup)) {
 			/* To display when a process of ours in getting scheduled in */
 			if (strcmp(bt_ctf_event_name(call_data), "sched_switch") == 0) {
 				int next_tid;
@@ -258,14 +288,27 @@ enum bt_cb_ret print_timestamp(struct bt_ctf_event *call_data, void *private_dat
 					goto error;
 				}
 				if (!lookup_filter_tid_list(next_tid)) {
-					goto end;
+					if (!opt_all)
+						goto end;
+				} else {
+					if (opt_all)
+						printf("%c[1m", 27);
 				}
-			} else {
+			} else if (!opt_all) {
 				goto end;
 			}
+		} else {
+			if (opt_all)
+				printf("%c[1m", 27);
 		}
 	}
 
+	if (last_syscall && (strncmp(bt_ctf_event_name(call_data),
+				 "exit_syscall", 12)) != 0) {
+		last_syscall = NULL;
+		printf(" ...interrupted...\n");
+	}
+
 	cpu_id = get_cpu_id(call_data);
 	procname = get_context_comm(call_data);
 	if (strncmp(bt_ctf_event_name(call_data), "sys_", 4) == 0) {
@@ -273,15 +316,40 @@ enum bt_cb_ret print_timestamp(struct bt_ctf_event *call_data, void *private_dat
 		cpu->current_syscall = g_new0(struct syscall, 1);
 		cpu->current_syscall->name = strdup(bt_ctf_event_name(call_data));
 		cpu->current_syscall->ts_start = timestamp;
+		cpu->current_syscall->cpu_id = cpu_id;
+		last_syscall = cpu->current_syscall;
+		current_syscall = 1;
 	} else if ((strncmp(bt_ctf_event_name(call_data), "exit_syscall", 12)) == 0) {
 		struct tm start_ts;
 
+		/* Return code of a syscall if it was the last displayed event. */
+		if (last_syscall && last_syscall->ts_start == prev_ts) {
+			if (last_syscall->cpu_id == cpu_id) {
+				int64_t syscall_ret;
+
+				delta = timestamp - last_syscall->ts_start;
+				scope = bt_ctf_get_top_level_scope(call_data,
+						BT_EVENT_FIELDS);
+				syscall_ret = bt_ctf_get_int64(bt_ctf_get_field(call_data,
+							scope, "_ret"));
+
+				printf("= %" PRId64 " (%" PRIu64 ".%09" PRIu64 "s)\n",
+						syscall_ret, delta / NSEC_PER_SEC,
+						delta % NSEC_PER_SEC);
+				last_syscall = NULL;
+				goto end;
+			} else {
+				last_syscall = NULL;
+				printf(" ...interrupted...\n");
+			}
+		}
+
 		cpu = get_cpu(cpu_id);
 		if (cpu->current_syscall) {
 			delta = timestamp - cpu->current_syscall->ts_start;
 			start_ts = format_timestamp(cpu->current_syscall->ts_start);
 			ret = asprintf(&from_syscall, " [from %02d:%02d:%02d.%09" PRIu64
-					" (+%" PRIu64 ".%09" PRIu64 ") (cpu %d) %s]\n",
+					" (+%" PRIu64 ".%09" PRIu64 ") (cpu %d) %s]",
 					start_ts.tm_hour, start_ts.tm_min, start_ts.tm_sec,
 					cpu->current_syscall->ts_start % NSEC_PER_SEC,
 					delta / NSEC_PER_SEC, delta % NSEC_PER_SEC,
@@ -292,6 +360,7 @@ enum bt_cb_ret print_timestamp(struct bt_ctf_event *call_data, void *private_dat
 			free(cpu->current_syscall->name);
 			g_free(cpu->current_syscall);
 			cpu->current_syscall = NULL;
+			last_syscall = NULL;
 		}
 	}
 
@@ -307,10 +376,13 @@ enum bt_cb_ret print_timestamp(struct bt_ctf_event *call_data, void *private_dat
 			delta % NSEC_PER_SEC, (hostname) ? hostname : "",
 			(hostname) ? " ": "", cpu_id, procname, pid, tid,
 			bt_ctf_event_name(call_data));
-	print_fields(call_data);
-	printf(")%s", (from_syscall) ? from_syscall : "\n");
+	print_fields(call_data, procname, pid);
+	printf(")%s%c", (from_syscall) ? from_syscall : "",
+			(!current_syscall) ? '\n' : ' ');
 
 	free(from_syscall);
+	if (opt_all && (opt_tid || opt_hostname || opt_exec_name))
+		printf("%c[0m", 27);
 
 end:
 	return BT_CB_OK;
@@ -499,7 +571,7 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
 	}
 	ppid = get_context_ppid(call_data);
 	if (ppid == -1ULL) {
-		goto error;
+		goto end;
 	}
 	vpid = get_context_vpid(call_data);
 	if (pid == -1ULL) {
@@ -591,6 +663,7 @@ void usage(FILE *fp)
 	fprintf(fp, "  -p, --pid                Comma-separated list of PIDs to display\n");
 	fprintf(fp, "  -f, --child              Follow threads associated with selected PIDs\n");
 	fprintf(fp, "  -n, --hostname           Comma-separated list of hostnames to display (require hostname context in trace)\n");
+	fprintf(fp, "  -a, --all                In textdump mode, display all events but write in bold the processes we are interested in (-f, -p and -n)\n");
 	fprintf(fp, "  -k, --kprobes            Comma-separated list of kprobes to insert (same format as lttng enable-event)\n");
 	fprintf(fp, "  -r, --relay-hostname     Network live streaming : hostname of the lttng-relayd (default port)\n");
 	fprintf(fp, "  -b, --begin              Network live streaming : read the trace for the beginning of the recording\n");
@@ -697,6 +770,9 @@ static int parse_options(int argc, char **argv)
 			case OPT_TEXTDUMP:
 				opt_textdump = 1;
 				break;
+			case OPT_ALL:
+				opt_all = 1;
+				break;
 			case OPT_CHILD:
 				opt_child = 1;
 				break;
@@ -794,9 +870,29 @@ 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);
+	bt_ctf_iter_add_callback(iter,
+			g_quark_from_static_string(
+				"lttng_statedump_file_descriptor"),
+			NULL, 0, handle_statedump_file_descriptor,
+			NULL, NULL, NULL);
+	bt_ctf_iter_add_callback(iter,
+			g_quark_from_static_string("sys_open"),
+			NULL, 0, handle_sys_open, NULL, NULL, NULL);
+	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("exit_syscall"),
+			NULL, 0, handle_exit_syscall, NULL, NULL, NULL);
 	if (opt_textdump) {
 		bt_ctf_iter_add_callback(iter, 0, NULL, 0,
-				print_timestamp,
+				textdump,
 				NULL, NULL, NULL);
 	} else {
 		/* at each event check if we need to refresh */
@@ -807,34 +903,13 @@ void iter_trace(struct bt_context *bt_ctx)
 		bt_ctf_iter_add_callback(iter,
 				g_quark_from_static_string("sched_switch"),
 				NULL, 0, handle_sched_switch, 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,
-				g_quark_from_static_string("exit_syscall"),
-				NULL, 0, handle_exit_syscall, NULL, NULL, NULL);
 		bt_ctf_iter_add_callback(iter,
 				g_quark_from_static_string("sys_write"),
 				NULL, 0, handle_sys_write, NULL, NULL, NULL);
 		bt_ctf_iter_add_callback(iter,
 				g_quark_from_static_string("sys_read"),
 				NULL, 0, handle_sys_read, NULL, NULL, NULL);
-		bt_ctf_iter_add_callback(iter,
-				g_quark_from_static_string("sys_open"),
-				NULL, 0, handle_sys_open, NULL, NULL, NULL);
-		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);
 
 		/* for kprobes */
 		if (lttngtop.kprobes_table) {
@@ -1090,6 +1165,9 @@ int check_requirements(struct bt_context *ctx)
 		ret = -1;
 		fprintf(stderr, "[error] missing procname context information\n");
 	}
+	if (ret == 0) {
+		valid_trace = 1;
+	}
 
 end:
 	return ret;
@@ -1107,6 +1185,7 @@ int main(int argc, char **argv, char **envp)
 	int ret;
 	struct bt_context *bt_ctx = NULL;
 
+	//babeltrace_verbose = 1;
 	init_lttngtop();
 	ret = parse_options(argc, argv);
 	if (ret < 0) {
@@ -1165,10 +1244,10 @@ int main(int argc, char **argv, char **envp)
 		}
 
 		ret = check_requirements(bt_ctx);
-		if (ret < 0) {
+		if (ret < 0 && !valid_trace) {
 			fprintf(stderr, "[error] some mandatory contexts "
 					"were missing, exiting.\n");
-			goto end;
+			//goto end;
 		}
 
 		if (!opt_textdump) {