shm: introduce shmp_index

[lttng-ust.git] / libringbuffer / shm.h

diff --git a/libringbuffer/shm.h b/libringbuffer/shm.h
index d370375b6929cf913ed568e3e665ead996f515ec..f5cc8e69a2b7a62faf9f614dec2489f99ccee96d 100644 (file)
--- a/libringbuffer/shm.h
+++ b/libringbuffer/shm.h
@@ -14,37 +14,37 @@
 #include "ust/core.h"
 #include "shm_types.h"
 
-#define SHM_MAGIC      0x54335433
-#define SHM_MAJOR      0
-#define SHM_MINOR      1
-
 /*
  * Pointer dereferencing. We don't trust the shm_ref, so we validate
  * both the index and offset with known boundaries.
  */
 static inline
-char *_shmp(struct shm_object_table *table, struct shm_ref *ref)
+char *_shmp_offset(struct shm_object_table *table, struct shm_ref *ref,
+                  size_t offset)
 {
        struct shm_object *obj;
-       size_t index, offset;
+       size_t index, ref_offset;
 
        index = (size_t) ref->index;
        if (unlikely(index >= table->allocated_len))
                return NULL;
        obj = &table->objects[index];
-       offset = (size_t) ref->offset;
-       if (unlikely(offset >= obj->memory_map_size))
+       ref_offset = (size_t) ref->offset;
+       ref_offset += offset;
+       if (unlikely(ref_offset >= obj->memory_map_size))
                return NULL;
-       return &obj->memory_map[offset];
+       return &obj->memory_map[ref_offset];
 }
 
-#define shmp(handle, ref)                                              \
+#define shmp_index(handle, ref, offset)                                        \
        ({                                                              \
                __typeof__((ref)._type) ____ptr_ret;                    \
-               ____ptr_ret = (__typeof__(____ptr_ret)) _shmp((handle)->table, &(ref)._ref);    \
+               ____ptr_ret = (__typeof__(____ptr_ret)) _shmp_offset((handle)->table, &(ref)._ref, ((offset) * sizeof(*____ptr_ret)));  \
                ____ptr_ret;                                            \
        })
 
+#define shmp(handle, ref)      shmp_index(handle, ref, 0)
+
 static inline
 void _set_shmp(struct shm_ref *ref, struct shm_ref src)
 {
@@ -68,4 +68,33 @@ struct shm_object *shm_object_table_append(struct shm_object_table *table,
 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)
+{
+       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))
+               return -EPERM;
+       obj = &table->objects[index];
+       return obj->wait_fd[1];
+
+}
+
+static inline
+int shm_get_wait_fd(struct 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))
+               return -EPERM;
+       obj = &table->objects[index];
+       return obj->wait_fd[0];
+}
+
 #endif /* _LIBRINGBUFFER_SHM_H */