X-Git-Url: http://git.liburcu.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Flttngtop.c;h=9cf3a55d9c80bc4565dc6c5abd4aa5f4fded88f9;hp=27bf8c8cb8c5b6608b53f98af8eda405db980e78;hb=f248b7d81143c5ff7b51a616e0c7394e26bac831;hpb=9f2856ad8e6efb7b5c1db062babb1276242dd444

diff --git a/src/lttngtop.c b/src/lttngtop.c
index 27bf8c8..9cf3a55 100644
--- a/src/lttngtop.c
+++ b/src/lttngtop.c
@@ -51,6 +51,7 @@
 #include "iostreamtop.h"
 #include "common.h"
 #include "network-live.h"
+#include "lttng-session.h"
 
 #ifdef HAVE_LIBNCURSES
 #include "cursesdisplay.h"
@@ -99,13 +100,15 @@ enum {
 	OPT_TEXTDUMP,
 	OPT_PID,
 	OPT_CHILD,
-	OPT_HOSTNAME,
+	OPT_PROCNAME,
 	OPT_RELAY_HOSTNAME,
 	OPT_KPROBES,
 	OPT_BEGIN,
 	OPT_ALL,
 	OPT_OUTPUT_FILE,
 	OPT_VERBOSE,
+	OPT_GUI_TEST,
+	OPT_CREATE_LOCAL_SESSION,
 };
 
 static struct poptOption long_options[] = {
@@ -115,13 +118,15 @@ static struct poptOption long_options[] = {
 	{ "child", 'f', POPT_ARG_NONE, NULL, OPT_CHILD, NULL, NULL },
 	{ "begin", 'b', POPT_ARG_NONE, NULL, OPT_BEGIN, NULL, NULL },
 	{ "pid", 'p', POPT_ARG_STRING, &opt_tid, OPT_PID, NULL, NULL },
-	{ "hostname", 'n', POPT_ARG_STRING, &opt_hostname, OPT_HOSTNAME, NULL, NULL },
+	{ "procname", 'n', POPT_ARG_STRING, &opt_procname, OPT_PROCNAME, NULL, NULL },
 	{ "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 },
 	{ "output", 'o', POPT_ARG_STRING, &opt_output, OPT_OUTPUT_FILE, NULL, NULL },
 	{ "verbose", 'v', POPT_ARG_NONE, NULL, OPT_VERBOSE, NULL, NULL },
+	{ "gui-test", 'g', POPT_ARG_NONE, NULL, OPT_GUI_TEST, NULL, NULL },
+	{ "create-local-session", 0, POPT_ARG_NONE, NULL, OPT_CREATE_LOCAL_SESSION, NULL, NULL },
 	{ NULL, 0, 0, NULL, 0, NULL, NULL },
 };
 
@@ -282,7 +287,7 @@ enum bt_cb_ret textdump(struct bt_ctf_event *call_data, void *private_data)
 		lookup = pid;
 	else
 		lookup = tid;
-	if (opt_tid || opt_hostname || opt_exec_name) {
+	if (opt_tid || opt_procname || opt_exec_name) {
 		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) {
@@ -390,7 +395,7 @@ enum bt_cb_ret textdump(struct bt_ctf_event *call_data, void *private_data)
 			(!current_syscall) ? '\n' : ' ');
 
 	free(from_syscall);
-	if (opt_all && (opt_tid || opt_hostname || opt_exec_name))
+	if (opt_all && (opt_tid || opt_procname || opt_exec_name))
 		fprintf(output, "%c[0m", 27);
 
 end:
@@ -609,6 +614,17 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
 		goto end;
 	update_proc(child, pid, tid, ppid, vpid, vtid, vppid, comm, hostname);
 
+	if (opt_procname && lookup_procname(comm) &&
+			!lookup_filter_tid_list(tid)) {
+		int *tmp_tid;
+
+		tmp_tid = malloc(sizeof(int));
+		*tmp_tid = tid;
+		printf("ADDING %s %d\n", comm, tid);
+		g_hash_table_insert(global_filter_list,
+				(gpointer) tmp_tid, tmp_tid);
+	}
+
 	if (pid != tid) {
 		/* find or create the parent */
 		parent = find_process_tid(&lttngtop, pid, comm);
@@ -638,6 +654,7 @@ void init_lttngtop()
 	global_perf_liszt = g_hash_table_new(g_str_hash, g_str_equal);
 	global_filter_list = g_hash_table_new(g_str_hash, g_str_equal);
 	global_host_list = g_hash_table_new(g_str_hash, g_str_equal);
+	global_procname_list = g_hash_table_new(g_str_hash, g_str_equal);
 	tid_filter_list = g_hash_table_new(g_str_hash,
 			g_str_equal);
 
@@ -671,12 +688,13 @@ void usage(FILE *fp)
 	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");
+	fprintf(fp, "  -n, --procname           Comma-separated list of procnames to display (require procname 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");
 	fprintf(fp, "  -o, --output <filename>  In textdump, output the log in <filename>\n");
+	fprintf(fp, "  -g, --gui-test           Test if the ncurses support is compiled in (return 0 if it is)\n");
 }
 
 /*
@@ -777,6 +795,16 @@ static int parse_options(int argc, char **argv)
 				usage(stdout);
 				ret = 1;    /* exit cleanly */
 				goto end;
+			case OPT_GUI_TEST:
+#ifdef HAVE_LIBNCURSES
+				exit(EXIT_SUCCESS);
+#else
+				exit(EXIT_FAILURE);
+#endif
+				goto end;
+			case OPT_CREATE_LOCAL_SESSION:
+				ret = create_local_session();
+				exit(ret);
 			case OPT_TEXTDUMP:
 				opt_textdump = 1;
 				break;
@@ -801,11 +829,11 @@ static int parse_options(int argc, char **argv)
 				/* start reading the live trace from the beginning */
 				opt_begin = 1;
 				break;
-			case OPT_HOSTNAME:
+			case OPT_PROCNAME:
 				toggle_filter = 1;
-				tmp_str = strtok(opt_hostname, ",");
+				tmp_str = strtok(opt_procname, ",");
 				while (tmp_str) {
-					add_hostname_list(tmp_str, 1);
+					add_procname_list(tmp_str, 1);
 					tmp_str = strtok(NULL, ",");
 				}
 				break;