X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libringbuffer%2Fshm_types.h;h=c1ad7b6872caa2a31de7bd4f8ddc1fbb0f519f28;hb=f574bfb4d81b26d3cfc0243868d138e33470a950;hp=8b01d803e8ad4c2189f8bf40dbbab0bf9188511a;hpb=9501d22f55b3a23f382f631c99b2325d1419b5da;p=lttng-ust.git

diff --git a/libringbuffer/shm_types.h b/libringbuffer/shm_types.h
index 8b01d803..c1ad7b68 100644
--- a/libringbuffer/shm_types.h
+++ b/libringbuffer/shm_types.h
@@ -1,39 +1,33 @@
-#ifndef _LIBRINGBUFFER_SHM_TYPES_H
-#define _LIBRINGBUFFER_SHM_TYPES_H
-
 /*
- * libringbuffer/shm_types.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_TYPES_H
+#define _LIBRINGBUFFER_SHM_TYPES_H
+
 #include <stdint.h>
+#include <stddef.h>
+#include <limits.h>
 #include "shm_internal.h"
 
-struct channel;
+struct lttng_ust_lib_ring_buffer_channel;
+
+enum shm_object_type {
+	SHM_OBJECT_SHM,
+	SHM_OBJECT_MEM,
+};
 
 struct shm_object {
+	enum shm_object_type type;
 	size_t index;	/* within the object table */
 	int shm_fd;	/* shm fd */
 	int wait_fd[2];	/* fd for wait/wakeup */
 	char *memory_map;
-	int is_shadow;
 	size_t memory_map_size;
 	uint64_t allocated_len;
+	int shm_fd_ownership;
 };
 
 struct shm_object_table {
@@ -44,13 +38,7 @@ struct shm_object_table {
 
 struct lttng_ust_shm_handle {
 	struct shm_object_table *table;
-	DECLARE_SHMP(struct channel, chan);
-	/*
-	 * In the consumer, chan points to a shadow copy, validated upon
-	 * reception. The chan object is overridden in the consumer to
-	 * point to this shadow copy.
-	 */
-	struct channel *shadow_chan;
+	DECLARE_SHMP(struct lttng_ust_lib_ring_buffer_channel, chan);
 };
 
 #endif /* _LIBRINGBUFFER_SHM_TYPES_H */