sync with babeltrace api changes

[lttngtop.git] / src / lttngtop.c

diff --git a/src/lttngtop.c b/src/lttngtop.c
index 1e1b42748070de8b896c59f2925e2d3c01c0c220..1378d6674294f6cb994ed7094ac78a2a4ace24e0 100644 (file)
--- a/src/lttngtop.c
+++ b/src/lttngtop.c
@@ -349,12 +349,12 @@ void update_perf_value(struct processtop *proc, struct cputime *cpu,
 }
 
 void extract_perf_counter_scope(const struct bt_ctf_event *event,
-               const struct definition *scope,
+               const struct bt_definition *scope,
                struct processtop *proc,
                struct cputime *cpu)
 {
-       struct definition const * const *list = NULL;
-       const struct definition *field;
+       struct bt_definition const * const *list = NULL;
+       const struct bt_definition *field;
        unsigned int count;
        struct perfcounter *perfcounter;
        GHashTableIter iter;
@@ -389,7 +389,7 @@ end:
 void update_perf_counter(struct processtop *proc, const struct bt_ctf_event *event)
 {
        struct cputime *cpu;
-       const struct definition *scope;
+       const struct bt_definition *scope;
 
        cpu = get_cpu(get_cpu_id(event));
 
@@ -779,7 +779,7 @@ end_iter:
  */
 int bt_context_add_traces_recursive(struct bt_context *ctx, const char *path,
                const char *format_str,
-               void (*packet_seek)(struct stream_pos *pos,
+               void (*packet_seek)(struct bt_stream_pos *pos,
                        size_t offset, int whence))
 {
        FTS *tree;
@@ -872,7 +872,7 @@ static int check_field_requirements(const struct bt_ctf_field_decl *const * fiel
                                (*tid_check)++;
                }
                if (*pid_check == 0) {
-                       if (strncmp(name, "tid", 3) == 0)
+                       if (strncmp(name, "pid", 3) == 0)
                                (*pid_check)++;
                }
                if (*ppid_check == 0) {
@@ -1148,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;
 
@@ -1262,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;
@@ -1277,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));
@@ -1329,6 +1351,11 @@ 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