X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Flttngtop.c;h=51c5a98743c6aebd6821dd8c9b34974e5569f898;hp=ae10e9fbe3ebd74480f7c6fd8a9eee1c765c462c;hb=1d2391b4818d470a92437e77892b0c5d7c10a466;hpb=246d59926e23f5cdf6f017ae7544f2582b666ef7 diff --git a/src/lttngtop.c b/src/lttngtop.c index ae10e9f..51c5a98 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 }, }; @@ -212,6 +214,11 @@ enum bt_cb_ret print_timestamp(struct bt_ctf_event *call_data, void *private_dat } hostname = get_context_hostname(call_data); + if (opt_tid || opt_hostname) + if (!lookup_filter_tid_list(pid)) + goto end; + + /* if (!opt_tid && (opt_hostname && !lookup_hostname_list(hostname))) goto end; if (!opt_hostname && (opt_tid && !lookup_tid_list(pid))) @@ -219,11 +226,13 @@ enum bt_cb_ret print_timestamp(struct bt_ctf_event *call_data, void *private_dat if ((opt_tid && !lookup_tid_list(pid)) && (opt_hostname && !lookup_hostname_list(hostname))) goto end; + */ cpu_id = get_cpu_id(call_data); procname = get_context_comm(call_data); - if ((strcmp(bt_ctf_event_name(call_data), "exit_syscall") == 0) && !last_textdump_print_newline) { + 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, @@ -449,7 +458,7 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data, /* find or create the current process */ child = find_process_tid(<tngtop, tid, comm); if (!child) - child = add_proc(<tngtop, tid, comm, timestamp); + child = add_proc(<tngtop, tid, comm, timestamp, hostname); if (!child) goto end; update_proc(child, pid, tid, ppid, vpid, vtid, vppid, comm, hostname); @@ -458,7 +467,7 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data, /* find or create the parent */ parent = find_process_tid(<tngtop, pid, comm); if (!parent) { - parent = add_proc(<tngtop, pid, comm, timestamp); + parent = add_proc(<tngtop, pid, comm, timestamp, hostname); if (parent) parent->pid = pid; } @@ -481,6 +490,7 @@ void init_lttngtop() { copies = g_ptr_array_new(); global_perf_liszt = g_hash_table_new(g_str_hash, g_str_equal); + global_filter_list = g_hash_table_new(g_str_hash, g_str_equal); sem_init(&goodtodisplay, 0, 0); sem_init(&goodtoupdate, 0, 1); @@ -499,7 +509,8 @@ void init_lttngtop() lttngtop.process_table = g_ptr_array_new(); lttngtop.files_table = g_ptr_array_new(); lttngtop.cpu_table = g_ptr_array_new(); - lttngtop.kprobes_table = g_ptr_array_new(); + + toggle_filter = -1; } void usage(FILE *fp) @@ -512,6 +523,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; } /* @@ -542,6 +629,7 @@ static int parse_options(int argc, char **argv) opt_child = 1; break; case OPT_PID: + toggle_filter = 1; tid_list = g_hash_table_new(g_str_hash, g_str_equal); tmp_str = strtok(opt_tid, ","); @@ -554,6 +642,7 @@ static int parse_options(int argc, char **argv) } break; case OPT_HOSTNAME: + toggle_filter = 1; hostname_list = g_hash_table_new(g_str_hash, g_str_equal); tmp_str = strtok(opt_hostname, ","); @@ -565,6 +654,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; @@ -592,6 +699,10 @@ 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, verify the status of the process table */ + bt_ctf_iter_add_callback(iter, 0, NULL, 0, + fix_process_table, + NULL, NULL, NULL); if (opt_textdump) { bt_ctf_iter_add_callback(iter, 0, NULL, 0, print_timestamp, @@ -601,10 +712,6 @@ void iter_trace(struct bt_context *bt_ctx) 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"), @@ -643,13 +750,15 @@ void iter_trace(struct bt_context *bt_ctx) 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); + if (lttngtop.kprobes_table) { + 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); + } } } @@ -1021,28 +1130,13 @@ int enable_kprobes(struct lttng_handle *handle, char *channel_name) int ret = 0; int i; - /* - kprobe = g_new0(struct kprobes, 1); - kprobe->probe_addr = 0; - kprobe->probe_offset = 0; - asprintf(&kprobe->probe_name, "probe_sys_open"); - asprintf(&kprobe->symbol_name, "sys_open"); - g_ptr_array_add(lttngtop.kprobes_table, kprobe); - - kprobe = g_new0(struct kprobes, 1); - kprobe->probe_addr = 0; - kprobe->probe_offset = 0; - asprintf(&kprobe->probe_name, "probe_sys_close"); - asprintf(&kprobe->symbol_name, "sys_close"); - g_ptr_array_add(lttngtop.kprobes_table, kprobe); - */ - 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; - sprintf(ev.attr.probe.symbol_name, "%s", kprobe->symbol_name); + 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; @@ -1120,7 +1214,8 @@ int setup_live_tracing() chan.attr.subbuf_size = 32768; chan.attr.num_subbuf = 8; } else { - chan.attr.subbuf_size = 1048576; /* 1MB */ + //chan.attr.subbuf_size = 1048576; /* 1MB */ + chan.attr.subbuf_size = 2097152; /* 1MB */ chan.attr.num_subbuf = 4; } chan.attr.switch_timer_interval = 0; @@ -1150,9 +1245,11 @@ int setup_live_tracing() goto error_session; } - ret = enable_kprobes(handle, channel_name); - if (ret < 0) { - 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; @@ -1196,6 +1293,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"); @@ -1210,7 +1308,6 @@ int main(int argc, char **argv) signal(SIGTERM, handle_textdump_sigterm); signal(SIGINT, handle_textdump_sigterm); } - init_lttngtop(); ret = setup_live_tracing(); if (ret < 0) { goto end; @@ -1255,7 +1352,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);