cleanup namespace of filter lists

[lttngtop.git] / src / lttngtop.c

diff --git a/src/lttngtop.c b/src/lttngtop.c
index d1b36a3e31e17ac20d7493c7e7c0e1849912747b..c31b9fd873644f8a3117ce5b001d3b4600a49c23 100644 (file)
--- a/src/lttngtop.c
+++ b/src/lttngtop.c
@@ -214,13 +214,9 @@ 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 && !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;
+       if (opt_tid || opt_hostname)
+               if (!lookup_filter_tid_list(pid))
+                       goto end;
 
        cpu_id = get_cpu_id(call_data);
        procname = get_context_comm(call_data);
@@ -452,7 +448,7 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
        /* find or create the current process */
        child = find_process_tid(&lttngtop, tid, comm);
        if (!child)
-               child = add_proc(&lttngtop, tid, comm, timestamp);
+               child = add_proc(&lttngtop, tid, comm, timestamp, hostname);
        if (!child)
                goto end;
        update_proc(child, pid, tid, ppid, vpid, vtid, vppid, comm, hostname);
@@ -461,7 +457,7 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
                /* find or create the parent */
                parent = find_process_tid(&lttngtop, pid, comm);
                if (!parent) {
-                       parent = add_proc(&lttngtop, pid, comm, timestamp);
+                       parent = add_proc(&lttngtop, pid, comm, timestamp, hostname);
                        if (parent)
                                parent->pid = pid;
                }
@@ -484,6 +480,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);
@@ -502,6 +499,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();
+
+       toggle_filter = -1;
 }
 
 void usage(FILE *fp)
@@ -514,6 +513,7 @@ 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");
 }
 
 /*
@@ -619,24 +619,26 @@ static int parse_options(int argc, char **argv)
                                opt_child = 1;
                                break;
                        case OPT_PID:
-                               tid_list = g_hash_table_new(g_str_hash,
+                               toggle_filter = 1;
+                               tid_filter_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,
+                                       g_hash_table_insert(tid_filter_list,
                                                        (gpointer) tid, tid);
                                        tmp_str = strtok(NULL, ",");
                                }
                                break;
                        case OPT_HOSTNAME:
-                               hostname_list = g_hash_table_new(g_str_hash,
+                               toggle_filter = 1;
+                               hostname_filter_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,
+                                       g_hash_table_insert(hostname_filter_list,
                                                        (gpointer) new_str,
                                                        (gpointer) new_str);
                                        tmp_str = strtok(NULL, ",");
@@ -687,6 +689,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,
@@ -696,10 +702,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"),
@@ -738,13 +740,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);
+                       }
                }
        }
 
@@ -1200,7 +1204,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;
@@ -1230,9 +1235,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;
@@ -1276,6 +1283,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");
@@ -1290,7 +1298,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;
@@ -1335,7 +1342,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);