X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Flttngtop.c;h=9b650f4bddc5b43926bf318ba6961d1b591caf7c;hp=fde9bf30547e8a320961d4cc6c2493c7cb0330dc;hb=050f9cf91c01ff380df000bd0daa559285b7e787;hpb=4e6aeb3d1a8330c7486b762336f11510baaa433c diff --git a/src/lttngtop.c b/src/lttngtop.c index fde9bf3..9b650f4 100644 --- a/src/lttngtop.c +++ b/src/lttngtop.c @@ -40,6 +40,7 @@ #include #include #include +#include #include "lttngtoptypes.h" #include "cputop.h" @@ -50,6 +51,9 @@ #define DEFAULT_FILE_ARRAY_SIZE 1 const char *opt_input_path; +int opt_textdump; + +int quit = 0; struct lttngtop *copy; pthread_t display_thread; @@ -57,9 +61,7 @@ pthread_t timer_thread; unsigned long refresh_display = 1 * NSEC_PER_SEC; unsigned long last_display_update = 0; -int quit = 0; -/* LIVE */ /* list of FDs available for being read with snapshots */ struct mmap_stream_list mmap_list; GPtrArray *lttng_consumer_stream_array; @@ -68,30 +70,34 @@ 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, OPT_HELP, - OPT_LIST, - OPT_VERBOSE, - OPT_DEBUG, - OPT_NAMES, + OPT_TEXTDUMP, }; 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 }, { NULL, 0, 0, NULL, 0, NULL, NULL }, }; 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(&goodtodisplay); + pthread_exit(0); + } + 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); @@ -115,20 +121,44 @@ 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); - } } } +/* + * hook on each event to check the timestamp and refresh the display if + * necessary + */ +enum bt_cb_ret print_timestamp(struct bt_ctf_event *call_data, void *private_data) +{ + unsigned long timestamp; + struct tm start; + uint64_t ts_nsec_start; + + 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)); + + return BT_CB_OK; +} + /* * hook on each event to check the timestamp and refresh the display if * necessary @@ -137,7 +167,7 @@ enum bt_cb_ret check_timestamp(struct bt_ctf_event *call_data, void *private_dat { unsigned long timestamp; - timestamp = bt_ctf_get_real_timestamp(call_data); + timestamp = bt_ctf_get_timestamp(call_data); if (timestamp == -1ULL) goto error; @@ -268,7 +298,7 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data, struct processtop *parent, *child; unsigned long timestamp; - timestamp = bt_ctf_get_real_timestamp(call_data); + timestamp = bt_ctf_get_timestamp(call_data); if (timestamp == -1ULL) goto error; @@ -333,6 +363,8 @@ void init_lttngtop() lttngtop.nbthreads = 0; lttngtop.nbfiles = 0; + lttngtop.process_hash_table = g_hash_table_new(g_direct_hash, + g_direct_equal); lttngtop.process_table = g_ptr_array_new(); lttngtop.files_table = g_ptr_array_new(); lttngtop.cpu_table = g_ptr_array_new(); @@ -362,6 +394,9 @@ static int parse_options(int argc, char **argv) usage(stdout); ret = 1; /* exit cleanly */ goto end; + case OPT_TEXTDUMP: + opt_textdump = 1; + goto end; default: ret = -EINVAL; goto end; @@ -387,52 +422,60 @@ void iter_trace(struct bt_context *bt_ctx) begin_pos.type = BT_SEEK_BEGIN; iter = bt_ctf_iter_create(bt_ctx, &begin_pos, NULL); - /* at each event check if we need to refresh */ - bt_ctf_iter_add_callback(iter, 0, NULL, 0, - check_timestamp, - NULL, NULL, NULL); - /* at each event, verify the status of the process table */ - bt_ctf_iter_add_callback(iter, 0, NULL, 0, - fix_process_table, - NULL, NULL, NULL); - /* to handle the scheduling events */ - bt_ctf_iter_add_callback(iter, - g_quark_from_static_string("sched_switch"), - NULL, 0, handle_sched_switch, NULL, NULL, NULL); - /* to clean up the process table */ - bt_ctf_iter_add_callback(iter, - g_quark_from_static_string("sched_process_free"), - NULL, 0, handle_sched_process_free, NULL, NULL, NULL); - /* to get all the process from the statedumps */ - bt_ctf_iter_add_callback(iter, - g_quark_from_static_string( - "lttng_statedump_process_state"), - NULL, 0, handle_statedump_process_state, - NULL, NULL, NULL); - - /* for IO top */ - 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("sys_write"), - NULL, 0, handle_sys_write, 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("sys_open"), - NULL, 0, handle_sys_open, 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( + if (opt_textdump) { + bt_ctf_iter_add_callback(iter, 0, NULL, 0, + print_timestamp, + NULL, NULL, NULL); + } else { + /* at each event check if we need to refresh */ + bt_ctf_iter_add_callback(iter, 0, NULL, 0, + check_timestamp, + NULL, NULL, NULL); + /* at each event, verify the status of the process table */ + bt_ctf_iter_add_callback(iter, 0, NULL, 0, + fix_process_table, + NULL, NULL, NULL); + /* to handle the scheduling events */ + bt_ctf_iter_add_callback(iter, + g_quark_from_static_string("sched_switch"), + NULL, 0, handle_sched_switch, NULL, NULL, NULL); + /* to clean up the process table */ + bt_ctf_iter_add_callback(iter, + g_quark_from_static_string("sched_process_free"), + NULL, 0, handle_sched_process_free, NULL, NULL, NULL); + /* to get all the process from the statedumps */ + bt_ctf_iter_add_callback(iter, + g_quark_from_static_string( + "lttng_statedump_process_state"), + NULL, 0, handle_statedump_process_state, + NULL, NULL, NULL); + + /* for IO top */ + 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("sys_write"), + NULL, 0, handle_sys_write, 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("sys_open"), + NULL, 0, handle_sys_open, 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( "lttng_statedump_file_descriptor"), - NULL, 0, handle_statedump_file_descriptor, - NULL, NULL, NULL); + NULL, 0, handle_statedump_file_descriptor, + NULL, NULL, NULL); + } 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; @@ -641,87 +684,6 @@ int check_requirements(struct bt_context *ctx) return ret; } -void dump_snapshot() -{ - struct lttng_consumer_stream *iter; - unsigned long spos; - struct mmap_stream *new_snapshot; - - int ret = 0; - int i; - /* - * try lock mutex ressource courante (overrun) - * if fail : overrun - * stop trace (flush implicite avant stop) - * lttng_consumer_take_snapshot - * read timestamp packet end (use time as end pos) - * - stream_packet_context - * - reculer de 1 subbuf : pos - max_subbuff_size - * - * - position de fin (take_snapshot) - * - mov_pos_slow ( fin - max_subbuff_size) lire timestamp packet end - * - prend min(end) (activité sur tous les streams) - * - * start trace - * unlock mutex - */ - - helper_kernctl_buffer_flush(consumerd_metadata); - for (i = 0; i < lttng_consumer_stream_array->len; i++) { - iter = g_ptr_array_index(lttng_consumer_stream_array, i); - helper_kernctl_buffer_flush(helper_get_lttng_consumer_stream_wait_fd(iter)); - ret = helper_lttng_consumer_take_snapshot(ctx, iter); - if (ret != 0) { - ret = errno; - perror("lttng_consumer_take_snapshots"); - goto end; - } - } - for (i = 0; i < lttng_consumer_stream_array->len; i++) { - iter = g_ptr_array_index(lttng_consumer_stream_array, i); - //cds_list_for_each_entry(iter2, &mmap_stream_list.head, list) { - - ret = helper_lttng_consumer_get_produced_snapshot(ctx, iter, &spos); - if (ret != 0) { - ret = errno; - perror("helper_lttng_consumer_get_produced_snapshot"); - goto end; - } - //while (iter->last_pos < spos) { FIXME : last_pos does not exists - new_snapshot = g_new0(struct mmap_stream, 1); - new_snapshot->fd = helper_get_lttng_consumer_stream_wait_fd(iter); - //FIXME new_snapshot->last_pos = iter->last_pos; /* not last_pos, pos for the snapshot */ -// fprintf(stderr,"ADDING AVAILABLE SNAPSHOT ON FD %d AT POSITION %lu\n", -// new_snapshot->kconsumerd_fd->wait_fd, -// new_snapshot->last_pos); - g_ptr_array_add(available_snapshots, new_snapshot); - //FIXME iter->last_pos += iter->chan->max_sb_size; - //} - } - - if (!metadata_ready) { -// fprintf(stderr, "BLOCKING BEFORE METADATA\n"); - sem_wait(&metadata_available); -// fprintf(stderr,"OPENING TRACE\n"); - if (access("/tmp/livesession/kernel/metadata", F_OK) != 0) { - fprintf(stderr,"NO METADATA FILE, SKIPPING\n"); - return; - } - metadata_ready = 1; - metadata_fp = fopen("/tmp/livesession/kernel/metadata", "r"); - } - - if (!trace_opened) { - //bt_ctx = bt_context_create(); -// ret = bt_context_add_trace(ctx, NULL, "ctf", ctf_move_mmap_pos_slow, mmap_list, metadata_fp); - trace_opened = 1; - } - //iter_trace(bt_ctx); - -end: - return; -} - ssize_t read_subbuffer(struct lttng_consumer_stream *kconsumerd_fd, struct lttng_consumer_local_data *ctx) { @@ -732,7 +694,6 @@ ssize_t read_subbuffer(struct lttng_consumer_stream *kconsumerd_fd, if (helper_get_lttng_consumer_stream_output(kconsumerd_fd) == LTTNG_EVENT_SPLICE) { /* Get the next subbuffer */ - printf("get_next : %d\n", infd); err = helper_kernctl_get_next_subbuf(infd); if (err != 0) { ret = errno; @@ -747,7 +708,6 @@ ssize_t read_subbuffer(struct lttng_consumer_stream *kconsumerd_fd, perror("Getting sub-buffer len failed."); goto end; } - printf("len : %ld\n", len); /* splice the subbuffer to the tracefile */ ret = helper_lttng_consumer_on_read_subbuffer_splice(ctx, kconsumerd_fd, len); @@ -758,8 +718,6 @@ ssize_t read_subbuffer(struct lttng_consumer_stream *kconsumerd_fd, */ fprintf(stderr,"Error splicing to tracefile\n"); } - printf("ret : %ld\n", ret); - printf("put_next : %d\n", infd); err = helper_kernctl_put_next_subbuf(infd); if (err != 0) { ret = errno; @@ -785,8 +743,7 @@ int on_update_fd(int key, uint32_t state) int on_recv_fd(struct lttng_consumer_stream *kconsumerd_fd) { int ret; - struct mmap_stream *new_info; - size_t tmp_mmap_len; + struct mmap_stream *new_mmap_stream; /* Opening the tracefile in write mode */ if (helper_get_lttng_consumer_stream_path_name(kconsumerd_fd) != NULL) { @@ -800,30 +757,13 @@ int on_recv_fd(struct lttng_consumer_stream *kconsumerd_fd) } if (helper_get_lttng_consumer_stream_output(kconsumerd_fd) == LTTNG_EVENT_MMAP) { - new_info = malloc(sizeof(struct mmap_stream)); - new_info->fd = helper_get_lttng_consumer_stream_wait_fd(kconsumerd_fd); - bt_list_add(&new_info->list, &mmap_list.head); - - /* get the len of the mmap region */ - ret = helper_kernctl_get_mmap_len(helper_get_lttng_consumer_stream_wait_fd(kconsumerd_fd), - &tmp_mmap_len); - if (ret != 0) { - ret = errno; - perror("helper_kernctl_get_mmap_len"); - goto end; - } - helper_set_lttng_consumer_stream_mmap_len(kconsumerd_fd, tmp_mmap_len); - - helper_set_lttng_consumer_stream_mmap_base(kconsumerd_fd, - mmap(NULL, helper_get_lttng_consumer_stream_mmap_len(kconsumerd_fd), - PROT_READ, MAP_PRIVATE, helper_get_lttng_consumer_stream_wait_fd(kconsumerd_fd), 0)); - if (helper_get_lttng_consumer_stream_mmap_base(kconsumerd_fd) == MAP_FAILED) { - perror("Error mmaping"); - ret = -1; - goto end; - } + new_mmap_stream = malloc(sizeof(struct mmap_stream)); + new_mmap_stream->fd = helper_get_lttng_consumer_stream_wait_fd( + kconsumerd_fd); + bt_list_add(&new_mmap_stream->list, &mmap_list.head); g_ptr_array_add(lttng_consumer_stream_array, kconsumerd_fd); + /* keep mmap FDs internally */ ret = 1; } else { consumerd_metadata = helper_get_lttng_consumer_stream_wait_fd(kconsumerd_fd); @@ -831,10 +771,35 @@ int on_recv_fd(struct lttng_consumer_stream *kconsumerd_fd) ret = 0; } + reload_trace = 1; + end: return ret; } +void live_consume(struct bt_context **bt_ctx) +{ + int ret; + FILE *metadata_fp; + + 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"); + + *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: + return; +} int setup_consumer(char *command_sock_path, pthread_t *threads, struct lttng_consumer_local_data *ctx) @@ -854,14 +819,14 @@ int setup_consumer(char *command_sock_path, pthread_t *threads, ret = pthread_create(&threads[0], NULL, helper_lttng_consumer_thread_receive_fds, (void *) ctx); if (ret != 0) { - perror("pthread_create"); + perror("pthread_create receive fd"); goto end; } /* Create thread to manage the polling/writing of traces */ ret = pthread_create(&threads[1], NULL, helper_lttng_consumer_thread_poll_fds, (void *) ctx); if (ret != 0) { - perror("pthread_create"); + perror("pthread_create poll fd"); goto end; } @@ -869,7 +834,7 @@ end: return ret; } -int setup_live_tracing() +void *setup_live_tracing() { struct lttng_domain dom; struct lttng_channel chan; @@ -896,8 +861,9 @@ int setup_live_tracing() /* setup the session */ dom.type = LTTNG_DOMAIN_KERNEL; - ret = system("rm -rf /tmp/livesession"); + ret = unlink("/tmp/livesession"); + lttng_destroy_session("test"); if ((ret = lttng_create_session("test", "/tmp/livesession")) < 0) { fprintf(stderr,"error creating the session : %s\n", helper_lttcomm_get_readable_code(ret)); @@ -909,6 +875,16 @@ int setup_live_tracing() goto end; } + /* + * 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)); @@ -916,7 +892,7 @@ int setup_live_tracing() } strcpy(chan.name, channel_name); - chan.attr.overwrite = 1; + chan.attr.overwrite = 0; // chan.attr.subbuf_size = 32768; chan.attr.subbuf_size = 1048576; /* 1MB */ chan.attr.num_subbuf = 4; @@ -925,16 +901,24 @@ int setup_live_tracing() chan.attr.output = LTTNG_EVENT_MMAP; if ((ret = lttng_enable_channel(handle, &chan)) < 0) { - fprintf(stderr,"error creating channel : %s\n", helper_lttcomm_get_readable_code(ret)); + fprintf(stderr,"error creating channel : %s\n", + helper_lttcomm_get_readable_code(ret)); goto end; } - sprintf(ev.name, "sched_switch"); + 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 end; + } - //if ((ret = lttng_enable_event(handle, NULL, channel_name)) < 0) { + ev.type = LTTNG_EVENT_SYSCALL; if ((ret = lttng_enable_event(handle, &ev, channel_name)) < 0) { - fprintf(stderr,"error enabling event : %s\n", helper_lttcomm_get_readable_code(ret)); + fprintf(stderr,"error enabling syscalls : %s\n", + helper_lttcomm_get_readable_code(ret)); goto end; } @@ -948,29 +932,26 @@ int setup_live_tracing() 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)); + fprintf(stderr,"error starting tracing : %s\n", + helper_lttcomm_get_readable_code(ret)); goto end; } helper_kernctl_buffer_flush(consumerd_metadata); - sleep(10); - - lttng_stop_tracing("test"); - lttng_destroy_session("test"); /* block until metadata is ready */ sem_init(&metadata_available, 0, 0); - //init_lttngtop(); - end: - return ret; + return NULL; } 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) { @@ -982,8 +963,47 @@ int main(int argc, char **argv) } if (!opt_input_path) { - printf("live tracing enabled\n"); setup_live_tracing(); + init_lttngtop(); + if (!opt_textdump) { + pthread_create(&display_thread, NULL, ncurses_display, (void *) NULL); + pthread_create(&timer_thread, NULL, refresh_thread, (void *) NULL); + } + 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) { + ret = errno; + bt_list_del(&mmap_info->list); + } + } + sem_post(&metadata_available); + } + + pthread_join(timer_thread, NULL); + quit = 1; + pthread_join(display_thread, NULL); + + lttng_stop_tracing("test"); + lttng_destroy_session("test"); + goto end; } else { init_lttngtop(); @@ -1005,8 +1025,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); }