Close stream and channel file descriptors as soon as passed to sessiond

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

diff --git a/libringbuffer/shm.h b/libringbuffer/shm.h
index 4111144776722072ee60800f6d5764b7bdef7a28..104eece6e6d1e4f4f3dc3943b9ce48fc84c28626 100644 (file)
--- a/libringbuffer/shm.h
+++ b/libringbuffer/shm.h
@@ -107,7 +107,7 @@ int shm_get_wait_fd(struct lttng_ust_shm_handle *handle, struct shm_ref *ref)
 
 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;
@@ -117,9 +117,9 @@ int shm_get_object_data(struct lttng_ust_shm_handle *handle, struct shm_ref *ref
        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;
 }