exit cleanly on ctrl+c in textdump live

[lttngtop.git] / src / lttngtop.c

diff --git a/src/lttngtop.c b/src/lttngtop.c
index 571b0f88aff04c23859d40a5bd7c650070a74d0b..a33e1d828ceb57f3248b16a19b8d50366bfed227 100644 (file)
--- a/src/lttngtop.c
+++ b/src/lttngtop.c
@@ -51,7 +51,8 @@
 #define DEFAULT_FILE_ARRAY_SIZE 1
 
 const char *opt_input_path;
-int opt_textdump;
+static int opt_textdump;
+static int opt_child;
 
 int quit = 0;
 
@@ -76,15 +77,25 @@ enum {
        OPT_NONE = 0,
        OPT_HELP,
        OPT_TEXTDUMP,
+       OPT_PID,
+       OPT_CHILD,
 };
 
 static struct poptOption long_options[] = {
        /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
        { "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 },
        { NULL, 0, 0, NULL, 0, NULL, NULL },
 };
 
+static void handle_textdump_sigterm(int signal)
+{
+       quit = 1;
+       lttng_destroy_session("test");
+}
+
 void *refresh_thread(void *p)
 {
        struct mmap_stream *mmap_info;
@@ -99,8 +110,8 @@ void *refresh_thread(void *p)
                        pthread_exit(0);
                }
                if (!opt_input_path) {
-               bt_list_for_each_entry(mmap_info, &mmap_list.head, list)
-                       helper_kernctl_buffer_flush(mmap_info->fd);
+                       bt_list_for_each_entry(mmap_info, &mmap_list.head, list)
+                               helper_kernctl_buffer_flush(mmap_info->fd);
                }
                sem_wait(&pause_sem);
                sem_post(&pause_sem);
@@ -150,17 +161,39 @@ enum bt_cb_ret print_timestamp(struct bt_ctf_event *call_data, void *private_dat
        unsigned long timestamp;
        struct tm start;
        uint64_t ts_nsec_start;
+       int pid;
+       int64_t syscall_ret;
+       const struct definition *scope;
 
        timestamp = bt_ctf_get_timestamp(call_data);
 
        start = format_timestamp(timestamp);
        ts_nsec_start = timestamp % NSEC_PER_SEC;
 
-       printf("%02d:%02d:%02d.%09" PRIu64 " %s\n", start.tm_hour,
-                       start.tm_min, start.tm_sec, ts_nsec_start,
-                       bt_ctf_event_name(call_data));
+       pid = get_context_pid(call_data);
+       if (pid == -1ULL && opt_pid) {
+               goto error;
+       }
+       
+       if (opt_pid && opt_pid != pid)
+               goto end;
 
+       if (strcmp(bt_ctf_event_name(call_data), "exit_syscall") == 0) {
+               scope = bt_ctf_get_top_level_scope(call_data,
+                               BT_EVENT_FIELDS);
+               syscall_ret = bt_ctf_get_int64(bt_ctf_get_field(call_data,
+                                       scope, "_ret"));
+               printf("= %ld\n", syscall_ret);
+       } else {
+               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));
+       }
+
+end:
        return BT_CB_OK;
+error:
+       return BT_CB_ERROR_STOP;
 }
 
 /*
@@ -310,6 +343,7 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
        if (pid == -1ULL) {
                goto error;
        }
+
        tid = get_context_tid(call_data);
        if (tid == -1ULL) {
                goto error;
@@ -339,6 +373,8 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
        child = find_process_tid(&lttngtop, tid, comm);
        if (!child)
                child = add_proc(&lttngtop, tid, comm, timestamp);
+       if (!child)
+               goto end;
        update_proc(child, pid, tid, ppid, vpid, vtid, vppid, comm);
 
        if (pid != tid) {
@@ -346,7 +382,8 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
                parent = find_process_tid(&lttngtop, pid, comm);
                if (!parent) {
                        parent = add_proc(&lttngtop, pid, comm, timestamp);
-                       parent->pid = pid;
+                       if (parent)
+                               parent->pid = pid;
                }
 
                /* attach the parent to the current process */
@@ -356,6 +393,7 @@ enum bt_cb_ret fix_process_table(struct bt_ctf_event *call_data,
 
        update_perf_counter(child, call_data);
 
+end:
        return BT_CB_OK;
 
 error:
@@ -412,7 +450,14 @@ static int parse_options(int argc, char **argv)
                                goto end;
                        case OPT_TEXTDUMP:
                                opt_textdump = 1;
-                               goto end;
+                               break;
+                       case OPT_CHILD:
+                               opt_textdump = 1;
+                               opt_child = 1;
+                               break;
+                       case OPT_PID:
+                               //opt_textdump = 1;
+                               break;
                        default:
                                ret = -EINVAL;
                                goto end;
@@ -489,7 +534,7 @@ void iter_trace(struct bt_context *bt_ctx)
                                NULL, NULL, NULL);
        }
 
-       while ((event = bt_ctf_iter_read_event(iter)) != NULL) {
+       while ((event = bt_ctf_iter_read_event(iter, NULL)) != NULL) {
                if (quit || reload_trace)
                        goto end_iter;
                ret = bt_iter_next(bt_ctf_get_iter(iter));
@@ -909,9 +954,13 @@ int setup_live_tracing()
 
        strcpy(chan.name, channel_name);
        chan.attr.overwrite = 0;
-//     chan.attr.subbuf_size = 32768;
-       chan.attr.subbuf_size = 1048576; /* 1MB */
-       chan.attr.num_subbuf = 4;
+       if (opt_pid && opt_textdump) {
+               chan.attr.subbuf_size = 32768;
+               chan.attr.num_subbuf = 8;
+       } else {
+               chan.attr.subbuf_size = 1048576; /* 1MB */
+               chan.attr.num_subbuf = 4;
+       }
        chan.attr.switch_timer_interval = 0;
        chan.attr.read_timer_interval = 200;
        chan.attr.output = LTTNG_EVENT_MMAP;
@@ -924,12 +973,14 @@ int setup_live_tracing()
 
        memset(&ev, '\0', sizeof(struct lttng_event));
        //sprintf(ev.name, "sched_switch");
-       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;
-       }
+//     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_SYSCALL;
        if ((ret = lttng_enable_event(handle, &ev, channel_name)) < 0) {
@@ -940,16 +991,18 @@ int setup_live_tracing()
 
        kctxpid.ctx = LTTNG_EVENT_CONTEXT_PID;
        lttng_add_context(handle, &kctxpid, 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);
        kctxtid.ctx = LTTNG_EVENT_CONTEXT_TID;
        lttng_add_context(handle, &kctxtid, 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 (!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);
+//     }
 
        if ((ret = lttng_start_tracing("test")) < 0) {
                fprintf(stderr,"error starting tracing : %s\n",
@@ -987,6 +1040,10 @@ int main(int argc, char **argv)
        }
 
        if (!opt_input_path) {
+               if (opt_textdump) {
+                       signal(SIGTERM, handle_textdump_sigterm);
+                       signal(SIGINT, handle_textdump_sigterm);
+               }
                ret = setup_live_tracing();
                if (ret < 0) {
                        goto end;