X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flttngtop.c;h=69a05e15854853fd84fe63bed9d253b519ca5488;hb=b99227ca38ff0a257b6a4b2e0c329f86ebb5dfa1;hp=2672c8f74bcffd91dac9c58c47eda1ca9239f2a7;hpb=906c08f6245d165f7ccc3d0336714b425169d406;p=lttngtop.git diff --git a/src/lttngtop.c b/src/lttngtop.c index 2672c8f..69a05e1 100644 --- a/src/lttngtop.c +++ b/src/lttngtop.c @@ -218,16 +218,6 @@ enum bt_cb_ret print_timestamp(struct bt_ctf_event *call_data, void *private_dat 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))) - 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); @@ -491,6 +481,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); + global_host_list = g_hash_table_new(g_str_hash, g_str_equal); sem_init(&goodtodisplay, 0, 0); sem_init(&goodtoupdate, 0, 1); @@ -630,27 +621,22 @@ static int parse_options(int argc, char **argv) break; case OPT_PID: toggle_filter = 1; - tid_list = g_hash_table_new(g_str_hash, + 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: toggle_filter = 1; - 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); + add_hostname_list(tmp_str, 1); tmp_str = strtok(NULL, ","); } break; @@ -1214,7 +1200,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;