X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Flttngtop.c;h=024dc5b4e2b7d562319498757f05a2d60b4f2554;hp=9c8cd17cf45d51491bc22fb30db3035482967e3d;hb=241ba90a54b0a70b306c63d2844b0f01afc6bc42;hpb=575cc4fdfc069c934faa48019f2a833f9446d314 diff --git a/src/lttngtop.c b/src/lttngtop.c index 9c8cd17..024dc5b 100644 --- a/src/lttngtop.c +++ b/src/lttngtop.c @@ -82,6 +82,7 @@ enum { OPT_PID, OPT_CHILD, OPT_HOSTNAME, + OPT_KPROBES, }; static struct poptOption long_options[] = { @@ -91,6 +92,7 @@ static struct poptOption long_options[] = { { "child", 'f', POPT_ARG_NONE, NULL, OPT_CHILD, NULL, NULL }, { "pid", 'p', POPT_ARG_STRING, &opt_tid, OPT_PID, NULL, NULL }, { "hostname", 'n', POPT_ARG_STRING, &opt_hostname, OPT_HOSTNAME, NULL, NULL }, + { "kprobes", 'k', POPT_ARG_STRING, &opt_kprobes, OPT_KPROBES, NULL, NULL }, { NULL, 0, 0, NULL, 0, NULL, NULL }, }; @@ -181,7 +183,7 @@ void print_fields(struct bt_ctf_event *event) printf("%s", bt_ctf_get_string(list[i])); } else if (type == CTF_TYPE_ARRAY) { str = bt_ctf_get_char_array(list[i]); - if (str) + if (!bt_ctf_field_get_error() && str) printf("%s", str); } } @@ -223,7 +225,8 @@ enum bt_cb_ret print_timestamp(struct bt_ctf_event *call_data, void *private_dat cpu_id = get_cpu_id(call_data); procname = get_context_comm(call_data); - if (strcmp(bt_ctf_event_name(call_data), "exit_syscall") == 0) { + if ((strcmp(bt_ctf_event_name(call_data), "exit_syscall") == 0) && + !last_textdump_print_newline) { scope = bt_ctf_get_top_level_scope(call_data, BT_EVENT_FIELDS); syscall_ret = bt_ctf_get_int64(bt_ctf_get_field(call_data, @@ -241,13 +244,12 @@ enum bt_cb_ret print_timestamp(struct bt_ctf_event *call_data, void *private_dat bt_ctf_event_name(call_data)); print_fields(call_data); printf(") "); - /* - if (strncmp(bt_ctf_event_name(call_data), "sys_", 4) == 0) { - } else { + if (strncmp(bt_ctf_event_name(call_data), "sys_", 4) != 0) { printf("\n"); + last_textdump_print_newline = 1; + } else { + last_textdump_print_newline = 0; } - */ - last_textdump_print_newline = 0; } end: @@ -256,6 +258,22 @@ error: return BT_CB_ERROR_STOP; } +enum bt_cb_ret handle_kprobes(struct bt_ctf_event *call_data, void *private_data) +{ + int i; + struct kprobes *kprobe; + + /* for kprobes */ + for (i = 0; i < lttngtop.kprobes_table->len; i++) { + kprobe = g_ptr_array_index(lttngtop.kprobes_table, i); + if (strcmp(bt_ctf_event_name(call_data), kprobe->probe_name) == 0) { + kprobe->count++; + } + } + + return BT_CB_OK; +} + /* * hook on each event to check the timestamp and refresh the display if * necessary @@ -496,6 +514,82 @@ void usage(FILE *fp) fprintf(fp, " -p, --pid Comma-separated list of PIDs to display\n"); fprintf(fp, " -f, --child Follow threads associated with selected PIDs\n"); fprintf(fp, " -n, --hostname Comma-separated list of hostnames to display (require hostname context in trace)\n"); + fprintf(fp, " -k, --kprobes Comma-separated list of kprobes to insert (same format as lttng enable-event)\n"); +} + +/* + * Parse probe options. + * Shamelessly stolen from lttng-tools : + * src/bin/lttng/commands/enable_events.c + */ +static struct kprobes *parse_probe_opts(char *opt) +{ + char s_hex[19]; + char name[LTTNG_SYMBOL_NAME_LEN]; + struct kprobes *kprobe; + int ret; + + /* + kprobe->probe_addr = 0; + kprobe->probe_offset = 0; + asprintf(&kprobe->probe_name, "probe_sys_open"); + asprintf(&kprobe->symbol_name, "sys_open"); + */ + + if (opt == NULL) { + kprobe = NULL; + goto end; + } + + kprobe = g_new0(struct kprobes, 1); + + /* Check for symbol+offset */ + ret = sscanf(opt, "%[^'+']+%s", name, s_hex); + if (ret == 2) { + asprintf(&kprobe->probe_name, "probe_%s", name); + asprintf(&kprobe->symbol_name, "%s", name); + + if (strlen(s_hex) == 0) { + fprintf(stderr, "Invalid probe offset %s", s_hex); + ret = -1; + goto end; + } + kprobe->probe_offset = strtoul(s_hex, NULL, 0); + kprobe->probe_addr = 0; + goto end; + } + + /* Check for symbol */ + if (isalpha(name[0])) { + ret = sscanf(opt, "%s", name); + if (ret == 1) { + asprintf(&kprobe->probe_name, "probe_%s", name); + asprintf(&kprobe->symbol_name, "%s", name); + kprobe->probe_offset = 0; + kprobe->probe_addr = 0; + goto end; + } + } + + /* Check for address */ + ret = sscanf(opt, "%s", s_hex); + if (ret > 0) { + if (strlen(s_hex) == 0) { + fprintf(stderr, "Invalid probe address %s", s_hex); + ret = -1; + goto end; + } + asprintf(&kprobe->probe_name, "probe_%s", s_hex); + kprobe->probe_offset = 0; + kprobe->probe_addr = strtoul(s_hex, NULL, 0); + goto end; + } + + /* No match */ + kprobe = NULL; + +end: + return kprobe; } /* @@ -549,6 +643,24 @@ static int parse_options(int argc, char **argv) tmp_str = strtok(NULL, ","); } break; + case OPT_KPROBES: + lttngtop.kprobes_table = g_ptr_array_new(); + tmp_str = strtok(opt_kprobes, ","); + while (tmp_str) { + struct kprobes *kprobe; + + kprobe = parse_probe_opts(tmp_str); + if (kprobe) { + g_ptr_array_add( + lttngtop.kprobes_table, + kprobe); + } else { + ret = -EINVAL; + goto end; + } + tmp_str = strtok(NULL, ","); + } + break; default: ret = -EINVAL; goto end; @@ -568,7 +680,9 @@ void iter_trace(struct bt_context *bt_ctx) { struct bt_ctf_iter *iter; struct bt_iter_pos begin_pos; + struct kprobes *kprobe; const struct bt_ctf_event *event; + int i; int ret = 0; begin_pos.type = BT_SEEK_BEGIN; @@ -623,9 +737,19 @@ void iter_trace(struct bt_context *bt_ctx) "lttng_statedump_file_descriptor"), NULL, 0, handle_statedump_file_descriptor, NULL, NULL, NULL); + + /* for kprobes */ + for (i = 0; i < lttngtop.kprobes_table->len; i++) { + kprobe = g_ptr_array_index(lttngtop.kprobes_table, i); + bt_ctf_iter_add_callback(iter, + g_quark_from_static_string( + kprobe->probe_name), + NULL, 0, handle_kprobes, + NULL, NULL, NULL); + } } - while ((event = bt_ctf_iter_read_event(iter, 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)); @@ -986,6 +1110,34 @@ end: return ret; } +int enable_kprobes(struct lttng_handle *handle, char *channel_name) +{ + struct lttng_event ev; + struct kprobes *kprobe; + int ret = 0; + int i; + + for (i = 0; i < lttngtop.kprobes_table->len; i++) { + kprobe = g_ptr_array_index(lttngtop.kprobes_table, i); + + memset(&ev, '\0', sizeof(struct lttng_event)); + ev.type = LTTNG_EVENT_PROBE; + if (kprobe->symbol_name) + sprintf(ev.attr.probe.symbol_name, "%s", kprobe->symbol_name); + sprintf(ev.name, "%s", kprobe->probe_name); + ev.attr.probe.addr = kprobe->probe_addr; + ev.attr.probe.offset = kprobe->probe_offset; + if ((ret = lttng_enable_event(handle, &ev, channel_name)) < 0) { + fprintf(stderr,"error enabling kprobes : %s\n", + helper_lttcomm_get_readable_code(ret)); + goto end; + } + } + +end: + return ret; +} + int setup_live_tracing() { struct lttng_domain dom; @@ -1071,6 +1223,7 @@ int setup_live_tracing() goto error_session; } + memset(&ev, '\0', sizeof(struct lttng_event)); ev.type = LTTNG_EVENT_SYSCALL; if ((ret = lttng_enable_event(handle, &ev, channel_name)) < 0) { fprintf(stderr,"error enabling syscalls : %s\n", @@ -1078,6 +1231,13 @@ int setup_live_tracing() goto error_session; } + if (lttngtop.kprobes_table) { + ret = enable_kprobes(handle, channel_name); + if (ret < 0) { + goto error_session; + } + } + kctxpid.ctx = LTTNG_EVENT_CONTEXT_PID; lttng_add_context(handle, &kctxpid, NULL, NULL); kctxtid.ctx = LTTNG_EVENT_CONTEXT_TID; @@ -1119,6 +1279,7 @@ int main(int argc, char **argv) struct mmap_stream *mmap_info; unsigned long mmap_len; + init_lttngtop(); ret = parse_options(argc, argv); if (ret < 0) { fprintf(stdout, "Error parsing options.\n\n"); @@ -1137,7 +1298,6 @@ int main(int argc, char **argv) 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); @@ -1178,7 +1338,7 @@ int main(int argc, char **argv) goto end; } else { - init_lttngtop(); + //init_lttngtop(); bt_ctx = bt_context_create(); ret = bt_context_add_traces_recursive(bt_ctx, opt_input_path, "ctf", NULL);