X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Flttngtop.c;h=2e4a63b86064bab92e0fe0a390e1048663ad61a2;hp=d282011b65dbbf50445cca3bb18ea1398c1e8a19;hb=57bff78803b67f5b9736d18f57b88b6b6191975e;hpb=1402044a1577c9b62b60f64fdb48ae9524be458c diff --git a/src/lttngtop.c b/src/lttngtop.c index d282011..2e4a63b 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,31 @@ 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, }; 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 }, { 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; @@ -99,8 +112,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); @@ -150,17 +163,45 @@ 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; 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; + } + + if (opt_tid && !lookup_tid_list(pid)) + 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; } /* @@ -310,6 +351,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; @@ -339,6 +381,8 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data, child = find_process_tid(<tngtop, tid, comm); if (!child) child = add_proc(<tngtop, tid, comm, timestamp); + if (!child) + goto end; update_proc(child, pid, tid, ppid, vpid, vtid, vppid, comm); if (pid != tid) { @@ -346,7 +390,8 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data, 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 */ @@ -356,6 +401,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: @@ -400,6 +446,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); @@ -412,7 +460,21 @@ 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; default: ret = -EINVAL; goto end; @@ -489,7 +551,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)); @@ -909,9 +971,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; @@ -940,11 +1006,15 @@ 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; + 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); if ((ret = lttng_start_tracing("test")) < 0) { @@ -983,6 +1053,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;