X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=libringbuffer%2Fshm.h;h=8d9d1136469d580c6cec5f1c37af639ce73ef6e0;hb=refs%2Fheads%2Fstable-2.5;hp=3d22a31305d1268d4ede5604415f236d589aa9b9;hpb=74d81a6cca2cd4a7718bba9368f382f9f2fbba84;p=lttng-ust.git

diff --git a/libringbuffer/shm.h b/libringbuffer/shm.h
index 3d22a313..8d9d1136 100644
--- a/libringbuffer/shm.h
+++ b/libringbuffer/shm.h
@@ -29,7 +29,7 @@
 /* channel_handle_create - for UST. */
 extern
 struct lttng_ust_shm_handle *channel_handle_create(void *data,
-				uint64_t memory_map_size);
+				uint64_t memory_map_size, int wakeup_fd);
 /* channel_handle_add_stream - for UST. */
 extern
 int channel_handle_add_stream(struct lttng_ust_shm_handle *handle,
@@ -94,7 +94,7 @@ struct shm_object *shm_object_table_append_shm(struct shm_object_table *table,
 			size_t memory_map_size);
 /* mem ownership is passed to shm_object_table_append_mem(). */
 struct shm_object *shm_object_table_append_mem(struct shm_object_table *table,
-			void *mem, size_t memory_map_size);
+			void *mem, size_t memory_map_size, int wakeup_fd);
 void shm_object_table_destroy(struct shm_object_table *table);
 
 /*
@@ -141,6 +141,7 @@ int shm_close_wait_fd(struct lttng_ust_shm_handle *handle,
 {
 	struct shm_object_table *table = handle->table;
 	struct shm_object *obj;
+	int wait_fd;
 	size_t index;
 	int ret;
 
@@ -148,14 +149,15 @@ int shm_close_wait_fd(struct lttng_ust_shm_handle *handle,
 	if (caa_unlikely(index >= table->allocated_len))
 		return -EPERM;
 	obj = &table->objects[index];
-	if (obj->wait_fd[0] < 0)
+	wait_fd = obj->wait_fd[0];
+	if (wait_fd < 0)
 		return -ENOENT;
-	ret = close(obj->wait_fd[0]);
+	obj->wait_fd[0] = -1;
+	ret = close(wait_fd);
 	if (ret) {
 		ret = -errno;
 		return ret;
 	}
-	obj->wait_fd[0] = -1;
 	return 0;
 }
 
@@ -165,6 +167,7 @@ int shm_close_wakeup_fd(struct lttng_ust_shm_handle *handle,
 {
 	struct shm_object_table *table = handle->table;
 	struct shm_object *obj;
+	int wakeup_fd;
 	size_t index;
 	int ret;
 
@@ -172,14 +175,15 @@ int shm_close_wakeup_fd(struct lttng_ust_shm_handle *handle,
 	if (caa_unlikely(index >= table->allocated_len))
 		return -EPERM;
 	obj = &table->objects[index];
-	if (obj->wait_fd[1] < 0)
+	wakeup_fd = obj->wait_fd[1];
+	if (wakeup_fd < 0)
 		return -ENOENT;
-	ret = close(obj->wait_fd[1]);
+	obj->wait_fd[1] = -1;
+	ret = close(wakeup_fd);
 	if (ret) {
 		ret = -errno;
 		return ret;
 	}
-	obj->wait_fd[1] = -1;
 	return 0;
 }