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

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

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index 10c8f4e62c5c343984260a72a9e29b6b9b3976e7..68b6cac6c9e459a3b1aaed8434930e3e1287a62c 100644 (file)
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -1560,15 +1560,15 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
                switch (msg.u.ask_channel.output) {
                case LTTNG_EVENT_MMAP:
                default:
-                       attr.output = LTTNG_UST_MMAP;
+                       attr.output = LTTNG_UST_ABI_MMAP;
                        break;
                }
 
                /* Translate and save channel type. */
                switch (msg.u.ask_channel.type) {
-               case LTTNG_UST_CHAN_PER_CPU:
+               case LTTNG_UST_ABI_CHAN_PER_CPU:
                        channel->type = CONSUMER_CHANNEL_TYPE_DATA;
-                       attr.type = LTTNG_UST_CHAN_PER_CPU;
+                       attr.type = LTTNG_UST_ABI_CHAN_PER_CPU;
                        /*
                         * Set refcount to 1 for owner. Below, we will
                         * pass ownership to the
@@ -1576,9 +1576,9 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
                         */
                        channel->refcount = 1;
                        break;
-               case LTTNG_UST_CHAN_METADATA:
+               case LTTNG_UST_ABI_CHAN_METADATA:
                        channel->type = CONSUMER_CHANNEL_TYPE_METADATA;
-                       attr.type = LTTNG_UST_CHAN_METADATA;
+                       attr.type = LTTNG_UST_ABI_CHAN_METADATA;
                        break;
                default:
                        assert(0);
@@ -1592,7 +1592,7 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
                        goto end_channel_error;
                }
 
-               if (msg.u.ask_channel.type == LTTNG_UST_CHAN_METADATA) {
+               if (msg.u.ask_channel.type == LTTNG_UST_ABI_CHAN_METADATA) {
                        ret = consumer_metadata_cache_allocate(channel);
                        if (ret < 0) {
                                ERR("Allocating metadata cache");
@@ -1625,7 +1625,7 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
                 */
                ret = add_channel(channel, ctx);
                if (ret < 0) {
-                       if (msg.u.ask_channel.type == LTTNG_UST_CHAN_METADATA) {
+                       if (msg.u.ask_channel.type == LTTNG_UST_ABI_CHAN_METADATA) {
                                if (channel->switch_timer_enabled == 1) {
                                        consumer_timer_switch_stop(channel);
                                }
@@ -2522,8 +2522,8 @@ int commit_one_metadata_packet(struct lttng_consumer_stream *stream)
        int ret;
 
        pthread_mutex_lock(&stream->chan->metadata_cache->lock);
-       if (stream->chan->metadata_cache->max_offset ==
-           stream->ust_metadata_pushed) {
+       if (stream->chan->metadata_cache->contents.size ==
+                       stream->ust_metadata_pushed) {
                /*
                 * In the context of a user space metadata channel, a
                 * change in version can be detected in two ways:
@@ -2560,9 +2560,9 @@ int commit_one_metadata_packet(struct lttng_consumer_stream *stream)
        }
 
        write_len = ustctl_write_one_packet_to_channel(stream->chan->uchan,
-                       &stream->chan->metadata_cache->data[stream->ust_metadata_pushed],
-                       stream->chan->metadata_cache->max_offset
-                       - stream->ust_metadata_pushed);
+                       &stream->chan->metadata_cache->contents.data[stream->ust_metadata_pushed],
+                       stream->chan->metadata_cache->contents.size -
+                                       stream->ust_metadata_pushed);
        assert(write_len != 0);
        if (write_len < 0) {
                ERR("Writing one metadata packet");
@@ -2571,7 +2571,7 @@ int commit_one_metadata_packet(struct lttng_consumer_stream *stream)
        }
        stream->ust_metadata_pushed += write_len;
 
-       assert(stream->chan->metadata_cache->max_offset >=
+       assert(stream->chan->metadata_cache->contents.size >=
                        stream->ust_metadata_pushed);
        ret = write_len;
 
@@ -2939,8 +2939,8 @@ static int get_next_subbuffer_metadata(struct lttng_consumer_stream *stream,
                        }
                } else {
                        pthread_mutex_lock(&stream->chan->metadata_cache->lock);
-                       cache_empty = stream->chan->metadata_cache->max_offset ==
-                                     stream->ust_metadata_pushed;
+                       cache_empty = stream->chan->metadata_cache->contents.size ==
+                                       stream->ust_metadata_pushed;
                        pthread_mutex_unlock(&stream->chan->metadata_cache->lock);
                }
        } while (!got_subbuffer);
@@ -3101,7 +3101,7 @@ int lttng_ustconsumer_data_pending(struct lttng_consumer_stream *stream)
 
                /* Ease our life a bit. */
                pthread_mutex_lock(&stream->chan->metadata_cache->lock);
-               contiguous = stream->chan->metadata_cache->max_offset;
+               contiguous = stream->chan->metadata_cache->contents.size;
                pthread_mutex_unlock(&stream->chan->metadata_cache->lock);
                pushed = stream->ust_metadata_pushed;