filter on hostname

Signed-off-by: Julien Desfossez <jdesfossez@efficios.com>

diff --git a/src/common.c b/src/common.c
index 4860b7aef76d406d1f8f44f97ae3fcdea9c0c133..f6c20c9c8dee3487dd480bfa37d6bb0cb570d2b4 100644 (file)
--- a/src/common.c
+++ b/src/common.c
@@ -145,6 +145,21 @@ char *get_context_comm(const struct bt_ctf_event *event)
        return comm;
 }
 
+char *get_context_hostname(const struct bt_ctf_event *event)
+{
+       const struct definition *scope;
+       char *hostname;
+
+       scope = bt_ctf_get_top_level_scope(event, BT_STREAM_EVENT_CONTEXT);
+       hostname = bt_ctf_get_char_array(bt_ctf_get_field(event,
+                               scope, "_hostname"));
+       if (bt_ctf_field_get_error()) {
+               return NULL;
+       }
+
+       return hostname;
+}
+
 /*
  * To get the parent process, put the pid in the tid field
  * because the parent process gets pid = tid
@@ -164,9 +179,6 @@ struct processtop* add_proc(struct lttngtop *ctx, int tid, char *comm,
 {
        struct processtop *newproc;
 
-       if (opt_tid && !lookup_tid_list(tid))
-               return NULL;
-
        /* if the PID already exists, we just rename the process */
        /* FIXME : need to integrate with clone/fork/exit to be accurate */
        newproc = find_process_tid(ctx, tid, comm);
@@ -198,7 +210,7 @@ struct processtop* add_proc(struct lttngtop *ctx, int tid, char *comm,
 }
 
 struct processtop* update_proc(struct processtop* proc, int pid, int tid,
-               int ppid, int vpid, int vtid, int vppid, char *comm)
+               int ppid, int vpid, int vtid, int vppid, char *comm, char *hostname)
 {
        if (proc) {
                proc->pid = pid;
@@ -211,6 +223,12 @@ struct processtop* update_proc(struct processtop* proc, int pid, int tid,
                        free(proc->comm);
                        proc->comm = strdup(comm);
                }
+               if (hostname) {
+                       if (proc->hostname && strcmp(proc->hostname, hostname) != 0) {
+                               free(proc->hostname);
+                       }
+                       proc->hostname = strdup(hostname);
+               }
        }
        return proc;
 }
@@ -588,7 +606,7 @@ enum bt_cb_ret handle_statedump_process_state(struct bt_ctf_event *call_data,
        proc = find_process_tid(&lttngtop, tid, procname);
        if (proc == NULL)
                proc = add_proc(&lttngtop, tid, procname, timestamp);
-       update_proc(proc, pid, tid, ppid, vpid, vtid, vppid, procname);
+       update_proc(proc, pid, tid, ppid, vpid, vtid, vppid, procname, NULL);
 
        if (proc) {
                free(proc->comm);
@@ -623,3 +641,11 @@ int *lookup_tid_list(int tid)
 {
        return g_hash_table_lookup(tid_list, (gpointer) &tid);
 }
+
+char *lookup_hostname_list(const char *hostname)
+{
+       if (!hostname)
+               return NULL;
+
+       return g_hash_table_lookup(hostname_list, (gpointer) hostname);
+}

diff --git a/src/common.h b/src/common.h
index 358d692cf7cd5d574e5777f88289977c24039d7d..4cdb0d35b484b3d71d8ea30662280f93d9adac61 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -32,7 +32,9 @@ GPtrArray *copies; /* struct lttngtop */
 GHashTable *global_perf_liszt;
 
 char *opt_tid;
+char *opt_hostname;
 GHashTable *tid_list;
+GHashTable *hostname_list;
 
 extern int quit;
 
@@ -42,7 +44,8 @@ struct processtop *find_process_tid(struct lttngtop *ctx, int pid, char *comm);
 struct processtop* add_proc(struct lttngtop *ctx, int pid, char *comm,
                unsigned long timestamp);
 struct processtop* update_proc(struct processtop* proc, int pid, int tid,
-               int ppid, int vpid, int vtid, int vppid, char *comm);
+               int ppid, int vpid, int vtid, int vppid, char *comm,
+               char *hostname);
 void add_thread(struct processtop *parent, struct processtop *thread);
 struct processtop* get_proc(struct lttngtop *ctx, int tid, char *comm,
                unsigned long timestamp);
@@ -70,6 +73,7 @@ char *get_context_comm(const struct bt_ctf_event *event);
 uint64_t get_context_vtid(const struct bt_ctf_event *event);
 uint64_t get_context_vpid(const struct bt_ctf_event *event);
 uint64_t get_context_vppid(const struct bt_ctf_event *event);
+char *get_context_hostname(const struct bt_ctf_event *event);
 
 enum bt_cb_ret handle_statedump_process_state(struct bt_ctf_event *call_data,
                                              void *private_data);
@@ -77,5 +81,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);
+char *lookup_hostname_list(const char *hostname);
 
 #endif /* _COMMON_H */

