X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.c;h=84fdbcaaa6902e076476489c3ab4e6b1aa7a1c9a;hp=e3a873a0f3c8f44b4a0f687cce2d099407b532b9;hb=1cbd136b2479ef142bfb339b13d3d25aa772dda5;hpb=8cc65d5cbccb6e4ba91c4de0efc3e974a6ca61b5;ds=sidebyside diff --git a/src/common/consumer/consumer.c b/src/common/consumer/consumer.c index e3a873a0f..84fdbcaaa 100644 --- a/src/common/consumer/consumer.c +++ b/src/common/consumer/consumer.c @@ -3950,7 +3950,7 @@ unsigned long consumer_get_consume_start_pos(unsigned long consumed_pos, if (!nb_packets_per_stream) { return consumed_pos; /* Grab everything */ } - start_pos = produced_pos - offset_align_floor(produced_pos, max_sb_size); + start_pos = produced_pos - lttng_offset_align_floor(produced_pos, max_sb_size); start_pos -= max_sb_size * nb_packets_per_stream; if ((long) (start_pos - consumed_pos) < 0) { return consumed_pos; /* Grab everything */ @@ -4171,7 +4171,7 @@ int lttng_consumer_rotate_channel(struct lttng_consumer_channel *channel, * Align produced position on the start-of-packet boundary of the first * packet going into the next trace chunk. */ - produced_pos = ALIGN_FLOOR(produced_pos, stream->max_sb_size); + produced_pos = lttng_align_floor(produced_pos, stream->max_sb_size); if (consumed_pos == produced_pos) { DBG("Set rotate ready for stream %" PRIu64 " produced = %lu consumed = %lu", stream->key, produced_pos, consumed_pos);