X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libringbuffer%2Fshm.h;h=e4a466e5a2f0853c12644885f1b20f39c380eb7e;hb=c0c0989ab70574e09b2f7e8b48c2da6af664a849;hp=3d22a31305d1268d4ede5604415f236d589aa9b9;hpb=74d81a6cca2cd4a7718bba9368f382f9f2fbba84;p=lttng-ust.git

diff --git a/libringbuffer/shm.h b/libringbuffer/shm.h
index 3d22a313..e4a466e5 100644
--- a/libringbuffer/shm.h
+++ b/libringbuffer/shm.h
@@ -1,27 +1,15 @@
-#ifndef _LIBRINGBUFFER_SHM_H
-#define _LIBRINGBUFFER_SHM_H
-
 /*
- * libringbuffer/shm.h
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
  * Copyright (C) 2011-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef _LIBRINGBUFFER_SHM_H
+#define _LIBRINGBUFFER_SHM_H
+
+#include <stddef.h>
 #include <stdint.h>
+#include <unistd.h>
 #include <usterr-signal-safe.h>
 #include <urcu/compiler.h>
 #include "shm_types.h"
@@ -29,7 +17,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,
@@ -88,14 +76,16 @@ void _set_shmp(struct shm_ref *ref, struct shm_ref src)
 struct shm_object_table *shm_object_table_create(size_t max_nb_obj);
 struct shm_object *shm_object_table_alloc(struct shm_object_table *table,
 			size_t memory_map_size,
-			enum shm_object_type type);
+			enum shm_object_type type,
+			const int stream_fd,
+			int cpu);
 struct shm_object *shm_object_table_append_shm(struct shm_object_table *table,
 			int shm_fd, int wakeup_fd, uint32_t stream_nr,
 			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 shm_object_table_destroy(struct shm_object_table *table);
+			void *mem, size_t memory_map_size, int wakeup_fd);
+void shm_object_table_destroy(struct shm_object_table *table, int consumer);
 
 /*
  * zalloc_shm - allocate memory within a shm object.
@@ -141,6 +131,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 +139,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 +157,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 +165,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;
 }