X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Flttngtop.c;h=5cb418fae0fd069e25d2cd94de6b59b4597211f2;hp=9b650f4bddc5b43926bf318ba6961d1b591caf7c;hb=c8d75a13bc5c025053b0c2c14fa1a7dfdaa1b448;hpb=050f9cf91c01ff380df000bd0daa559285b7e787 diff --git a/src/lttngtop.c b/src/lttngtop.c index 9b650f4..5cb418f 100644 --- a/src/lttngtop.c +++ b/src/lttngtop.c @@ -51,7 +51,8 @@ #define DEFAULT_FILE_ARRAY_SIZE 1 const char *opt_input_path; -int opt_textdump; +static int opt_textdump; +static int opt_child; int quit = 0; @@ -72,19 +73,33 @@ 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[] = { /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */ { "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_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; @@ -93,11 +108,15 @@ void *refresh_thread(void *p) if (quit) { sem_post(&pause_sem); sem_post(&timer); + sem_post(&end_trace_sem); sem_post(&goodtodisplay); + sem_post(&goodtoupdate); pthread_exit(0); } - bt_list_for_each_entry(mmap_info, &mmap_list.head, list) - helper_kernctl_buffer_flush(mmap_info->fd); + if (!opt_input_path) { + 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); sem_post(&timer); @@ -146,17 +165,52 @@ enum bt_cb_ret print_timestamp(struct bt_ctf_event *call_data, void *private_dat unsigned long timestamp; 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); start = format_timestamp(timestamp); ts_nsec_start = timestamp % NSEC_PER_SEC; - printf("%02d:%02d:%02d.%09" PRIu64 " %s\n", start.tm_hour, - start.tm_min, start.tm_sec, ts_nsec_start, - bt_ctf_event_name(call_data)); + pid = get_context_pid(call_data); + if (pid == -1ULL && opt_tid) { + goto error; + } + + 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; + + 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; +error: + return BT_CB_ERROR_STOP; } /* @@ -293,8 +347,8 @@ void update_perf_counter(struct processtop *proc, const struct bt_ctf_event *eve enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data, void *private_data) { - int pid, tid, ppid; - char *comm; + int pid, tid, ppid, vpid, vtid, vppid; + char *comm, *hostname; struct processtop *parent, *child; unsigned long timestamp; @@ -306,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; @@ -314,23 +369,40 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data, if (ppid == -1ULL) { goto error; } + vpid = get_context_vpid(call_data); + if (pid == -1ULL) { + vpid = -1; + } + vtid = get_context_vtid(call_data); + if (tid == -1ULL) { + vtid = -1; + } + vppid = get_context_vppid(call_data); + if (ppid == -1ULL) { + vppid = -1; + } comm = get_context_comm(call_data); if (!comm) { goto error; } + /* optional */ + hostname = get_context_hostname(call_data); /* find or create the current process */ child = find_process_tid(<tngtop, tid, comm); if (!child) child = add_proc(<tngtop, tid, comm, timestamp); - update_proc(child, pid, tid, ppid, 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(<tngtop, pid, comm); if (!parent) { parent = add_proc(<tngtop, pid, comm, timestamp); - parent->pid = pid; + if (parent) + parent->pid = pid; } /* attach the parent to the current process */ @@ -340,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: @@ -373,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"); } /* @@ -384,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); @@ -396,7 +477,35 @@ static int parse_options(int argc, char **argv) goto end; case OPT_TEXTDUMP: opt_textdump = 1; - goto end; + break; + case OPT_CHILD: + opt_textdump = 1; + opt_child = 1; + break; + case OPT_PID: + 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; goto end; @@ -473,7 +582,7 @@ void iter_trace(struct bt_context *bt_ctx) NULL, NULL, NULL); } - while ((event = bt_ctf_iter_read_event(iter)) != NULL) { + while ((event = bt_ctf_iter_read_event(iter, NULL)) != NULL) { if (quit || reload_trace) goto end_iter; ret = bt_iter_next(bt_ctf_get_iter(iter)); @@ -834,7 +943,7 @@ end: return ret; } -void *setup_live_tracing() +int setup_live_tracing() { struct lttng_domain dom; struct lttng_channel chan; @@ -853,7 +962,7 @@ void *setup_live_tracing() if ((ret = setup_consumer(command_sock_path, threads, ctx)) < 0) { fprintf(stderr,"error setting up consumer\n"); - goto end; + goto error; } available_snapshots = g_ptr_array_new(); @@ -867,12 +976,12 @@ void *setup_live_tracing() if ((ret = lttng_create_session("test", "/tmp/livesession")) < 0) { fprintf(stderr,"error creating the session : %s\n", helper_lttcomm_get_readable_code(ret)); - goto end; + goto error; } if ((handle = lttng_create_handle("test", &dom)) == NULL) { fprintf(stderr,"error creating handle\n"); - goto end; + goto error_session; } /* @@ -888,14 +997,18 @@ void *setup_live_tracing() if ((ret = lttng_register_consumer(handle, command_sock_path)) < 0) { fprintf(stderr,"error registering consumer : %s\n", helper_lttcomm_get_readable_code(ret)); - goto end; + goto error_session; } 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; @@ -903,7 +1016,7 @@ void *setup_live_tracing() if ((ret = lttng_enable_channel(handle, &chan)) < 0) { fprintf(stderr,"error creating channel : %s\n", helper_lttcomm_get_readable_code(ret)); - goto end; + goto error_session; } memset(&ev, '\0', sizeof(struct lttng_event)); @@ -912,29 +1025,35 @@ void *setup_live_tracing() if ((ret = lttng_enable_event(handle, &ev, channel_name)) < 0) { fprintf(stderr,"error enabling event : %s\n", helper_lttcomm_get_readable_code(ret)); - goto end; + goto error_session; } ev.type = LTTNG_EVENT_SYSCALL; if ((ret = lttng_enable_event(handle, &ev, channel_name)) < 0) { fprintf(stderr,"error enabling syscalls : %s\n", helper_lttcomm_get_readable_code(ret)); - goto end; + goto error_session; } 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; + 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", helper_lttcomm_get_readable_code(ret)); - goto end; + goto error_session; } helper_kernctl_buffer_flush(consumerd_metadata); @@ -942,8 +1061,12 @@ void *setup_live_tracing() /* block until metadata is ready */ sem_init(&metadata_available, 0, 0); -end: - return NULL; + return 0; + +error_session: + lttng_destroy_session("test"); +error: + return -1; } int main(int argc, char **argv) @@ -963,7 +1086,14 @@ int main(int argc, char **argv) } if (!opt_input_path) { - setup_live_tracing(); + if (opt_textdump) { + signal(SIGTERM, handle_textdump_sigterm); + signal(SIGINT, handle_textdump_sigterm); + } + ret = setup_live_tracing(); + if (ret < 0) { + goto end; + } init_lttngtop(); if (!opt_textdump) { pthread_create(&display_thread, NULL, ncurses_display, (void *) NULL); @@ -990,7 +1120,6 @@ int main(int argc, char **argv) bt_list_for_each_entry(mmap_info, &mmap_list.head, list) { ret = helper_kernctl_get_mmap_len(mmap_info->fd, &mmap_len); if (ret != 0) { - ret = errno; bt_list_del(&mmap_info->list); } }