diff --git a/src/cursesdisplay.c b/src/cursesdisplay.c
index 62c4ba44e31c55288b03e05069f5450216a8ce5f..5ef175248e781ad11a749cfa13a6086744f94512 100644 (file)
--- a/src/cursesdisplay.c
+++ b/src/cursesdisplay.c
@@ -570,6 +570,14 @@ void update_cputop_display()
                        nblinedisplayed < max_center_lines; i++) {
                tmp = g_ptr_array_index(data->process_table, i);
                current_row_offset = 1;
+               if (!opt_tid && (opt_hostname && !lookup_hostname_list(tmp->hostname)))
+                       continue;
+               if (!opt_hostname && (opt_tid && !lookup_tid_list(tmp->pid)))
+                       continue;
+               if ((opt_tid && !lookup_tid_list(tmp->tid)) &&
+                               (opt_hostname && !lookup_hostname_list(tmp->hostname)))
+                       continue;
+
                if (tmp->pid != tmp->tid)
                        if (toggle_threads == -1)
                                continue;
@@ -819,6 +827,15 @@ void update_perf()
        for (i = 0; i < data->process_table->len &&
                        nblinedisplayed < max_center_lines; i++) {
                tmp = g_ptr_array_index(data->process_table, i);
+
+               if (!opt_tid && (opt_hostname && !lookup_hostname_list(tmp->hostname)))
+                       continue;
+               if (!opt_hostname && (opt_tid && !lookup_tid_list(tmp->pid)))
+                       continue;
+               if ((opt_tid && !lookup_tid_list(tmp->tid)) &&
+                               (opt_hostname && !lookup_hostname_list(tmp->hostname)))
+                       continue;
+
                if (tmp->pid != tmp->tid)
                        if (toggle_threads == -1)
                                continue;
@@ -901,6 +918,15 @@ void update_iostream()
        for (i = list_offset; i < data->process_table->len &&
                        nblinedisplayed < max_center_lines; i++) {
                tmp = g_ptr_array_index(data->process_table, i);
+
+               if (!opt_tid && (opt_hostname && !lookup_hostname_list(tmp->hostname)))
+                       continue;
+               if (!opt_hostname && (opt_tid && !lookup_tid_list(tmp->pid)))
+                       continue;
+               if ((opt_tid && !lookup_tid_list(tmp->tid)) &&
+                               (opt_hostname && !lookup_hostname_list(tmp->hostname)))
+                       continue;
+
                if (tmp->pid != tmp->tid)
                        if (toggle_threads == -1)
                                continue;

diff --git a/src/lttngtop.c b/src/lttngtop.c
index 2e4a63b86064bab92e0fe0a390e1048663ad61a2..5cb418fae0fd069e25d2cd94de6b59b4597211f2 100644 (file)
--- a/src/lttngtop.c
+++ b/src/lttngtop.c
@@ -81,6 +81,7 @@ enum {
        OPT_TEXTDUMP,
        OPT_PID,
        OPT_CHILD,
+       OPT_HOSTNAME,
 };
 
 static struct poptOption long_options[] = {
@@ -89,6 +90,7 @@ static struct poptOption long_options[] = {
        { "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 },
 };
 
@@ -166,6 +168,7 @@ enum bt_cb_ret print_timestamp(struct bt_ctf_event *call_data, void *private_dat
        int pid;
        int64_t syscall_ret;
        const struct definition *scope;
+       const char *hostname;
 
        timestamp = bt_ctf_get_timestamp(call_data);
 
@@ -177,7 +180,13 @@ enum bt_cb_ret print_timestamp(struct bt_ctf_event *call_data, void *private_dat
                goto error;
        }
        
-       if (opt_tid && !lookup_tid_list(pid))
+       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 (strcmp(bt_ctf_event_name(call_data), "exit_syscall") == 0) {
@@ -339,7 +348,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;
 
@@ -376,6 +385,8 @@ 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(&lttngtop, tid, comm);
@@ -383,7 +394,7 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
                child = add_proc(&lttngtop, tid, comm, timestamp);
        if (!child)
                goto end;
-       update_proc(child, pid, tid, ppid, vpid, vtid, vppid, comm);
+       update_proc(child, pid, tid, ppid, vpid, vtid, vppid, comm, hostname);
 
        if (pid != tid) {
                /* find or create the parent */
@@ -435,7 +446,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");
 }
 
 /*
@@ -466,12 +483,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, g_str_equal);
+                               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);
+                                       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;
@@ -1016,6 +1047,8 @@ int setup_live_tracing()
        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",

diff --git a/src/lttngtoptypes.h b/src/lttngtoptypes.h
index 66b2079ee834ac04cff87d528450fb7d03c909fc..c2b99c6680fe1664b0f7c1ce9d5ef14bfd49afc8 100644 (file)
--- a/src/lttngtoptypes.h
+++ b/src/lttngtoptypes.h
@@ -42,6 +42,7 @@ struct processtop {
        unsigned int puuid;
        int pid;
        char *comm;
+       char *hostname;
        int tid;
        int ppid;
        int vpid;