SoW-2020-0003: Trace Hit Counters

[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..158f727f2e9423b272780b92a59044124ec335dd 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>
@@ -42,7 +42,7 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
        uint64_t key, chan_reg_key;
        char *pathname = NULL;
        struct lttcomm_consumer_msg msg;
-       struct ust_registry_channel *chan_reg;
+       struct ust_registry_channel *ust_reg_chan;
        char shm_path[PATH_MAX] = "";
        char root_shm_path[PATH_MAX] = "";
        bool is_local_trace;
@@ -105,9 +105,9 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
                 * those buffer files.
                 */
        } else {
-               chan_reg = ust_registry_channel_find(registry, chan_reg_key);
-               assert(chan_reg);
-               chan_id = chan_reg->chan_id;
+               ust_reg_chan = ust_registry_channel_find(registry, chan_reg_key);
+               assert(ust_reg_chan);
+               chan_id = ust_reg_chan->chan_id;
                if (ua_sess->shm_path[0]) {
                        strncpy(shm_path, ua_sess->shm_path, sizeof(shm_path));
                        shm_path[sizeof(shm_path) - 1] = '\0';
@@ -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,