X-Git-Url: http://git.lttng.org/?p=lttng-ust.git;a=blobdiff_plain;f=libringbuffer%2Fshm.h;h=a745d34592bab4b962990b6a90255b3e74e60222;hp=22c9afdcbd2beaf557aa894ca37cd975908f3b37;hb=bf5ff35ed0a3a7f60e92d654a5b97e73b94da852;hpb=ed5426d36fe2da648b4b16ec8173398558d8490f

diff --git a/libringbuffer/shm.h b/libringbuffer/shm.h
index 22c9afdc..a745d345 100644
--- a/libringbuffer/shm.h
+++ b/libringbuffer/shm.h
@@ -4,14 +4,26 @@
 /*
  * libringbuffer/shm.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>
-#include <ust/usterr-signal-safe.h>
-#include "ust/core.h"
+#include <usterr-signal-safe.h>
+#include <urcu/compiler.h>
 #include "shm_types.h"
 
 /*
@@ -31,13 +43,13 @@ char *_shmp_offset(struct shm_object_table *table, struct shm_ref *ref,
 	size_t objindex, ref_offset;
 
 	objindex = (size_t) ref->index;
-	if (unlikely(objindex >= table->allocated_len))
+	if (caa_unlikely(objindex >= table->allocated_len))
 		return NULL;
 	obj = &table->objects[objindex];
 	ref_offset = (size_t) ref->offset;
 	ref_offset += idx * elem_size;
 	/* Check if part of the element returned would exceed the limits. */
-	if (unlikely(ref_offset + elem_size > obj->memory_map_size))
+	if (caa_unlikely(ref_offset + elem_size > obj->memory_map_size))
 		return NULL;
 	return &obj->memory_map[ref_offset];
 }
@@ -60,6 +72,8 @@ void _set_shmp(struct shm_ref *ref, struct shm_ref src)
 #define set_shmp(ref, src)	_set_shmp(&(ref)._ref, src)
 
 struct shm_object_table *shm_object_table_create(size_t max_nb_obj);
+struct shm_object *shm_object_table_append_shadow(struct shm_object_table *table,
+			int shm_fd, int wait_fd, size_t memory_map_size);
 void shm_object_table_destroy(struct shm_object_table *table);
 struct shm_object *shm_object_table_append(struct shm_object_table *table,
 					   size_t memory_map_size);
@@ -75,14 +89,14 @@ struct shm_ref zalloc_shm(struct shm_object *obj, size_t len);
 void align_shm(struct shm_object *obj, size_t align);
 
 static inline
-int shm_get_wakeup_fd(struct shm_handle *handle, struct shm_ref *ref)
+int shm_get_wakeup_fd(struct lttng_ust_shm_handle *handle, struct shm_ref *ref)
 {
 	struct shm_object_table *table = handle->table;
 	struct shm_object *obj;
 	size_t index;
 
 	index = (size_t) ref->index;
-	if (unlikely(index >= table->allocated_len))
+	if (caa_unlikely(index >= table->allocated_len))
 		return -EPERM;
 	obj = &table->objects[index];
 	return obj->wait_fd[1];
@@ -90,17 +104,39 @@ int shm_get_wakeup_fd(struct shm_handle *handle, struct shm_ref *ref)
 }
 
 static inline
-int shm_get_wait_fd(struct shm_handle *handle, struct shm_ref *ref)
+int shm_get_wait_fd(struct lttng_ust_shm_handle *handle, struct shm_ref *ref)
 {
 	struct shm_object_table *table = handle->table;
 	struct shm_object *obj;
 	size_t index;
 
 	index = (size_t) ref->index;
-	if (unlikely(index >= table->allocated_len))
+	if (caa_unlikely(index >= table->allocated_len))
 		return -EPERM;
 	obj = &table->objects[index];
 	return obj->wait_fd[0];
 }
 
+static inline
+int shm_get_object_data(struct lttng_ust_shm_handle *handle, struct shm_ref *ref,
+			int **shm_fd, char **shm_path,
+			int **wait_fd, char **wait_pipe_path,
+			uint64_t **memory_map_size)
+{
+	struct shm_object_table *table = handle->table;
+	struct shm_object *obj;
+	size_t index;
+
+	index = (size_t) ref->index;
+	if (caa_unlikely(index >= table->allocated_len))
+		return -EPERM;
+	obj = &table->objects[index];
+	*shm_fd   = &obj->shm_fd;
+	*shm_path = obj->shm_path;
+	*wait_fd        = &obj->wait_fd[0];
+	*wait_pipe_path = obj->wait_pipe_path;
+	*memory_map_size = &obj->allocated_len;
+	return 0;
+}
+
 #endif /* _LIBRINGBUFFER_SHM_H */