X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libringbuffer%2Fshm.h;h=4111144776722072ee60800f6d5764b7bdef7a28;hb=44c72f10aa3cace72ffe40a0f9bb7aadb9c82dc8;hp=45b6473d6fb0e9cee2a8e4c551e4d421912b020c;hpb=193183fb924aef705f30358e54e7386a3a64c78d;p=lttng-ust.git

diff --git a/libringbuffer/shm.h b/libringbuffer/shm.h
index 45b6473d..41111447 100644
--- a/libringbuffer/shm.h
+++ b/libringbuffer/shm.h
@@ -10,8 +10,8 @@
  */
 
 #include <stdint.h>
-#include <ust/usterr-signal-safe.h>
-#include "ust/core.h"
+#include <usterr-signal-safe.h>
+#include <urcu/compiler.h>
 #include "shm_types.h"
 
 /*
@@ -31,13 +31,13 @@ char *_shmp_offset(struct shm_object_table *table, struct shm_ref *ref,
 	size_t objindex, ref_offset;
 
 	objindex = (size_t) ref->index;
-	if (unlikely(objindex >= table->allocated_len))
+	if (caa_unlikely(objindex >= table->allocated_len))
 		return NULL;
 	obj = &table->objects[objindex];
 	ref_offset = (size_t) ref->offset;
 	ref_offset += idx * elem_size;
 	/* Check if part of the element returned would exceed the limits. */
-	if (unlikely(ref_offset + elem_size > obj->memory_map_size))
+	if (caa_unlikely(ref_offset + elem_size > obj->memory_map_size))
 		return NULL;
 	return &obj->memory_map[ref_offset];
 }
@@ -77,14 +77,14 @@ struct shm_ref zalloc_shm(struct shm_object *obj, size_t len);
 void align_shm(struct shm_object *obj, size_t align);
 
 static inline
-int shm_get_wakeup_fd(struct shm_handle *handle, struct shm_ref *ref)
+int shm_get_wakeup_fd(struct lttng_ust_shm_handle *handle, struct shm_ref *ref)
 {
 	struct shm_object_table *table = handle->table;
 	struct shm_object *obj;
 	size_t index;
 
 	index = (size_t) ref->index;
-	if (unlikely(index >= table->allocated_len))
+	if (caa_unlikely(index >= table->allocated_len))
 		return -EPERM;
 	obj = &table->objects[index];
 	return obj->wait_fd[1];
@@ -92,21 +92,21 @@ int shm_get_wakeup_fd(struct shm_handle *handle, struct shm_ref *ref)
 }
 
 static inline
-int shm_get_wait_fd(struct shm_handle *handle, struct shm_ref *ref)
+int shm_get_wait_fd(struct lttng_ust_shm_handle *handle, struct shm_ref *ref)
 {
 	struct shm_object_table *table = handle->table;
 	struct shm_object *obj;
 	size_t index;
 
 	index = (size_t) ref->index;
-	if (unlikely(index >= table->allocated_len))
+	if (caa_unlikely(index >= table->allocated_len))
 		return -EPERM;
 	obj = &table->objects[index];
 	return obj->wait_fd[0];
 }
 
 static inline
-int shm_get_object_data(struct shm_handle *handle, struct shm_ref *ref,
+int shm_get_object_data(struct lttng_ust_shm_handle *handle, struct shm_ref *ref,
 		int *shm_fd, int *wait_fd, uint64_t *memory_map_size)
 {
 	struct shm_object_table *table = handle->table;
@@ -114,7 +114,7 @@ int shm_get_object_data(struct shm_handle *handle, struct shm_ref *ref,
 	size_t index;
 
 	index = (size_t) ref->index;
-	if (unlikely(index >= table->allocated_len))
+	if (caa_unlikely(index >= table->allocated_len))
 		return -EPERM;
 	obj = &table->objects[index];
 	*shm_fd = obj->shm_fd;