X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libringbuffer%2Fshm.h;h=3a61a39d5e1d86a77d1df100017fe12b7a737ff1;hb=616d3093e1c34557aca7e9f6149338f43cf91886;hp=8987f72a30f3dc234cf2ca9d7b777c86b6197cf3;hpb=e92f3e285939848f248af08f11a39a04a7fcf852;p=lttng-ust.git

diff --git a/libringbuffer/shm.h b/libringbuffer/shm.h
index 8987f72a..3a61a39d 100644
--- a/libringbuffer/shm.h
+++ b/libringbuffer/shm.h
@@ -25,6 +25,7 @@
 #include <usterr-signal-safe.h>
 #include <urcu/compiler.h>
 #include "shm_types.h"
+#include <fcntl.h>
 
 /*
  * Pointer dereferencing. We don't trust the shm_ref, so we validate
@@ -99,8 +100,37 @@ int shm_get_wakeup_fd(struct lttng_ust_shm_handle *handle, struct shm_ref *ref)
 	if (caa_unlikely(index >= table->allocated_len))
 		return -EPERM;
 	obj = &table->objects[index];
+
 	return obj->wait_fd[1];
+}
+
+static inline
+int shm_open_wakeup_pipe(struct lttng_ust_shm_handle *handle, struct shm_ref *ref)
+{
+	struct shm_object_table *table = handle->table;
+	struct shm_object *obj;
+	size_t index;
+	int fd, ret = -1;
+
+	index = (size_t) ref->index;
+	if (caa_unlikely(index >= table->allocated_len))
+		return -EPERM;
+
+	obj = &table->objects[index];
 
+	if (obj->wait_fd[1] < 0 && obj->wait_pipe_path != NULL) {
+		fd = open(obj->wait_pipe_path, O_WRONLY);
+		if (fd < 0) {
+			ret = -1;
+		} else {
+			/* FIXME: What if fcntl fail? */
+			fcntl(fd, F_SETFD, FD_CLOEXEC);
+			obj->wait_fd[1] = fd;
+			ret = 0;
+		}
+	}
+
+	return ret;
 }
 
 static inline
@@ -119,7 +149,9 @@ 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, char **shm_path,
+			int **wait_fd, char **wait_pipe_path,
+			uint64_t **memory_map_size)
 {
 	struct shm_object_table *table = handle->table;
 	struct shm_object *obj;
@@ -129,8 +161,10 @@ 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];
+	*shm_fd   = &obj->shm_fd;
+	*shm_path = obj->shm_path;
+	*wait_fd        = &obj->wait_fd[0];
+	*wait_pipe_path = obj->wait_pipe_path;
 	*memory_map_size = &obj->allocated_len;
 	return 0;
 }