X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Flttngtop.c;h=c38825231641d5035ec3f899a5f180ffdf5a3c39;hp=173cc82e7facdb85f15bd0463710cac4fb56594b;hb=54645d5cab414bb3391837ef7acb919cf106c71f;hpb=ec016cb4cf5cc8faa6d09476fb6bc1818da8e8fe diff --git a/src/lttngtop.c b/src/lttngtop.c index 173cc82..c388252 100644 --- a/src/lttngtop.c +++ b/src/lttngtop.c @@ -39,7 +39,9 @@ #include #include #include -#include + +#define LTTNG_SYMBOL_NAME_LEN 256 + #ifdef LTTNGTOP_MMAP_LIVE #include #include @@ -51,6 +53,7 @@ #include "iostreamtop.h" #include "common.h" #include "network-live.h" +#include "lttng-session.h" #ifdef HAVE_LIBNCURSES #include "cursesdisplay.h" @@ -99,13 +102,16 @@ 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, + OPT_CREATE_LIVE_SESSION, }; static struct poptOption long_options[] = { @@ -115,13 +121,16 @@ 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 }, + { "create-live-session", 0, POPT_ARG_NONE, NULL, OPT_CREATE_LIVE_SESSION, NULL, NULL }, { NULL, 0, 0, NULL, 0, NULL, NULL }, }; @@ -258,6 +267,7 @@ enum bt_cb_ret textdump(struct bt_ctf_event *call_data, void *private_data) const char *hostname, *procname; struct cputime *cpu; char *from_syscall = NULL; + int syscall_exit = 0; timestamp = bt_ctf_get_timestamp(call_data); @@ -282,7 +292,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) { @@ -312,15 +322,22 @@ enum bt_cb_ret textdump(struct bt_ctf_event *call_data, void *private_data) } } - if (last_syscall && (strncmp(bt_ctf_event_name(call_data), - "exit_syscall", 12)) != 0) { + if (((strncmp(bt_ctf_event_name(call_data), + "exit_syscall", 12)) == 0) || + ((strncmp(bt_ctf_event_name(call_data), + "syscall_exit", 12)) == 0)) { + syscall_exit = 1; + } + + if (last_syscall && !syscall_exit) { last_syscall = NULL; fprintf(output, " ...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) { + if ((strncmp(bt_ctf_event_name(call_data), "sys_", 4) == 0) || + (strncmp(bt_ctf_event_name(call_data), "syscall_entry", 13) == 0)){ cpu = get_cpu(cpu_id); cpu->current_syscall = g_new0(struct syscall, 1); cpu->current_syscall->name = strdup(bt_ctf_event_name(call_data)); @@ -328,7 +345,7 @@ enum bt_cb_ret textdump(struct bt_ctf_event *call_data, void *private_data) 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) { + } else if (syscall_exit) { struct tm start_ts; /* Return code of a syscall if it was the last displayed event. */ @@ -390,7 +407,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 +626,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(<tngtop, pid, comm); @@ -638,6 +666,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 +700,15 @@ 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 In textdump, output the log in \n"); + fprintf(fp, " -g, --gui-test Test if the ncurses support is compiled in (return 0 if it is)\n"); + fprintf(fp, " --create-local-session Setup a LTTng local session with all the right parameters\n"); + fprintf(fp, " --create-live-session Setup a LTTng live session on localhost with all the right parameters\n"); } /* @@ -777,6 +809,19 @@ 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_CREATE_LIVE_SESSION: + ret = create_live_local_session(NULL, NULL, 1); + exit(ret); case OPT_TEXTDUMP: opt_textdump = 1; break; @@ -801,11 +846,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; @@ -908,12 +953,36 @@ void iter_trace(struct bt_context *bt_ctx) 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("syscall_entry_open"), + NULL, 0, handle_sys_open, NULL, NULL, NULL); + + bt_ctf_iter_add_callback(iter, + g_quark_from_static_string("sys_socket"), + NULL, 0, handle_sys_socket, NULL, NULL, NULL); + bt_ctf_iter_add_callback(iter, + g_quark_from_static_string("syscall_entry_socket"), + NULL, 0, handle_sys_socket, 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("syscall_entry_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); + bt_ctf_iter_add_callback(iter, + g_quark_from_static_string("syscall_exit_open"), + NULL, 0, handle_exit_syscall, NULL, NULL, NULL); + bt_ctf_iter_add_callback(iter, + g_quark_from_static_string("syscall_exit_socket"), + NULL, 0, handle_exit_syscall, NULL, NULL, NULL); + bt_ctf_iter_add_callback(iter, + g_quark_from_static_string("syscall_exit_close"), + NULL, 0, handle_exit_syscall, NULL, NULL, NULL); if (opt_textdump) { bt_ctf_iter_add_callback(iter, 0, NULL, 0, textdump, @@ -931,9 +1000,22 @@ void iter_trace(struct bt_context *bt_ctx) 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("syscall_entry_write"), + NULL, 0, handle_sys_write, NULL, NULL, NULL); + bt_ctf_iter_add_callback(iter, + g_quark_from_static_string("syscall_exit_write"), + NULL, 0, handle_exit_syscall, 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("syscall_entry_read"), + NULL, 0, handle_sys_read, NULL, NULL, NULL); + bt_ctf_iter_add_callback(iter, + g_quark_from_static_string("syscall_exit_read"), + NULL, 0, handle_exit_syscall, NULL, NULL, NULL); /* for kprobes */ if (lttngtop.kprobes_table) { @@ -1208,6 +1290,7 @@ int main(int argc, char **argv, char **envp) { int ret; struct bt_context *bt_ctx = NULL; + char *live_session_name = NULL; init_lttngtop(); ret = parse_options(argc, argv); @@ -1226,28 +1309,13 @@ int main(int argc, char **argv, char **envp) if (!opt_input_path && !remote_live && !opt_exec_name) { /* mmap live */ -#ifdef LTTNGTOP_MMAP_LIVE - if (opt_textdump) { - signal(SIGTERM, handle_textdump_sigterm); - signal(SIGINT, handle_textdump_sigterm); - } - mmap_live_loop(bt_ctx); - pthread_join(timer_thread, NULL); - quit = 1; - pthread_join(display_thread, NULL); - - lttng_stop_tracing("test"); - lttng_destroy_session("test"); - - goto end; -#else - fprintf(stderr, "[ERROR] Mmap live support not compiled, specify a " - "trace directory or -r \n"); - usage(stdout); - ret = -1; - goto end; -#endif /* LTTNGTOP_MMAP_LIVE */ - } else if (!opt_input_path && remote_live) { + ret = create_live_local_session(&opt_relay_hostname, + &live_session_name, 0); + if (ret < 0) + goto end; + remote_live = 1; + } + if (!opt_input_path && remote_live) { /* network live */ bt_ctx = bt_context_create(); ret = bt_context_add_traces_recursive(bt_ctx, opt_relay_hostname, @@ -1257,8 +1325,6 @@ int main(int argc, char **argv, char **envp) goto end; } } else { - //init_lttngtop(); - bt_ctx = bt_context_create(); ret = bt_context_add_traces_recursive(bt_ctx, opt_input_path, "ctf", NULL); if (ret < 0) { @@ -1300,5 +1366,12 @@ end: if (bt_ctx) bt_context_put(bt_ctx); + if (live_session_name) { + ret = destroy_live_local_session(live_session_name); + if (ret < 0) { + fprintf(stderr, "Error destroying %s\n", live_session_name); + } + } + return ret; }