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

diff --git a/libringbuffer/shm_types.h b/libringbuffer/shm_types.h
index 8b01d803..11076d29 100644
--- a/libringbuffer/shm_types.h
+++ b/libringbuffer/shm_types.h
@@ -22,18 +22,25 @@
  */
 
 #include <stdint.h>
+#include <limits.h>
 #include "shm_internal.h"
 
 struct 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 {
@@ -45,12 +52,6 @@ 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;
 };
 
 #endif /* _LIBRINGBUFFER_SHM_TYPES_H */