*/
#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"
/*
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];
}
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];
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 lttng_ust_shm_handle *handle, struct shm_ref *ref,
- int *shm_fd, int *wait_fd, uint64_t *memory_map_size)
+ int **shm_fd, int **wait_fd, uint64_t **memory_map_size)
{
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];
- *shm_fd = obj->shm_fd;
- *wait_fd = obj->wait_fd[0];
- *memory_map_size = obj->allocated_len;
+ *shm_fd = &obj->shm_fd;
+ *wait_fd = &obj->wait_fd[0];
+ *memory_map_size = &obj->allocated_len;
return 0;
}