X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Flttngtop.c;h=c3596aa23f697a5c487ddf0004b03e578b279f96;hp=be5af54d601458994c0e4050b4dca4c94fe470a7;hb=494bc09aafd8a4a956db683bbecd85ec2241b30e;hpb=26e46ddee86d2de5c88997bf8362a6f27a0a2ff9 diff --git a/src/lttngtop.c b/src/lttngtop.c index be5af54..c3596aa 100644 --- a/src/lttngtop.c +++ b/src/lttngtop.c @@ -40,6 +40,7 @@ #include #include #include + #ifdef LTTNGTOP_MMAP_LIVE #include #include @@ -51,6 +52,7 @@ #include "iostreamtop.h" #include "common.h" #include "network-live.h" +#include "lttng-session.h" #ifdef HAVE_LIBNCURSES #include "cursesdisplay.h" @@ -106,6 +108,9 @@ enum { OPT_ALL, OPT_OUTPUT_FILE, OPT_VERBOSE, + OPT_GUI_TEST, + OPT_CREATE_LOCAL_SESSION, + OPT_CREATE_LIVE_SESSION, }; static struct poptOption long_options[] = { @@ -122,6 +127,9 @@ static struct poptOption long_options[] = { { "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 +266,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); @@ -312,15 +321,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 +344,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. */ @@ -689,6 +705,9 @@ void usage(FILE *fp) 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"); } /* @@ -789,6 +808,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; @@ -920,15 +952,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, @@ -946,9 +999,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) { @@ -1223,6 +1289,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); @@ -1241,28 +1308,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, @@ -1272,8 +1324,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) { @@ -1315,5 +1365,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; }