Fix: consumer data pending for empty streams

[lttng-tools.git] / src / common / consumer.h

diff --git a/src/common/consumer.h b/src/common/consumer.h
index 5021a103569ea28d18bcd9d071f2781704da078b..91f6b5ca15a6ddbdcbc8f28e641f824e34a4c64d 100644 (file)
--- a/src/common/consumer.h
+++ b/src/common/consumer.h
@@ -115,7 +115,7 @@ struct lttng_consumer_channel {
        char pathname[PATH_MAX];
        /* Channel name. */
        char name[LTTNG_SYMBOL_NAME_LEN];
-       /* UID and GID of the channel. */
+       /* UID and GID of the session owning this channel. */
        uid_t uid;
        gid_t gid;
        /* Relayd id of the channel. -1ULL if it does not apply. */
@@ -131,6 +131,7 @@ struct lttng_consumer_channel {
        enum consumer_channel_type type;
 
        /* For UST */
+       uid_t ust_app_uid;      /* Application UID. */
        struct ustctl_consumer_channel *uchan;
        unsigned char uuid[UUID_STR_LEN];
        /*
@@ -220,6 +221,8 @@ struct lttng_consumer_stream {
        int out_fd; /* output file to write the data */
        /* Write position in the output file descriptor */
        off_t out_fd_offset;
+       /* Amount of bytes written to the output */
+       uint64_t output_written;
        enum lttng_consumer_stream_state state;
        int shm_fd_is_copy;
        int data_read;