X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2Flttngtop.c;h=87a4043adb6f70f5bb34bec34d72892ae0dcb848;hp=571b0f88aff04c23859d40a5bd7c650070a74d0b;hb=fbbda4dac5b23757921dea8e2992cbb6bff5775f;hpb=dc3eb0c3f241c6b372ee2c15d53bf4cb47d0c9aa diff --git a/src/lttngtop.c b/src/lttngtop.c index 571b0f8..87a4043 100644 --- a/src/lttngtop.c +++ b/src/lttngtop.c @@ -51,7 +51,8 @@ #define DEFAULT_FILE_ARRAY_SIZE 1 const char *opt_input_path; -int opt_textdump; +static int opt_textdump; +static int opt_child; int quit = 0; @@ -72,19 +73,33 @@ GPtrArray *available_snapshots; sem_t metadata_available; int reload_trace = 0; +int last_textdump_print_newline = 1; + enum { OPT_NONE = 0, OPT_HELP, OPT_TEXTDUMP, + OPT_PID, + OPT_CHILD, + OPT_HOSTNAME, }; 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 }, + { "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 }, { NULL, 0, 0, NULL, 0, NULL, NULL }, }; +static void handle_textdump_sigterm(int signal) +{ + quit = 1; + lttng_destroy_session("test"); +} + void *refresh_thread(void *p) { struct mmap_stream *mmap_info; @@ -99,8 +114,8 @@ void *refresh_thread(void *p) 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); + 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); @@ -141,6 +156,37 @@ void *ncurses_display(void *p) } } +void print_fields(struct bt_ctf_event *event) +{ + unsigned int cnt, i; + const struct definition *const * list; + const struct definition *scope; + enum ctf_type_id type; + const char *str; + + scope = bt_ctf_get_top_level_scope(event, BT_EVENT_FIELDS); + + bt_ctf_get_field_list(event, scope, &list, &cnt); + for (i = 0; i < cnt; i++) { + if (i != 0) + printf(", "); + printf("%s = ", bt_ctf_field_name(list[i])); + type = bt_ctf_field_type(list[i]); + if (type == CTF_TYPE_INTEGER) { + if (bt_ctf_get_int_signedness(list[i]) == 0) + printf("%" PRIu64 "", bt_ctf_get_uint64(list[i])); + else + printf("%" PRId64 "", bt_ctf_get_int64(list[i])); + } else if (type == CTF_TYPE_STRING) { + printf("%s", bt_ctf_get_string(list[i])); + } else if (type == CTF_TYPE_ARRAY) { + str = bt_ctf_get_char_array(list[i]); + if (!bt_ctf_field_get_error() && str) + printf("%s", str); + } + } +} + /* * hook on each event to check the timestamp and refresh the display if * necessary @@ -150,17 +196,63 @@ enum bt_cb_ret print_timestamp(struct bt_ctf_event *call_data, void *private_dat unsigned long timestamp; struct tm start; uint64_t ts_nsec_start; + int pid, cpu_id; + int64_t syscall_ret; + const struct definition *scope; + const char *hostname, *procname; 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)); + pid = get_context_pid(call_data); + if (pid == -1ULL && opt_tid) { + goto error; + } + + hostname = get_context_hostname(call_data); + if (!opt_tid && (opt_hostname && !lookup_hostname_list(hostname))) + goto end; + if (!opt_hostname && (opt_tid && !lookup_tid_list(pid))) + goto end; + 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) { + scope = bt_ctf_get_top_level_scope(call_data, + BT_EVENT_FIELDS); + syscall_ret = bt_ctf_get_int64(bt_ctf_get_field(call_data, + scope, "_ret")); + printf("= %ld\n", syscall_ret); + last_textdump_print_newline = 1; + } else { + /* we might have lost the exit_syscall event, so need to + * print the newline in this case */ + if (last_textdump_print_newline == 0) + printf("\n"); + printf("%02d:%02d:%02d.%09" PRIu64 " (%s) (cpu %d) [%s (%d)] %s (", + start.tm_hour, start.tm_min, start.tm_sec, + ts_nsec_start, hostname, cpu_id, procname, pid, + bt_ctf_event_name(call_data)); + print_fields(call_data); + printf(") "); + if (strncmp(bt_ctf_event_name(call_data), "sys_", 4) != 0) { + printf("\n"); + last_textdump_print_newline = 1; + } else { + last_textdump_print_newline = 0; + } + } +end: return BT_CB_OK; +error: + return BT_CB_ERROR_STOP; } /* @@ -298,7 +390,7 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data, void *private_data) { int pid, tid, ppid, vpid, vtid, vppid; - char *comm; + char *comm, *hostname; struct processtop *parent, *child; unsigned long timestamp; @@ -310,6 +402,7 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data, if (pid == -1ULL) { goto error; } + tid = get_context_tid(call_data); if (tid == -1ULL) { goto error; @@ -334,19 +427,24 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data, if (!comm) { goto error; } + /* optional */ + hostname = get_context_hostname(call_data); /* find or create the current process */ child = find_process_tid(<tngtop, tid, comm); if (!child) child = add_proc(<tngtop, tid, comm, timestamp); - update_proc(child, pid, tid, ppid, vpid, vtid, vppid, comm); + if (!child) + goto end; + update_proc(child, pid, tid, ppid, vpid, vtid, vppid, comm, hostname); if (pid != tid) { /* find or create the parent */ parent = find_process_tid(<tngtop, pid, comm); if (!parent) { parent = add_proc(<tngtop, pid, comm, timestamp); - parent->pid = pid; + if (parent) + parent->pid = pid; } /* attach the parent to the current process */ @@ -356,6 +454,7 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data, update_perf_counter(child, call_data); +end: return BT_CB_OK; error: @@ -389,7 +488,13 @@ void init_lttngtop() void usage(FILE *fp) { fprintf(fp, "LTTngTop %s\n\n", VERSION); - fprintf(fp, "Usage : lttngtop /path/to/trace\n"); + fprintf(fp, "Usage : lttngtop [OPTIONS] [TRACE]\n"); + fprintf(fp, " TRACE Path to the trace to analyse (no trace path for live tracing)\n"); + fprintf(fp, " -h, --help This help message\n"); + fprintf(fp, " -t, --textdump Display live events in text-only\n"); + 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"); } /* @@ -400,6 +505,8 @@ static int parse_options(int argc, char **argv) { poptContext pc; int opt, ret = 0; + char *tmp_str; + int *tid; pc = poptGetContext(NULL, argc, (const char **) argv, long_options, 0); poptReadDefaultConfig(pc, 0); @@ -412,7 +519,35 @@ static int parse_options(int argc, char **argv) goto end; case OPT_TEXTDUMP: opt_textdump = 1; - goto end; + break; + case OPT_CHILD: + opt_textdump = 1; + opt_child = 1; + break; + case OPT_PID: + tid_list = g_hash_table_new(g_str_hash, + g_str_equal); + tmp_str = strtok(opt_tid, ","); + while (tmp_str) { + tid = malloc(sizeof(int)); + *tid = atoi(tmp_str); + g_hash_table_insert(tid_list, + (gpointer) tid, tid); + tmp_str = strtok(NULL, ","); + } + break; + case OPT_HOSTNAME: + hostname_list = g_hash_table_new(g_str_hash, + g_str_equal); + tmp_str = strtok(opt_hostname, ","); + while (tmp_str) { + char *new_str = strdup(tmp_str); + g_hash_table_insert(hostname_list, + (gpointer) new_str, + (gpointer) new_str); + tmp_str = strtok(NULL, ","); + } + break; default: ret = -EINVAL; goto end; @@ -909,9 +1044,13 @@ int setup_live_tracing() strcpy(chan.name, channel_name); chan.attr.overwrite = 0; -// chan.attr.subbuf_size = 32768; - chan.attr.subbuf_size = 1048576; /* 1MB */ - chan.attr.num_subbuf = 4; + if (opt_tid && opt_textdump) { + chan.attr.subbuf_size = 32768; + chan.attr.num_subbuf = 8; + } else { + chan.attr.subbuf_size = 1048576; /* 1MB */ + chan.attr.num_subbuf = 4; + } chan.attr.switch_timer_interval = 0; chan.attr.read_timer_interval = 200; chan.attr.output = LTTNG_EVENT_MMAP; @@ -931,6 +1070,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", @@ -938,18 +1078,34 @@ int setup_live_tracing() goto error_session; } + /* + memset(&ev, '\0', sizeof(struct lttng_event)); + ev.type = LTTNG_EVENT_PROBE; + sprintf(ev.attr.probe.symbol_name, "sys_open"); + sprintf(ev.name, "probe_sys_open"); + ev.attr.probe.addr = 0; + ev.attr.probe.offset = 0; + if ((ret = lttng_enable_event(handle, &ev, channel_name)) < 0) { + fprintf(stderr,"error enabling kprobes : %s\n", + helper_lttcomm_get_readable_code(ret)); + goto error_session; + } + */ + kctxpid.ctx = LTTNG_EVENT_CONTEXT_PID; lttng_add_context(handle, &kctxpid, NULL, NULL); + kctxtid.ctx = LTTNG_EVENT_CONTEXT_TID; + lttng_add_context(handle, &kctxtid, NULL, NULL); kctxppid.ctx = LTTNG_EVENT_CONTEXT_PPID; lttng_add_context(handle, &kctxppid, NULL, NULL); kctxcomm.ctx = LTTNG_EVENT_CONTEXT_PROCNAME; 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); + kctxtid.ctx = LTTNG_EVENT_CONTEXT_HOSTNAME; + lttng_add_context(handle, &kctxtid, NULL, NULL); if ((ret = lttng_start_tracing("test")) < 0) { fprintf(stderr,"error starting tracing : %s\n", @@ -987,6 +1143,10 @@ int main(int argc, char **argv) } if (!opt_input_path) { + if (opt_textdump) { + signal(SIGTERM, handle_textdump_sigterm); + signal(SIGINT, handle_textdump_sigterm); + } ret = setup_live_tracing(); if (ret < 0) { goto end;