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

diff --git a/src/lttngtop.c b/src/lttngtop.c
index 28acebf..5cb418f 100644
--- a/src/lttngtop.c
+++ b/src/lttngtop.c
@@ -52,7 +52,6 @@
 
 const char *opt_input_path;
 static int opt_textdump;
-static int opt_pid;
 static int opt_child;
 
 int quit = 0;
@@ -74,12 +73,15 @@ GPtrArray *available_snapshots;
 sem_t metadata_available;
 int reload_trace = 0;
 
+int last_textdump_print_newline = 1;
+
 enum {
 	OPT_NONE = 0,
 	OPT_HELP,
 	OPT_TEXTDUMP,
 	OPT_PID,
 	OPT_CHILD,
+	OPT_HOSTNAME,
 };
 
 static struct poptOption long_options[] = {
@@ -87,10 +89,17 @@ static struct poptOption long_options[] = {
 	{ "help", 'h', POPT_ARG_NONE, NULL, OPT_HELP, NULL, NULL },
 	{ "textdump", 't', POPT_ARG_NONE, NULL, OPT_TEXTDUMP, NULL, NULL },
 	{ "child", 'f', POPT_ARG_NONE, NULL, OPT_CHILD, NULL, NULL },
-	{ "pid", 'p', POPT_ARG_INT, &opt_pid, OPT_PID, NULL, NULL },
+	{ "pid", 'p', POPT_ARG_STRING, &opt_tid, OPT_PID, NULL, NULL },
+	{ "hostname", 'n', POPT_ARG_STRING, &opt_hostname, OPT_HOSTNAME, NULL, NULL },
 	{ NULL, 0, 0, NULL, 0, NULL, NULL },
 };
 
+static void handle_textdump_sigterm(int signal)
+{
+	quit = 1;
+	lttng_destroy_session("test");
+}
+
 void *refresh_thread(void *p)
 {
 	struct mmap_stream *mmap_info;
@@ -105,8 +114,8 @@ void *refresh_thread(void *p)
 			pthread_exit(0);
 		}
 		if (!opt_input_path) {
-		bt_list_for_each_entry(mmap_info, &mmap_list.head, list)
-			helper_kernctl_buffer_flush(mmap_info->fd);
+			bt_list_for_each_entry(mmap_info, &mmap_list.head, list)
+				helper_kernctl_buffer_flush(mmap_info->fd);
 		}
 		sem_wait(&pause_sem);
 		sem_post(&pause_sem);
@@ -157,6 +166,9 @@ enum bt_cb_ret print_timestamp(struct bt_ctf_event *call_data, void *private_dat
 	struct tm start;
 	uint64_t ts_nsec_start;
 	int pid;
+	int64_t syscall_ret;
+	const struct definition *scope;
+	const char *hostname;
 
 	timestamp = bt_ctf_get_timestamp(call_data);
 
@@ -164,16 +176,36 @@ enum bt_cb_ret print_timestamp(struct bt_ctf_event *call_data, void *private_dat
 	ts_nsec_start = timestamp % NSEC_PER_SEC;
 
 	pid = get_context_pid(call_data);
-	if (pid == -1ULL && opt_pid) {
+	if (pid == -1ULL && opt_tid) {
 		goto error;
 	}
 	
-	if (opt_pid && opt_pid != pid)
+	hostname = get_context_hostname(call_data);
+	if (!opt_tid && (opt_hostname && !lookup_hostname_list(hostname)))
+		goto end;
+	if (!opt_hostname && (opt_tid && !lookup_tid_list(pid)))
+		goto end;
+	if ((opt_tid && !lookup_tid_list(pid)) &&
+			(opt_hostname && !lookup_hostname_list(hostname)))
 		goto end;
 
-	printf("%02d:%02d:%02d.%09" PRIu64 " %d : %s\n", start.tm_hour,
-			start.tm_min, start.tm_sec, ts_nsec_start,
-			pid, bt_ctf_event_name(call_data));
+	if (strcmp(bt_ctf_event_name(call_data), "exit_syscall") == 0) {
+		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("= %ld\n", syscall_ret);
+		last_textdump_print_newline = 1;
+	} else {
+		/* we might have lost the exit_syscall event, so need to
+		 * 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;
+	}
 
 end:
 	return BT_CB_OK;
@@ -316,7 +348,7 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
 		void *private_data)
 {
 	int pid, tid, ppid, vpid, vtid, vppid;
-	char *comm;
+	char *comm, *hostname;
 	struct processtop *parent, *child;
 	unsigned long timestamp;
 
@@ -328,6 +360,7 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
 	if (pid == -1ULL) {
 		goto error;
 	}
+
 	tid = get_context_tid(call_data);
 	if (tid == -1ULL) {
 		goto error;
@@ -352,19 +385,24 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
 	if (!comm) {
 		goto error;
 	}
+	/* optional */
+	hostname = get_context_hostname(call_data);
 
 	/* find or create the current process */
 	child = find_process_tid(&lttngtop, tid, comm);
 	if (!child)
 		child = add_proc(&lttngtop, tid, comm, timestamp);
-	update_proc(child, pid, tid, ppid, vpid, vtid, vppid, comm);
+	if (!child)
+		goto end;
+	update_proc(child, pid, tid, ppid, vpid, vtid, vppid, comm, hostname);
 
 	if (pid != tid) {
 		/* find or create the parent */
 		parent = find_process_tid(&lttngtop, pid, comm);
 		if (!parent) {
 			parent = add_proc(&lttngtop, pid, comm, timestamp);
-			parent->pid = pid;
+			if (parent)
+				parent->pid = pid;
 		}
 
 		/* attach the parent to the current process */
@@ -374,6 +412,7 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
 
 	update_perf_counter(child, call_data);
 
+end:
 	return BT_CB_OK;
 
 error:
@@ -407,7 +446,13 @@ void init_lttngtop()
 void usage(FILE *fp)
 {
 	fprintf(fp, "LTTngTop %s\n\n", VERSION);
-	fprintf(fp, "Usage : lttngtop /path/to/trace\n");
+	fprintf(fp, "Usage : lttngtop [OPTIONS] [TRACE]\n");
+	fprintf(fp, "  TRACE			Path to the trace to analyse (no trace path for live tracing)\n");
+	fprintf(fp, "  -h, --help               This help message\n");
+	fprintf(fp, "  -t, --textdump           Display live events in text-only\n");
+	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");
 }
 
 /*
@@ -418,6 +463,8 @@ static int parse_options(int argc, char **argv)
 {
 	poptContext pc;
 	int opt, ret = 0;
+	char *tmp_str;
+	int *tid;
 
 	pc = poptGetContext(NULL, argc, (const char **) argv, long_options, 0);
 	poptReadDefaultConfig(pc, 0);
@@ -436,7 +483,28 @@ static int parse_options(int argc, char **argv)
 				opt_child = 1;
 				break;
 			case OPT_PID:
-				opt_textdump = 1;
+				tid_list = g_hash_table_new(g_str_hash,
+						g_str_equal);
+				tmp_str = strtok(opt_tid, ",");
+				while (tmp_str) {
+					tid = malloc(sizeof(int));
+					*tid = atoi(tmp_str);
+					g_hash_table_insert(tid_list,
+							(gpointer) tid, tid);
+					tmp_str = strtok(NULL, ",");
+				}
+				break;
+			case OPT_HOSTNAME:
+				hostname_list = g_hash_table_new(g_str_hash,
+						g_str_equal);
+				tmp_str = strtok(opt_hostname, ",");
+				while (tmp_str) {
+					char *new_str = strdup(tmp_str);
+					g_hash_table_insert(hostname_list,
+							(gpointer) new_str,
+							(gpointer) new_str);
+					tmp_str = strtok(NULL, ",");
+				}
 				break;
 			default:
 				ret = -EINVAL;
@@ -464,9 +532,6 @@ void iter_trace(struct bt_context *bt_ctx)
 	iter = bt_ctf_iter_create(bt_ctx, &begin_pos, NULL);
 
 	if (opt_textdump) {
-		if (opt_pid) {
-			printf("PID : %d, Child : %d\n", opt_pid, opt_child);
-		}
 		bt_ctf_iter_add_callback(iter, 0, NULL, 0,
 				print_timestamp,
 				NULL, NULL, NULL);
@@ -937,9 +1002,13 @@ int setup_live_tracing()
 
 	strcpy(chan.name, channel_name);
 	chan.attr.overwrite = 0;
-//	chan.attr.subbuf_size = 32768;
-	chan.attr.subbuf_size = 1048576; /* 1MB */
-	chan.attr.num_subbuf = 4;
+	if (opt_tid && opt_textdump) {
+		chan.attr.subbuf_size = 32768;
+		chan.attr.num_subbuf = 8;
+	} else {
+		chan.attr.subbuf_size = 1048576; /* 1MB */
+		chan.attr.num_subbuf = 4;
+	}
 	chan.attr.switch_timer_interval = 0;
 	chan.attr.read_timer_interval = 200;
 	chan.attr.output = LTTNG_EVENT_MMAP;
@@ -968,16 +1037,18 @@ int setup_live_tracing()
 
 	kctxpid.ctx = LTTNG_EVENT_CONTEXT_PID;
 	lttng_add_context(handle, &kctxpid, NULL, NULL);
+	kctxtid.ctx = LTTNG_EVENT_CONTEXT_TID;
+	lttng_add_context(handle, &kctxtid, NULL, NULL);
 	kctxppid.ctx = LTTNG_EVENT_CONTEXT_PPID;
 	lttng_add_context(handle, &kctxppid, NULL, NULL);
 	kctxcomm.ctx = LTTNG_EVENT_CONTEXT_PROCNAME;
 	lttng_add_context(handle, &kctxcomm, NULL, NULL);
-	kctxtid.ctx = LTTNG_EVENT_CONTEXT_TID;
-	lttng_add_context(handle, &kctxtid, NULL, NULL);
 	kctxpid.ctx = LTTNG_EVENT_CONTEXT_VPID;
 	lttng_add_context(handle, &kctxpid, NULL, NULL);
 	kctxtid.ctx = LTTNG_EVENT_CONTEXT_VTID;
 	lttng_add_context(handle, &kctxtid, NULL, NULL);
+	kctxtid.ctx = LTTNG_EVENT_CONTEXT_HOSTNAME;
+	lttng_add_context(handle, &kctxtid, NULL, NULL);
 
 	if ((ret = lttng_start_tracing("test")) < 0) {
 		fprintf(stderr,"error starting tracing : %s\n",
@@ -1015,6 +1086,10 @@ int main(int argc, char **argv)
 	}
 
 	if (!opt_input_path) {
+		if (opt_textdump) {
+			signal(SIGTERM, handle_textdump_sigterm);
+			signal(SIGINT, handle_textdump_sigterm);
+		}
 		ret = setup_live_tracing();
 		if (ret < 0) {
 			goto end;