X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Flttngtop.c;h=a33e1d828ceb57f3248b16a19b8d50366bfed227;hp=28acebf6c1134851571acd243919d672bbe188e1;hb=2479719885485a6b991b47898d0c77a63f6b9513;hpb=32b70e07fe8aa2f06988d2a9accddf5992b08746 diff --git a/src/lttngtop.c b/src/lttngtop.c index 28acebf..a33e1d8 100644 --- a/src/lttngtop.c +++ b/src/lttngtop.c @@ -52,7 +52,6 @@ const char *opt_input_path; static int opt_textdump; -static int opt_pid; static int opt_child; int quit = 0; @@ -91,6 +90,12 @@ static struct poptOption long_options[] = { { 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; @@ -105,8 +110,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); @@ -157,6 +162,8 @@ enum bt_cb_ret print_timestamp(struct bt_ctf_event *call_data, void *private_dat 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); @@ -171,9 +178,17 @@ enum bt_cb_ret print_timestamp(struct bt_ctf_event *call_data, void *private_dat if (opt_pid && opt_pid != pid) goto end; - printf("%02d:%02d:%02d.%09" PRIu64 " %d : %s\n", start.tm_hour, - start.tm_min, start.tm_sec, ts_nsec_start, - pid, bt_ctf_event_name(call_data)); + 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); + } else { + 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)); + } end: return BT_CB_OK; @@ -328,6 +343,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; @@ -357,6 +373,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) { @@ -364,7 +382,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 */ @@ -374,6 +393,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: @@ -436,7 +456,7 @@ static int parse_options(int argc, char **argv) opt_child = 1; break; case OPT_PID: - opt_textdump = 1; + //opt_textdump = 1; break; default: ret = -EINVAL; @@ -464,9 +484,6 @@ void iter_trace(struct bt_context *bt_ctx) iter = bt_ctf_iter_create(bt_ctx, &begin_pos, NULL); if (opt_textdump) { - if (opt_pid) { - printf("PID : %d, Child : %d\n", opt_pid, opt_child); - } bt_ctf_iter_add_callback(iter, 0, NULL, 0, print_timestamp, NULL, NULL, NULL); @@ -937,9 +954,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_pid && 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; @@ -952,12 +973,14 @@ int setup_live_tracing() memset(&ev, '\0', sizeof(struct lttng_event)); //sprintf(ev.name, "sched_switch"); - ev.type = LTTNG_EVENT_TRACEPOINT; - if ((ret = lttng_enable_event(handle, &ev, channel_name)) < 0) { - fprintf(stderr,"error enabling event : %s\n", - helper_lttcomm_get_readable_code(ret)); - goto error_session; - } +// if (!opt_pid) { + ev.type = LTTNG_EVENT_TRACEPOINT; + if ((ret = lttng_enable_event(handle, &ev, channel_name)) < 0) { + fprintf(stderr,"error enabling event : %s\n", + helper_lttcomm_get_readable_code(ret)); + goto error_session; + } +// } ev.type = LTTNG_EVENT_SYSCALL; if ((ret = lttng_enable_event(handle, &ev, channel_name)) < 0) { @@ -968,16 +991,18 @@ int setup_live_tracing() kctxpid.ctx = LTTNG_EVENT_CONTEXT_PID; lttng_add_context(handle, &kctxpid, 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; lttng_add_context(handle, &kctxtid, NULL, NULL); - 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 (!opt_pid) { + 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); + 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) { fprintf(stderr,"error starting tracing : %s\n", @@ -1015,6 +1040,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;