X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=libust%2Fltt-ring-buffer-client.h;h=a1bc8c32d1a43a8314bb6ec4cf3248b55c60c05b;hb=f3049ad9e7b72287888452b9ed542c0f36e6eefe;hp=6361b9edeb912e0a8f543483e6c67e30d527328c;hpb=4cfec15c93af7e0cfe3ce769ee90486bb8ab7c37;p=lttng-ust.git

diff --git a/libust/ltt-ring-buffer-client.h b/libust/ltt-ring-buffer-client.h
index 6361b9ed..a1bc8c32 100644
--- a/libust/ltt-ring-buffer-client.h
+++ b/libust/ltt-ring-buffer-client.h
@@ -9,9 +9,9 @@
  */
 
 #include <stdint.h>
-#include <ust/lttng-events.h>
-#include "ust/bitfield.h"
-#include "ust/clock.h"
+#include <lttng/ust-events.h>
+#include "lttng/bitfield.h"
+#include "lttng/clock.h"
 #include "ltt-tracer.h"
 #include "../libringbuffer/frontend_types.h"
 
@@ -59,7 +59,7 @@ size_t ctx_get_size(size_t offset, struct lttng_ctx *ctx)
 	int i;
 	size_t orig_offset = offset;
 
-	if (likely(!ctx))
+	if (caa_likely(!ctx))
 		return 0;
 	for (i = 0; i < ctx->nr_fields; i++)
 		offset += ctx->fields[i].get_size(offset);
@@ -73,7 +73,7 @@ void ctx_record(struct lttng_ust_lib_ring_buffer_ctx *bufctx,
 {
 	int i;
 
-	if (likely(!ctx))
+	if (caa_likely(!ctx))
 		return;
 	for (i = 0; i < ctx->nr_fields; i++)
 		ctx->fields[i].record(&ctx->fields[i], bufctx, chan);
@@ -169,7 +169,7 @@ void ltt_write_event_header(const struct lttng_ust_lib_ring_buffer_config *confi
 	struct ltt_channel *ltt_chan = channel_get_private(ctx->chan);
 	struct ltt_event *event = ctx->priv;
 
-	if (unlikely(ctx->rflags))
+	if (caa_unlikely(ctx->rflags))
 		goto slow_path;
 
 	switch (ltt_chan->header_type) {