X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Flttngtop.c;h=571b0f88aff04c23859d40a5bd7c650070a74d0b;hp=892cfd0a6b93a37fca6d7f08333c071cc0b78720;hb=dc3eb0c3f241c6b372ee2c15d53bf4cb47d0c9aa;hpb=eb677852b5682dc127eb431b2cabf978fdc5011a diff --git a/src/lttngtop.c b/src/lttngtop.c index 892cfd0..571b0f8 100644 --- a/src/lttngtop.c +++ b/src/lttngtop.c @@ -53,13 +53,14 @@ const char *opt_input_path; int opt_textdump; +int quit = 0; + struct lttngtop *copy; pthread_t display_thread; pthread_t timer_thread; unsigned long refresh_display = 1 * NSEC_PER_SEC; unsigned long last_display_update = 0; -int quit = 0; /* list of FDs available for being read with snapshots */ struct mmap_stream_list mmap_list; @@ -69,9 +70,7 @@ struct lttng_consumer_local_data *ctx = NULL; /* list of snapshots currently not consumed */ GPtrArray *available_snapshots; sem_t metadata_available; -FILE *metadata_fp; -int trace_opened = 0; -int metadata_ready = 0; +int reload_trace = 0; enum { OPT_NONE = 0, @@ -88,9 +87,21 @@ static struct poptOption long_options[] = { void *refresh_thread(void *p) { + struct mmap_stream *mmap_info; + while (1) { - if (quit) - return NULL; + if (quit) { + sem_post(&pause_sem); + sem_post(&timer); + sem_post(&end_trace_sem); + sem_post(&goodtodisplay); + sem_post(&goodtoupdate); + 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); + } sem_wait(&pause_sem); sem_post(&pause_sem); sem_post(&timer); @@ -114,17 +125,19 @@ void *ncurses_display(void *p) sem_wait(&goodtodisplay); sem_wait(&pause_sem); + if (quit) { + sem_post(&pause_sem); + sem_post(&timer); + reset_ncurses(); + pthread_exit(0); + } + copy = g_ptr_array_index(copies, current_display_index); assert(copy); display(current_display_index++); sem_post(&goodtoupdate); sem_post(&pause_sem); - - if (quit) { - reset_ncurses(); - pthread_exit(0); - } } } @@ -284,7 +297,7 @@ 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; + int pid, tid, ppid, vpid, vtid, vppid; char *comm; struct processtop *parent, *child; unsigned long timestamp; @@ -305,6 +318,18 @@ 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; @@ -314,7 +339,7 @@ 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); - update_proc(child, pid, tid, ppid, comm); + update_proc(child, pid, tid, ppid, vpid, vtid, vppid, comm); if (pid != tid) { /* find or create the parent */ @@ -465,6 +490,8 @@ void iter_trace(struct bt_context *bt_ctx) } while ((event = bt_ctf_iter_read_event(iter)) != NULL) { + if (quit || reload_trace) + goto end_iter; ret = bt_iter_next(bt_ctf_get_iter(iter)); if (ret < 0) goto end_iter; @@ -760,6 +787,8 @@ int on_recv_fd(struct lttng_consumer_stream *kconsumerd_fd) ret = 0; } + reload_trace = 1; + end: return ret; } @@ -767,26 +796,21 @@ end: void live_consume(struct bt_context **bt_ctx) { int ret; + FILE *metadata_fp; - if (!metadata_ready) { - sem_wait(&metadata_available); - if (access("/tmp/livesession/kernel/metadata", F_OK) != 0) { - fprintf(stderr,"no metadata\n"); - goto end; - } - metadata_ready = 1; - metadata_fp = fopen("/tmp/livesession/kernel/metadata", "r"); + sem_wait(&metadata_available); + if (access("/tmp/livesession/kernel/metadata", F_OK) != 0) { + fprintf(stderr,"no metadata\n"); + goto end; } + metadata_fp = fopen("/tmp/livesession/kernel/metadata", "r"); - if (!trace_opened) { - *bt_ctx = bt_context_create(); - ret = bt_context_add_trace(*bt_ctx, NULL, "ctf", - lttngtop_ctf_packet_seek, &mmap_list, metadata_fp); - if (ret < 0) { - printf("Error adding trace\n"); - goto end; - } - trace_opened = 1; + *bt_ctx = bt_context_create(); + ret = bt_context_add_trace(*bt_ctx, NULL, "ctf", + lttngtop_ctf_packet_seek, &mmap_list, metadata_fp); + if (ret < 0) { + printf("Error adding trace\n"); + goto end; } end: @@ -826,7 +850,7 @@ end: return ret; } -void *setup_live_tracing() +int setup_live_tracing() { struct lttng_domain dom; struct lttng_channel chan; @@ -845,7 +869,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(); @@ -859,18 +883,28 @@ 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; + } + + /* + * FIXME : need to let the + * helper_lttng_consumer_thread_receive_fds create the + * socket. + * Cleaner solution ? + */ + while (access(command_sock_path, F_OK)) { + sleep(0.1); } 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); @@ -885,7 +919,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)); @@ -894,14 +928,14 @@ 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; @@ -912,11 +946,15 @@ void *setup_live_tracing() 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 ((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); @@ -924,14 +962,20 @@ 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) { int ret; struct bt_context *bt_ctx = NULL; + struct mmap_stream *mmap_info; + unsigned long mmap_len; ret = parse_options(argc, argv); if (ret < 0) { @@ -943,18 +987,45 @@ int main(int argc, char **argv) } if (!opt_input_path) { - setup_live_tracing(); + ret = setup_live_tracing(); + if (ret < 0) { + goto end; + } init_lttngtop(); if (!opt_textdump) { pthread_create(&display_thread, NULL, ncurses_display, (void *) NULL); pthread_create(&timer_thread, NULL, refresh_thread, (void *) NULL); } - live_consume(&bt_ctx); - iter_trace(bt_ctx); + while (!quit) { + reload_trace = 0; + live_consume(&bt_ctx); + iter_trace(bt_ctx); + ret = bt_context_remove_trace(bt_ctx, 0); + if (ret != 0) + fprintf(stderr, "error removing trace\n"); + if (bt_ctx) { + bt_context_put(bt_ctx); + } + /* + * since we receive all FDs every time there is an + * update and the FD number is different every time, + * we don't know which one are valid. + * so we check if all FDs are usable with a simple + * ioctl call. + */ + 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) { + bt_list_del(&mmap_info->list); + } + } + sem_post(&metadata_available); + } + + pthread_join(timer_thread, NULL); quit = 1; pthread_join(display_thread, NULL); - pthread_join(timer_thread, NULL); lttng_stop_tracing("test"); lttng_destroy_session("test"); @@ -980,8 +1051,8 @@ int main(int argc, char **argv) iter_trace(bt_ctx); - quit = 1; pthread_join(display_thread, NULL); + quit = 1; pthread_join(timer_thread, NULL); }