X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libringbuffer%2Fshm_types.h;h=8b01d803e8ad4c2189f8bf40dbbab0bf9188511a;hb=29865d1ccafc065d07e0de67b196790ed36ab396;hp=e92c0af03d3d99e61f92b07684536161a116f4bf;hpb=1d4981969313da002983ca979bd85c95493f7316;p=lttng-ust.git

diff --git a/libringbuffer/shm_types.h b/libringbuffer/shm_types.h
index e92c0af0..8b01d803 100644
--- a/libringbuffer/shm_types.h
+++ b/libringbuffer/shm_types.h
@@ -4,9 +4,21 @@
 /*
  * libringbuffer/shm_types.h
  *
- * Copyright 2011 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2011-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * Dual LGPL v2.1/GPL v2 license.
+ * 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
  */
 
 #include <stdint.h>
@@ -19,8 +31,9 @@ struct shm_object {
 	int shm_fd;	/* shm fd */
 	int wait_fd[2];	/* fd for wait/wakeup */
 	char *memory_map;
+	int is_shadow;
 	size_t memory_map_size;
-	size_t allocated_len;
+	uint64_t allocated_len;
 };
 
 struct shm_object_table {
@@ -29,7 +42,7 @@ struct shm_object_table {
 	struct shm_object objects[];
 };
 
-struct shm_handle {
+struct lttng_ust_shm_handle {
 	struct shm_object_table *table;
 	DECLARE_SHMP(struct channel, chan);
 	/*