Adapt to lttng-ust ust-abi.h naming prefix update

[lttng-tools.git] / src / bin / lttng-sessiond / ust-consumer.c

diff --git a/src/bin/lttng-sessiond/ust-consumer.c b/src/bin/lttng-sessiond/ust-consumer.c
index 25dc7ed1c6da96c5fa8cfba14e95d78dab0e9ac1..35c60f8ed9344aa874f16e6b93b9660689fe64c8 100644 (file)
--- a/src/bin/lttng-sessiond/ust-consumer.c
+++ b/src/bin/lttng-sessiond/ust-consumer.c
@@ -6,13 +6,13 @@
  */
 
 #define _LGPL_SOURCE
-#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <inttypes.h>
 
+#include <common/compat/errno.h>
 #include <common/common.h>
 #include <common/consumer/consumer.h>
 #include <common/defaults.h>
@@ -97,7 +97,7 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
                chan_reg_key = ua_chan->key;
        }
 
-       if (ua_chan->attr.type == LTTNG_UST_CHAN_METADATA) {
+       if (ua_chan->attr.type == LTTNG_UST_ABI_CHAN_METADATA) {
                chan_id = -1U;
                /*
                 * Metadata channels shm_path (buffers) are handled within
@@ -123,7 +123,7 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
        }
 
        switch (ua_chan->attr.output) {
-       case LTTNG_UST_MMAP:
+       case LTTNG_UST_ABI_MMAP:
        default:
                output = LTTNG_EVENT_MMAP;
                break;
@@ -151,7 +151,7 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
                        ua_chan->tracefile_count,
                        ua_sess->id,
                        ua_sess->output_traces,
-                       ua_sess->real_credentials.uid,
+                       lttng_credentials_get_uid(&ua_sess->real_credentials),
                        ua_chan->attr.blocking_timeout,
                        root_shm_path, shm_path,
                        trace_chunk,