add 2 perf counters automatically

[lttngtop.git] / src / lttngtop.c

diff --git a/src/lttngtop.c b/src/lttngtop.c
index 69a05e15854853fd84fe63bed9d253b519ca5488..1378d6674294f6cb994ed7094ac78a2a4ace24e0 100644 (file)
--- a/src/lttngtop.c
+++ b/src/lttngtop.c
@@ -162,6 +162,7 @@ void print_fields(struct bt_ctf_event *event)
 {
        unsigned int cnt, i;
        const struct definition *const * list;
+       const struct declaration *l;
        const struct definition *scope;
        enum ctf_type_id type;
        const char *str;
@@ -173,9 +174,10 @@ void print_fields(struct bt_ctf_event *event)
                if (i != 0)
                        printf(", ");
                printf("%s = ", bt_ctf_field_name(list[i]));
-               type = bt_ctf_field_type(list[i]);
+               l = bt_ctf_get_decl_from_def(list[i]);
+               type = bt_ctf_field_type(l);
                if (type == CTF_TYPE_INTEGER) {
-                       if (bt_ctf_get_int_signedness(list[i]) == 0)
+                       if (bt_ctf_get_int_signedness(l) == 0)
                                printf("%" PRIu64 "", bt_ctf_get_uint64(list[i]));
                        else
                                printf("%" PRId64 "", bt_ctf_get_int64(list[i]));
@@ -985,7 +987,7 @@ ssize_t read_subbuffer(struct lttng_consumer_stream *kconsumerd_fd,
                }
 
                /* splice the subbuffer to the tracefile */
-               ret = helper_lttng_consumer_on_read_subbuffer_splice(ctx, kconsumerd_fd, len);
+               ret = helper_lttng_consumer_on_read_subbuffer_splice(ctx, kconsumerd_fd, len, 0);
                if (ret < 0) {
                        /*
                         * display the error but continue processing to try
@@ -1091,14 +1093,14 @@ int setup_consumer(char *command_sock_path, pthread_t *threads,
        helper_lttng_consumer_init();
 
        /* Create the thread to manage the receive of fd */
-       ret = pthread_create(&threads[0], NULL, helper_lttng_consumer_thread_receive_fds,
+       ret = pthread_create(&threads[0], NULL, helper_lttng_consumer_thread_sessiond_poll,
                        (void *) ctx);
        if (ret != 0) {
                perror("pthread_create receive fd");
                goto end;
        }
        /* Create thread to manage the polling/writing of traces */
-       ret = pthread_create(&threads[1], NULL, helper_lttng_consumer_thread_poll_fds,
+       ret = pthread_create(&threads[1], NULL, helper_lttng_consumer_thread_metadata_poll,
                        (void *) ctx);
        if (ret != 0) {
                perror("pthread_create poll fd");
@@ -1146,7 +1148,8 @@ int setup_live_tracing()
        int ret = 0;
        char *command_sock_path = "/tmp/consumerd_sock";
        static pthread_t threads[2]; /* recv_fd, poll */
-       struct lttng_event_context kctxpid, kctxcomm, kctxppid, kctxtid;
+       struct lttng_event_context kctxpid, kctxcomm, kctxppid, kctxtid,
+                                  kctxperf1, kctxperf2;
 
        struct lttng_handle *handle;
 
@@ -1215,10 +1218,32 @@ int setup_live_tracing()
        }
 
        memset(&ev, '\0', sizeof(struct lttng_event));
-       //sprintf(ev.name, "sched_switch");
        ev.type = LTTNG_EVENT_TRACEPOINT;
+       sprintf(ev.name, "sched_switch");
        if ((ret = lttng_enable_event(handle, &ev, channel_name)) < 0) {
-               fprintf(stderr,"error enabling event : %s\n",
+               fprintf(stderr,"error enabling event %s : %s\n",
+                               ev.name,
+                               helper_lttcomm_get_readable_code(ret));
+               goto error_session;
+       }
+       sprintf(ev.name, "sched_process_free");
+       if ((ret = lttng_enable_event(handle, &ev, channel_name)) < 0) {
+               fprintf(stderr,"error enabling event %s : %s\n",
+                               ev.name,
+                               helper_lttcomm_get_readable_code(ret));
+               goto error_session;
+       }
+       sprintf(ev.name, "lttng_statedump_process_state");
+       if ((ret = lttng_enable_event(handle, &ev, channel_name)) < 0) {
+               fprintf(stderr,"error enabling event %s : %s\n",
+                               ev.name,
+                               helper_lttcomm_get_readable_code(ret));
+               goto error_session;
+       }
+       sprintf(ev.name, "lttng_statedump_file_descriptor");
+       if ((ret = lttng_enable_event(handle, &ev, channel_name)) < 0) {
+               fprintf(stderr,"error enabling event %s : %s\n",
+                               ev.name,
                                helper_lttcomm_get_readable_code(ret));
                goto error_session;
        }
@@ -1238,6 +1263,26 @@ int setup_live_tracing()
                }
        }
 
+       kctxperf1.ctx = LTTNG_EVENT_CONTEXT_PERF_COUNTER;
+       kctxperf1.u.perf_counter.type = 0; /* PERF_TYPE_HARDWARE */
+       kctxperf1.u.perf_counter.config = 5; /* PERF_COUNT_HW_BRANCH_MISSES */
+       sprintf(kctxperf1.u.perf_counter.name, "perf_branch_misses");
+       ret = lttng_add_context(handle, &kctxperf1, NULL, NULL);
+       if (ret < 0) {
+               fprintf(stderr, "error enabling context %s\n",
+                               kctxtid.u.perf_counter.name);
+       }
+
+       kctxperf2.ctx = LTTNG_EVENT_CONTEXT_PERF_COUNTER;
+       kctxperf2.u.perf_counter.type = 1; /* PERF_TYPE_SOFTWARE */
+       kctxperf2.u.perf_counter.config = 6; /* PERF_COUNT_SW_PAGE_FAULTS_MAJ */
+       sprintf(kctxperf2.u.perf_counter.name, "perf_major_faults");
+       ret = lttng_add_context(handle, &kctxperf2, NULL, NULL);
+       if (ret < 0) {
+               fprintf(stderr, "error enabling context %s\n",
+                               kctxtid.u.perf_counter.name);
+       }
+
        kctxpid.ctx = LTTNG_EVENT_CONTEXT_PID;
        lttng_add_context(handle, &kctxpid, NULL, NULL);
        kctxtid.ctx = LTTNG_EVENT_CONTEXT_TID;
@@ -1253,6 +1298,7 @@ int setup_live_tracing()
        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",
                                helper_lttcomm_get_readable_code(ret));
@@ -1305,10 +1351,20 @@ int main(int argc, char **argv)
                while (!quit) {
                        reload_trace = 0;
                        live_consume(&bt_ctx);
+                       ret = check_requirements(bt_ctx);
+                       if (ret < 0) {
+                               fprintf(stderr, "[error] some mandatory contexts were missing, exiting.\n");
+                               goto end;
+                       }
                        iter_trace(bt_ctx);
+                       /*
+                        * FIXME : pb with cleanup in libbabeltrace
                        ret = bt_context_remove_trace(bt_ctx, 0);
-                       if (ret != 0)
+                       if (ret != 0) {
                                fprintf(stderr, "error removing trace\n");
+                               goto error;
+                       }
+                       */
                        if (bt_ctx) {
                                bt_context_put(bt_ctx);
                        }
@@ -1367,4 +1423,7 @@ end:
                bt_context_put(bt_ctx);
 
        return 0;
+
+error:
+       return -1;
 }