From c983acc0b614a8a4e45b08c1efe75f8ac735f224 Mon Sep 17 00:00:00 2001 From: Julien Desfossez Date: Mon, 27 Aug 2012 00:43:02 -0400 Subject: [PATCH] process list filtering Signed-off-by: Julien Desfossez --- src/common.c | 7 +++++- src/common.h | 5 ++++- src/lttngtop.c | 59 ++++++++++++++++++++++++++++++-------------------- 3 files changed, 46 insertions(+), 25 deletions(-) diff --git a/src/common.c b/src/common.c index 7a9925e..ae19f13 100644 --- a/src/common.c +++ b/src/common.c @@ -164,7 +164,7 @@ struct processtop* add_proc(struct lttngtop *ctx, int tid, char *comm, { struct processtop *newproc; - if (opt_pid && tid != opt_pid) + if (opt_tid && !lookup_tid_list(tid)) return NULL; /* if the PID already exists, we just rename the process */ @@ -618,3 +618,8 @@ struct tm format_timestamp(uint64_t timestamp) return tm; } + +int *lookup_tid_list(int tid) +{ + return g_hash_table_lookup(tid_list, (gpointer) &tid); +} diff --git a/src/common.h b/src/common.h index 86f979f..358d692 100644 --- a/src/common.h +++ b/src/common.h @@ -31,7 +31,8 @@ sem_t goodtodisplay, goodtoupdate, timer, pause_sem, end_trace_sem, bootstrap; GPtrArray *copies; /* struct lttngtop */ GHashTable *global_perf_liszt; -int opt_pid; +char *opt_tid; +GHashTable *tid_list; extern int quit; @@ -75,4 +76,6 @@ enum bt_cb_ret handle_statedump_process_state(struct bt_ctf_event *call_data, struct tm format_timestamp(uint64_t timestamp); +int *lookup_tid_list(int tid); + #endif /* _COMMON_H */ diff --git a/src/lttngtop.c b/src/lttngtop.c index be323eb..8a37100 100644 --- a/src/lttngtop.c +++ b/src/lttngtop.c @@ -73,6 +73,8 @@ GPtrArray *available_snapshots; sem_t metadata_available; int reload_trace = 0; +int last_textdump_print_newline = 1; + enum { OPT_NONE = 0, OPT_HELP, @@ -86,7 +88,7 @@ static struct poptOption long_options[] = { { "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_INT, &opt_pid, OPT_PID, NULL, NULL }, + { "pid", 'p', POPT_ARG_STRING, &opt_tid, OPT_PID, NULL, NULL }, { NULL, 0, 0, NULL, 0, NULL, NULL }, }; @@ -171,11 +173,11 @@ enum bt_cb_ret print_timestamp(struct bt_ctf_event *call_data, void *private_dat ts_nsec_start = timestamp % NSEC_PER_SEC; pid = get_context_pid(call_data); - if (pid == -1ULL && opt_pid) { + if (pid == -1ULL && opt_tid) { goto error; } - if (opt_pid && opt_pid != pid) + if (opt_tid && !lookup_tid_list(pid)) goto end; if (strcmp(bt_ctf_event_name(call_data), "exit_syscall") == 0) { @@ -184,10 +186,16 @@ enum bt_cb_ret print_timestamp(struct bt_ctf_event *call_data, void *private_dat 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 " %d : %s ", start.tm_hour, start.tm_min, start.tm_sec, ts_nsec_start, pid, bt_ctf_event_name(call_data)); + last_textdump_print_newline = 0; } end: @@ -438,6 +446,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); @@ -456,7 +466,14 @@ static int parse_options(int argc, char **argv) opt_child = 1; break; case OPT_PID: - //opt_textdump = 1; + 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; default: ret = -EINVAL; @@ -954,7 +971,7 @@ int setup_live_tracing() strcpy(chan.name, channel_name); chan.attr.overwrite = 0; - if (opt_pid && opt_textdump) { + if (opt_tid && opt_textdump) { chan.attr.subbuf_size = 32768; chan.attr.num_subbuf = 8; } else { @@ -973,14 +990,12 @@ int setup_live_tracing() memset(&ev, '\0', sizeof(struct lttng_event)); //sprintf(ev.name, "sched_switch"); -// if (!opt_pid) { - 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 error_session; - } -// } + 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 error_session; + } ev.type = LTTNG_EVENT_SYSCALL; if ((ret = lttng_enable_event(handle, &ev, channel_name)) < 0) { @@ -993,16 +1008,14 @@ int setup_live_tracing() lttng_add_context(handle, &kctxpid, NULL, NULL); kctxtid.ctx = LTTNG_EVENT_CONTEXT_TID; lttng_add_context(handle, &kctxtid, NULL, NULL); -// if (!opt_pid) { - 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); - 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); -// } + 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); + 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); if ((ret = lttng_start_tracing("test")) < 0) { fprintf(stderr,"error starting tracing : %s\n", -- 2.34.1