projects / lttngtop.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
filter on hostname
[lttngtop.git] / src / lttngtop.c
diff --git a/src/lttngtop.c b/src/lttngtop.c
index a33e1d828ceb57f3248b16a19b8d50366bfed227..5cb418fae0fd069e25d2cd94de6b59b4597211f2 100644 (file)
--- a/src/lttngtop.c
+++ b/src/lttngtop.c
@@ -73,12 +73,15 @@ GPtrArray *available_snapshots;
 sem_t metadata_available;
 int reload_trace = 0;
 
 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,
 enum {
        OPT_NONE = 0,
        OPT_HELP,
        OPT_TEXTDUMP,
        OPT_PID,
        OPT_CHILD,
+       OPT_HOSTNAME,
 };
 
 static struct poptOption long_options[] = {
 };
 
 static struct poptOption long_options[] = {
@@ -86,7 +89,8 @@ 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 },
        { "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 },
+       { "hostname", 'n', POPT_ARG_STRING, &opt_hostname, OPT_HOSTNAME, NULL, NULL },
        { NULL, 0, 0, NULL, 0, NULL, NULL },
 };
 
        { NULL, 0, 0, NULL, 0, NULL, NULL },
 };
 
@@ -164,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;
        int pid;
        int64_t syscall_ret;
        const struct definition *scope;
+       const char *hostname;
 
        timestamp = bt_ctf_get_timestamp(call_data);
 
 
        timestamp = bt_ctf_get_timestamp(call_data);
 
@@ -171,11 +176,17 @@ 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);
        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;
        }
        
                goto error;
        }
        
-       if (opt_pid && opt_pid != 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) {
                goto end;
 
        if (strcmp(bt_ctf_event_name(call_data), "exit_syscall") == 0) {
@@ -184,10 +195,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);
                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 {
        } 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));
                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:
        }
 
 end:
@@ -331,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;
                void *private_data)
 {
        int pid, tid, ppid, vpid, vtid, vppid;
-       char *comm;
+       char *comm, *hostname;
        struct processtop *parent, *child;
        unsigned long timestamp;
 
        struct processtop *parent, *child;
        unsigned long timestamp;
 
@@ -368,6 +385,8 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
        if (!comm) {
                goto error;
        }
        if (!comm) {
                goto error;
        }
+       /* optional */
+       hostname = get_context_hostname(call_data);
 
        /* find or create the current process */
        child = find_process_tid(&lttngtop, tid, comm);
 
        /* find or create the current process */
        child = find_process_tid(&lttngtop, tid, comm);
@@ -375,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;
                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 */
 
        if (pid != tid) {
                /* find or create the parent */
@@ -427,7 +446,13 @@ void init_lttngtop()
 void usage(FILE *fp)
 {
        fprintf(fp, "LTTngTop %s\n\n", VERSION);
 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");
 }
 
 /*
 }
 
 /*
@@ -438,6 +463,8 @@ static int parse_options(int argc, char **argv)
 {
        poptContext pc;
        int opt, ret = 0;
 {
        poptContext pc;
        int opt, ret = 0;
+       char *tmp_str;
+       int *tid;
 
        pc = poptGetContext(NULL, argc, (const char **) argv, long_options, 0);
        poptReadDefaultConfig(pc, 0);
 
        pc = poptGetContext(NULL, argc, (const char **) argv, long_options, 0);
        poptReadDefaultConfig(pc, 0);
@@ -456,7 +483,28 @@ static int parse_options(int argc, char **argv)
                                opt_child = 1;
                                break;
                        case OPT_PID:
                                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;
+                       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;
                                break;
                        default:
                                ret = -EINVAL;
@@ -954,7 +1002,7 @@ int setup_live_tracing()
 
        strcpy(chan.name, channel_name);
        chan.attr.overwrite = 0;
 
        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 {
                chan.attr.subbuf_size = 32768;
                chan.attr.num_subbuf = 8;
        } else {
@@ -973,14 +1021,12 @@ int setup_live_tracing()
 
        memset(&ev, '\0', sizeof(struct lttng_event));
        //sprintf(ev.name, "sched_switch");
 
        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) {
 
        ev.type = LTTNG_EVENT_SYSCALL;
        if ((ret = lttng_enable_event(handle, &ev, channel_name)) < 0) {
@@ -993,16 +1039,16 @@ int setup_live_tracing()
        lttng_add_context(handle, &kctxpid, NULL, NULL);
        kctxtid.ctx = LTTNG_EVENT_CONTEXT_TID;
        lttng_add_context(handle, &kctxtid, NULL, NULL);
        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);
+       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",
 
        if ((ret = lttng_start_tracing("test")) < 0) {
                fprintf(stderr,"error starting tracing : %s\n",
LTTngTop ncurse top like application showing statistics
This page took 0.02514 seconds and 4 git commands to generate.