X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Flttngtop.c;h=9ac8d39c1c9f8c262a9fea039de0c7c9b663e339;hb=30b646c4e7aab1e1bee8fef60619a61bd80bedad;hp=f15eea5518f4119c896114da3e4936f8caf860e7;hpb=16b22a0fe150f4923b9902e802bbf28bacce8d0e;p=lttngtop.git diff --git a/src/lttngtop.c b/src/lttngtop.c index f15eea5..9ac8d39 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,7 @@ #define DEFAULT_FILE_ARRAY_SIZE 1 const char *opt_input_path; +int opt_textdump; struct lttngtop *copy; pthread_t display_thread; @@ -59,24 +61,28 @@ 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; int sessiond_metadata, consumerd_metadata; +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; 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 }, }; @@ -122,6 +128,29 @@ void *ncurses_display(void *p) } } +/* + * 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 @@ -314,6 +343,7 @@ void init_lttngtop() copies = g_ptr_array_new(); global_perf_liszt = g_hash_table_new(g_str_hash, g_str_equal); + sem_init(&goodtodisplay, 0, 0); sem_init(&goodtoupdate, 0, 1); sem_init(&timer, 0, 1); @@ -326,6 +356,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(); @@ -355,6 +387,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; @@ -380,50 +415,56 @@ 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) { ret = bt_iter_next(bt_ctf_get_iter(iter)); @@ -644,7 +685,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; @@ -659,7 +699,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); @@ -670,8 +709,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; @@ -679,7 +716,7 @@ ssize_t read_subbuffer(struct lttng_consumer_stream *kconsumerd_fd, "it is due to concurrency)"); goto end; } -// sem_post(&metadata_available); + sem_post(&metadata_available); } end: @@ -697,10 +734,8 @@ 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; - printf("Receiving %d\n", helper_get_lttng_consumer_stream_wait_fd(kconsumerd_fd)); /* Opening the tracefile in write mode */ if (helper_get_lttng_consumer_stream_path_name(kconsumerd_fd) != NULL) { ret = open(helper_get_lttng_consumer_stream_path_name(kconsumerd_fd), @@ -713,31 +748,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); - printf("mmap len : %ld\n", 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); @@ -749,6 +766,35 @@ end: return ret; } +void *live_consume() +{ + struct bt_context *bt_ctx = NULL; + int ret; + + if (!metadata_ready) { + sem_wait(&metadata_available); + if (access("/tmp/livesession/metadata", F_OK) != 0) { + fprintf(stderr,"no metadata\n"); + return NULL; + } + metadata_ready = 1; + metadata_fp = fopen("/tmp/livesession/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"); + return NULL; + } + trace_opened = 1; + } + iter_trace(bt_ctx); + + return NULL; +} int setup_consumer(char *command_sock_path, pthread_t *threads, struct lttng_consumer_local_data *ctx) @@ -768,14 +814,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; } @@ -783,19 +829,16 @@ end: return ret; } -int setup_live_tracing() +void *setup_live_tracing() { struct lttng_domain dom; struct lttng_channel chan; char *channel_name = "mmapchan"; - struct lttng_consumer_local_data *ctx = NULL; struct lttng_event ev; int ret = 0; char *command_sock_path = "/tmp/consumerd_sock"; static pthread_t threads[2]; /* recv_fd, poll */ struct lttng_event_context kctxpid, kctxcomm, kctxppid, kctxtid; - /* list of snapshots currently not consumed */ - GPtrArray *available_snapshots; struct lttng_handle *handle; @@ -815,6 +858,7 @@ int setup_live_tracing() ret = system("rm -rf /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)); @@ -833,7 +877,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; @@ -842,16 +886,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; } @@ -865,23 +917,18 @@ 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(); + sem_init(&metadata_available, 0, 0); end: - return ret; + return NULL; } int main(int argc, char **argv) @@ -899,8 +946,18 @@ 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); + } + live_consume(); + + sleep(2000); + lttng_stop_tracing("test"); + lttng_destroy_session("test"); + goto end; } else { init_lttngtop();