X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libringbuffer%2Fring_buffer_backend.c;h=b65105f3a92afdfc8eceab615b73708bb045307e;hb=5e1b7b8bac9f038e681906b269c1422611c6376d;hp=7d3a37809e73da27b25d43d8914ed285545075f7;hpb=3d8e9399b2fb9000b3b55e488a7d04184b5bb56e;p=lttng-ust.git

diff --git a/libringbuffer/ring_buffer_backend.c b/libringbuffer/ring_buffer_backend.c
index 7d3a3780..b65105f3 100644
--- a/libringbuffer/ring_buffer_backend.c
+++ b/libringbuffer/ring_buffer_backend.c
@@ -115,7 +115,6 @@ int lib_ring_buffer_backend_allocate(const struct lttng_ust_lib_ring_buffer_conf
 			mmap_offset += subbuf_size;
 		}
 	}
-
 	return 0;
 
 free_array:
@@ -199,6 +198,7 @@ void channel_backend_reset(struct channel_backend *chanb)
  * @subbuf_size: size of sub-buffers (> PAGE_SIZE, power of 2)
  * @num_subbuf: number of sub-buffers (power of 2)
  * @lttng_ust_shm_handle: shared memory handle
+ * @stream_fds: stream file descriptors.
  *
  * Returns channel pointer if successful, %NULL otherwise.
  *
@@ -212,7 +212,8 @@ int channel_backend_init(struct channel_backend *chanb,
 			 const char *name,
 			 const struct lttng_ust_lib_ring_buffer_config *config,
 			 size_t subbuf_size, size_t num_subbuf,
-			 struct lttng_ust_shm_handle *handle)
+			 struct lttng_ust_shm_handle *handle,
+			 const int *stream_fds)
 {
 	struct channel *chan = caa_container_of(chanb, struct channel, backend);
 	unsigned int i;
@@ -287,7 +288,7 @@ int channel_backend_init(struct channel_backend *chanb,
 			struct shm_object *shmobj;
 
 			shmobj = shm_object_table_alloc(handle->table, shmsize,
-					SHM_OBJECT_SHM);
+					SHM_OBJECT_SHM, stream_fds[i]);
 			if (!shmobj)
 				goto end;
 			align_shm(shmobj, __alignof__(struct lttng_ust_lib_ring_buffer));
@@ -306,7 +307,7 @@ int channel_backend_init(struct channel_backend *chanb,
 		struct lttng_ust_lib_ring_buffer *buf;
 
 		shmobj = shm_object_table_alloc(handle->table, shmsize,
-					SHM_OBJECT_SHM);
+					SHM_OBJECT_SHM, stream_fds[0]);
 		if (!shmobj)
 			goto end;
 		align_shm(shmobj, __alignof__(struct lttng_ust_lib_ring_buffer));