X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libringbuffer%2Fshm_types.h;h=c1ad7b6872caa2a31de7bd4f8ddc1fbb0f519f28;hb=9f5ade14faf36df6429d9c6e1d0360854a5669d0;hp=ba7f4b2339d055f2ff13aed7e8f0c139c2267843;hpb=74d81a6cca2cd4a7718bba9368f382f9f2fbba84;p=lttng-ust.git

diff --git a/libringbuffer/shm_types.h b/libringbuffer/shm_types.h
index ba7f4b23..c1ad7b68 100644
--- a/libringbuffer/shm_types.h
+++ b/libringbuffer/shm_types.h
@@ -1,30 +1,18 @@
-#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,
@@ -39,6 +27,7 @@ struct shm_object {
 	char *memory_map;
 	size_t memory_map_size;
 	uint64_t allocated_len;
+	int shm_fd_ownership;
 };
 
 struct shm_object_table {
@@ -49,7 +38,7 @@ struct shm_object_table {
 
 struct lttng_ust_shm_handle {
 	struct shm_object_table *table;
-	DECLARE_SHMP(struct channel, chan);
+	DECLARE_SHMP(struct lttng_ust_lib_ring_buffer_channel, chan);
 };
 
 #endif /* _LIBRINGBUFFER_SHM_TYPES_H */