X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libringbuffer%2Fbackend_internal.h;h=68370c7edb18187c5c99301f3edee20b3203d694;hb=aab8b172425eb52f2cd5bd71ce03f8a5624f83df;hp=fe8f6eb611ebb5b11e59d3611e2b20956652bf97;hpb=fb31eb73d8a4a6d9784ed5c335b7fa3b9684108c;p=lttng-ust.git

diff --git a/libringbuffer/backend_internal.h b/libringbuffer/backend_internal.h
index fe8f6eb6..68370c7e 100644
--- a/libringbuffer/backend_internal.h
+++ b/libringbuffer/backend_internal.h
@@ -1,34 +1,21 @@
-#ifndef _LTTNG_RING_BUFFER_BACKEND_INTERNAL_H
-#define _LTTNG_RING_BUFFER_BACKEND_INTERNAL_H
-
 /*
- * libringbuffer/backend_internal.h
- *
- * Ring buffer backend (internal helpers).
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
  * Copyright (C) 2005-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
+ * Ring buffer backend (internal helpers).
  */
 
+#ifndef _LTTNG_RING_BUFFER_BACKEND_INTERNAL_H
+#define _LTTNG_RING_BUFFER_BACKEND_INTERNAL_H
+
 #include <stddef.h>
 #include <stdint.h>
 #include <unistd.h>
 #include <urcu/compiler.h>
 
-#include <lttng/ringbuffer-config.h>
+#include <lttng/ringbuffer-context.h>
+#include "ringbuffer-config.h"
 #include "backend_types.h"
 #include "frontend_types.h"
 #include "shm.h"
@@ -37,28 +24,45 @@
 
 /* Ring buffer and channel backend create/free */
 
+__attribute__((visibility("hidden")))
 int lib_ring_buffer_backend_create(struct lttng_ust_lib_ring_buffer_backend *bufb,
-				   struct channel_backend *chan, int cpu,
+				   struct channel_backend *chan,
+				   int cpu,
 				   struct lttng_ust_shm_handle *handle,
 				   struct shm_object *shmobj);
+
+__attribute__((visibility("hidden")))
 void channel_backend_unregister_notifiers(struct channel_backend *chanb);
+
+__attribute__((visibility("hidden")))
 void lib_ring_buffer_backend_free(struct lttng_ust_lib_ring_buffer_backend *bufb);
+
+__attribute__((visibility("hidden")))
 int channel_backend_init(struct channel_backend *chanb,
 			 const char *name,
 			 const struct lttng_ust_lib_ring_buffer_config *config,
 			 size_t subbuf_size,
 			 size_t num_subbuf, struct lttng_ust_shm_handle *handle,
 			 const int *stream_fds);
+
+__attribute__((visibility("hidden")))
 void channel_backend_free(struct channel_backend *chanb,
 			  struct lttng_ust_shm_handle *handle);
 
+__attribute__((visibility("hidden")))
 void lib_ring_buffer_backend_reset(struct lttng_ust_lib_ring_buffer_backend *bufb,
 				   struct lttng_ust_shm_handle *handle);
+
+__attribute__((visibility("hidden")))
 void channel_backend_reset(struct channel_backend *chanb);
 
+__attribute__((visibility("hidden")))
 int lib_ring_buffer_backend_init(void);
+
+__attribute__((visibility("hidden")))
 void lib_ring_buffer_backend_exit(void);
 
+__attribute__((visibility("hidden")))
 extern void _lib_ring_buffer_write(struct lttng_ust_lib_ring_buffer_backend *bufb,
 				   size_t offset, const void *src, size_t len,
 				   ssize_t pagecpy);
@@ -205,7 +209,7 @@ int lib_ring_buffer_backend_get_pages(const struct lttng_ust_lib_ring_buffer_con
 {
 	struct lttng_ust_lib_ring_buffer_backend *bufb = &ctx->buf->backend;
 	struct channel_backend *chanb = &ctx->chan->backend;
-	struct lttng_ust_shm_handle *handle = ctx->handle;
+	struct lttng_ust_shm_handle *handle = ctx->chan->handle;
 	size_t sbidx;
 	size_t offset = ctx->buf_offset;
 	struct lttng_ust_lib_ring_buffer_backend_subbuffer *wsb;
@@ -239,9 +243,6 @@ struct lttng_ust_lib_ring_buffer_backend_pages *
 	lib_ring_buffer_get_backend_pages_from_ctx(const struct lttng_ust_lib_ring_buffer_config *config,
 		struct lttng_ust_lib_ring_buffer_ctx *ctx)
 {
-	if (caa_unlikely(ctx->ctx_len
-			< sizeof(struct lttng_ust_lib_ring_buffer_ctx)))
-		return NULL;
 	return ctx->backend_pages;
 }
 
@@ -285,7 +286,7 @@ void subbuffer_consume_record(const struct lttng_ust_lib_ring_buffer_config *con
 			      struct lttng_ust_shm_handle *handle)
 {
 	unsigned long sb_bindex;
-	struct channel *chan;
+	struct lttng_ust_lib_ring_buffer_channel *chan;
 	struct lttng_ust_lib_ring_buffer_backend_pages_shmp *pages_shmp;
 	struct lttng_ust_lib_ring_buffer_backend_pages *backend_pages;
 
@@ -505,7 +506,7 @@ void lib_ring_buffer_set_noref_offset(const struct lttng_ust_lib_ring_buffer_con
 				      struct lttng_ust_shm_handle *handle)
 {
 	struct lttng_ust_lib_ring_buffer_backend_subbuffer *wsb;
-	struct channel *chan;
+	struct lttng_ust_lib_ring_buffer_channel *chan;
 
 	if (config->mode != RING_BUFFER_OVERWRITE)
 		return;
@@ -555,7 +556,7 @@ int update_read_sb_index(const struct lttng_ust_lib_ring_buffer_config *config,
 		return -EPERM;
 
 	if (config->mode == RING_BUFFER_OVERWRITE) {
-		struct channel *chan;
+		struct lttng_ust_lib_ring_buffer_channel *chan;
 
 		/*
 		 * Exchange the target writer subbuffer with our own unused
@@ -634,7 +635,7 @@ do {								\
  * write len bytes to dest with c
  */
 static inline
-void lib_ring_buffer_do_memset(char *dest, int c, unsigned long len)
+void lib_ring_buffer_do_memset(char *dest, char c, unsigned long len)
 {
 	unsigned long i;