X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libringbuffer%2Fring_buffer_frontend.c;h=45ff7deeace46c64dc550dfdb08a1cdfb69f357d;hb=0f3a182fa713ddeb6dad104e8f0ee187f8edf529;hp=3828a84b8a289ce2ee6bf4c34ba6ee27c9bd1935;hpb=b72687b85f4f07a9b63be329ad1fe95b36d24900;p=lttng-ust.git

diff --git a/libringbuffer/ring_buffer_frontend.c b/libringbuffer/ring_buffer_frontend.c
index 3828a84b..45ff7dee 100644
--- a/libringbuffer/ring_buffer_frontend.c
+++ b/libringbuffer/ring_buffer_frontend.c
@@ -1,23 +1,8 @@
 /*
- * ring_buffer_frontend.c
+ * 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 wait-free buffer synchronization. Producer-consumer and flight
  * recorder (overwrite) modes. See thesis:
  *
@@ -65,10 +50,12 @@
 #include <urcu/ref.h>
 #include <urcu/tls-compat.h>
 #include <poll.h>
-#include <helper.h>
+#include <ust-helper.h>
 
+#include <lttng/align.h>
 #include "smp.h"
-#include <lttng/ringbuffer-config.h>
+#include <lttng/ringbuffer-context.h>
+#include "ringbuffer-config.h"
 #include "vatomic.h"
 #include "backend.h"
 #include "frontend.h"
@@ -127,7 +114,7 @@ DEFINE_URCU_TLS(unsigned int, lib_ring_buffer_nesting);
 static pthread_mutex_t wakeup_fd_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 static
-void lib_ring_buffer_print_errors(struct channel *chan,
+void lib_ring_buffer_print_errors(struct lttng_ust_lib_ring_buffer_channel *chan,
 				struct lttng_ust_lib_ring_buffer *buf, int cpu,
 				struct lttng_ust_shm_handle *handle);
 
@@ -159,7 +146,7 @@ void lttng_ust_ringbuffer_set_allow_blocking(void)
 }
 
 /* Get blocking timeout, in ms */
-static int lttng_ust_ringbuffer_get_timeout(struct channel *chan)
+static int lttng_ust_ringbuffer_get_timeout(struct lttng_ust_lib_ring_buffer_channel *chan)
 {
 	if (!lttng_ust_allow_blocking)
 		return 0;
@@ -178,7 +165,7 @@ static int lttng_ust_ringbuffer_get_timeout(struct channel *chan)
 void lib_ring_buffer_reset(struct lttng_ust_lib_ring_buffer *buf,
 			   struct lttng_ust_shm_handle *handle)
 {
-	struct channel *chan;
+	struct lttng_ust_lib_ring_buffer_channel *chan;
 	const struct lttng_ust_lib_ring_buffer_config *config;
 	unsigned int i;
 
@@ -232,7 +219,7 @@ void lib_ring_buffer_reset(struct lttng_ust_lib_ring_buffer *buf,
  * be using the iterator concurrently with reset. The previous current iterator
  * record is reset.
  */
-void channel_reset(struct channel *chan)
+void channel_reset(struct lttng_ust_lib_ring_buffer_channel *chan)
 {
 	/*
 	 * Reset iterators first. Will put the subbuffer if held for reading.
@@ -343,9 +330,10 @@ int lib_ring_buffer_create(struct lttng_ust_lib_ring_buffer *buf,
 			   struct shm_object *shmobj)
 {
 	const struct lttng_ust_lib_ring_buffer_config *config = &chanb->config;
-	struct channel *chan = caa_container_of(chanb, struct channel, backend);
+	struct lttng_ust_lib_ring_buffer_channel *chan = caa_container_of(chanb,
+			struct lttng_ust_lib_ring_buffer_channel, backend);
 	struct lttng_ust_lib_ring_buffer_backend_subbuffer *wsb;
-	struct channel *shmp_chan;
+	struct lttng_ust_lib_ring_buffer_channel *shmp_chan;
 	struct commit_counters_hot *cc_hot;
 	void *priv = channel_get_private(chan);
 	size_t subbuf_header_size;
@@ -443,7 +431,7 @@ void lib_ring_buffer_channel_switch_timer(int sig, siginfo_t *si, void *uc)
 {
 	const struct lttng_ust_lib_ring_buffer_config *config;
 	struct lttng_ust_shm_handle *handle;
-	struct channel *chan;
+	struct lttng_ust_lib_ring_buffer_channel *chan;
 	int cpu;
 
 	assert(CMM_LOAD_SHARED(timer_signal.tid) == pthread_self());
@@ -487,7 +475,7 @@ end:
 static
 int lib_ring_buffer_poll_deliver(const struct lttng_ust_lib_ring_buffer_config *config,
 				 struct lttng_ust_lib_ring_buffer *buf,
-			         struct channel *chan,
+			         struct lttng_ust_lib_ring_buffer_channel *chan,
 				 struct lttng_ust_shm_handle *handle)
 {
 	unsigned long consumed_old, consumed_idx, commit_count, write_offset;
@@ -596,7 +584,7 @@ void lib_ring_buffer_wakeup(struct lttng_ust_lib_ring_buffer *buf,
 }
 
 static
-void lib_ring_buffer_channel_do_read(struct channel *chan)
+void lib_ring_buffer_channel_do_read(struct lttng_ust_lib_ring_buffer_channel *chan)
 {
 	const struct lttng_ust_lib_ring_buffer_config *config;
 	struct lttng_ust_shm_handle *handle;
@@ -641,7 +629,7 @@ end:
 static
 void lib_ring_buffer_channel_read_timer(int sig, siginfo_t *si, void *uc)
 {
-	struct channel *chan;
+	struct lttng_ust_lib_ring_buffer_channel *chan;
 
 	assert(CMM_LOAD_SHARED(timer_signal.tid) == pthread_self());
 	chan = si->si_value.sival_ptr;
@@ -791,7 +779,7 @@ void lib_ring_buffer_wait_signal_thread_qs(unsigned int signr)
 }
 
 static
-void lib_ring_buffer_channel_switch_timer_start(struct channel *chan)
+void lib_ring_buffer_channel_switch_timer_start(struct lttng_ust_lib_ring_buffer_channel *chan)
 {
 	struct sigevent sev;
 	struct itimerspec its;
@@ -804,6 +792,7 @@ void lib_ring_buffer_channel_switch_timer_start(struct channel *chan)
 
 	lib_ring_buffer_setup_timer_thread();
 
+	memset(&sev, 0, sizeof(sev));
 	sev.sigev_notify = SIGEV_SIGNAL;
 	sev.sigev_signo = LTTNG_UST_RB_SIG_FLUSH;
 	sev.sigev_value.sival_ptr = chan;
@@ -824,7 +813,7 @@ void lib_ring_buffer_channel_switch_timer_start(struct channel *chan)
 }
 
 static
-void lib_ring_buffer_channel_switch_timer_stop(struct channel *chan)
+void lib_ring_buffer_channel_switch_timer_stop(struct lttng_ust_lib_ring_buffer_channel *chan)
 {
 	int ret;
 
@@ -843,7 +832,7 @@ void lib_ring_buffer_channel_switch_timer_stop(struct channel *chan)
 }
 
 static
-void lib_ring_buffer_channel_read_timer_start(struct channel *chan)
+void lib_ring_buffer_channel_read_timer_start(struct lttng_ust_lib_ring_buffer_channel *chan)
 {
 	const struct lttng_ust_lib_ring_buffer_config *config = &chan->backend.config;
 	struct sigevent sev;
@@ -878,7 +867,7 @@ void lib_ring_buffer_channel_read_timer_start(struct channel *chan)
 }
 
 static
-void lib_ring_buffer_channel_read_timer_stop(struct channel *chan)
+void lib_ring_buffer_channel_read_timer_stop(struct lttng_ust_lib_ring_buffer_channel *chan)
 {
 	const struct lttng_ust_lib_ring_buffer_config *config = &chan->backend.config;
 	int ret;
@@ -904,14 +893,14 @@ void lib_ring_buffer_channel_read_timer_stop(struct channel *chan)
 	chan->read_timer_enabled = 0;
 }
 
-static void channel_unregister_notifiers(struct channel *chan,
+static void channel_unregister_notifiers(struct lttng_ust_lib_ring_buffer_channel *chan,
 			   struct lttng_ust_shm_handle *handle)
 {
 	lib_ring_buffer_channel_switch_timer_stop(chan);
 	lib_ring_buffer_channel_read_timer_stop(chan);
 }
 
-static void channel_print_errors(struct channel *chan,
+static void channel_print_errors(struct lttng_ust_lib_ring_buffer_channel *chan,
 		struct lttng_ust_shm_handle *handle)
 {
 	const struct lttng_ust_lib_ring_buffer_config *config =
@@ -934,7 +923,7 @@ static void channel_print_errors(struct channel *chan,
 	}
 }
 
-static void channel_free(struct channel *chan,
+static void channel_free(struct lttng_ust_lib_ring_buffer_channel *chan,
 		struct lttng_ust_shm_handle *handle,
 		int consumer)
 {
@@ -980,7 +969,7 @@ struct lttng_ust_shm_handle *channel_create(const struct lttng_ust_lib_ring_buff
 {
 	int ret;
 	size_t shmsize, chansize;
-	struct channel *chan;
+	struct lttng_ust_lib_ring_buffer_channel *chan;
 	struct lttng_ust_shm_handle *handle;
 	struct shm_object *shmobj;
 	unsigned int nr_streams;
@@ -1021,7 +1010,7 @@ struct lttng_ust_shm_handle *channel_create(const struct lttng_ust_lib_ring_buff
 		goto error_table_alloc;
 
 	/* Calculate the shm allocation layout */
-	shmsize = sizeof(struct channel);
+	shmsize = sizeof(struct lttng_ust_lib_ring_buffer_channel);
 	shmsize += lttng_ust_offset_align(shmsize, __alignof__(struct lttng_ust_lib_ring_buffer_shmp));
 	shmsize += sizeof(struct lttng_ust_lib_ring_buffer_shmp) * nr_streams;
 	chansize = shmsize;
@@ -1034,7 +1023,7 @@ struct lttng_ust_shm_handle *channel_create(const struct lttng_ust_lib_ring_buff
 			-1, -1);
 	if (!shmobj)
 		goto error_append;
-	/* struct channel is at object 0, offset 0 (hardcoded) */
+	/* struct lttng_ust_lib_ring_buffer_channel is at object 0, offset 0 (hardcoded) */
 	set_shmp(handle->chan, zalloc_shm(shmobj, chansize));
 	assert(handle->chan._ref.index == 0);
 	assert(handle->chan._ref.offset == 0);
@@ -1106,7 +1095,7 @@ struct lttng_ust_shm_handle *channel_handle_create(void *data,
 			memory_map_size, wakeup_fd);
 	if (!object)
 		goto error_table_object;
-	/* struct channel is at object 0, offset 0 (hardcoded) */
+	/* struct lttng_ust_lib_ring_buffer_channel is at object 0, offset 0 (hardcoded) */
 	handle->chan._ref.index = 0;
 	handle->chan._ref.offset = 0;
 	return handle;
@@ -1140,7 +1129,7 @@ unsigned int channel_handle_get_nr_streams(struct lttng_ust_shm_handle *handle)
 }
 
 static
-void channel_release(struct channel *chan, struct lttng_ust_shm_handle *handle,
+void channel_release(struct lttng_ust_lib_ring_buffer_channel *chan, struct lttng_ust_shm_handle *handle,
 		int consumer)
 {
 	channel_free(chan, handle, consumer);
@@ -1156,7 +1145,7 @@ void channel_release(struct channel *chan, struct lttng_ust_shm_handle *handle,
  * consumption of finalized channels, get_subbuf() will return -ENODATA.
  * They should release their handle at that point.
  */
-void channel_destroy(struct channel *chan, struct lttng_ust_shm_handle *handle,
+void channel_destroy(struct lttng_ust_lib_ring_buffer_channel *chan, struct lttng_ust_shm_handle *handle,
 		int consumer)
 {
 	if (consumer) {
@@ -1181,7 +1170,7 @@ void channel_destroy(struct channel *chan, struct lttng_ust_shm_handle *handle,
 
 struct lttng_ust_lib_ring_buffer *channel_get_ring_buffer(
 					const struct lttng_ust_lib_ring_buffer_config *config,
-					struct channel *chan, int cpu,
+					struct lttng_ust_lib_ring_buffer_channel *chan, int cpu,
 					struct lttng_ust_shm_handle *handle,
 					int *shm_fd, int *wait_fd,
 					int *wakeup_fd,
@@ -1205,7 +1194,7 @@ struct lttng_ust_lib_ring_buffer *channel_get_ring_buffer(
 }
 
 int ring_buffer_channel_close_wait_fd(const struct lttng_ust_lib_ring_buffer_config *config,
-			struct channel *chan,
+			struct lttng_ust_lib_ring_buffer_channel *chan,
 			struct lttng_ust_shm_handle *handle)
 {
 	struct shm_ref *ref;
@@ -1215,7 +1204,7 @@ int ring_buffer_channel_close_wait_fd(const struct lttng_ust_lib_ring_buffer_con
 }
 
 int ring_buffer_channel_close_wakeup_fd(const struct lttng_ust_lib_ring_buffer_config *config,
-			struct channel *chan,
+			struct lttng_ust_lib_ring_buffer_channel *chan,
 			struct lttng_ust_shm_handle *handle)
 {
 	struct shm_ref *ref;
@@ -1225,7 +1214,7 @@ int ring_buffer_channel_close_wakeup_fd(const struct lttng_ust_lib_ring_buffer_c
 }
 
 int ring_buffer_stream_close_wait_fd(const struct lttng_ust_lib_ring_buffer_config *config,
-			struct channel *chan,
+			struct lttng_ust_lib_ring_buffer_channel *chan,
 			struct lttng_ust_shm_handle *handle,
 			int cpu)
 {
@@ -1242,7 +1231,7 @@ int ring_buffer_stream_close_wait_fd(const struct lttng_ust_lib_ring_buffer_conf
 }
 
 int ring_buffer_stream_close_wakeup_fd(const struct lttng_ust_lib_ring_buffer_config *config,
-			struct channel *chan,
+			struct lttng_ust_lib_ring_buffer_channel *chan,
 			struct lttng_ust_shm_handle *handle,
 			int cpu)
 {
@@ -1274,7 +1263,7 @@ int lib_ring_buffer_open_read(struct lttng_ust_lib_ring_buffer *buf,
 void lib_ring_buffer_release_read(struct lttng_ust_lib_ring_buffer *buf,
 				  struct lttng_ust_shm_handle *handle)
 {
-	struct channel *chan = shmp(handle, buf->backend.chan);
+	struct lttng_ust_lib_ring_buffer_channel *chan = shmp(handle, buf->backend.chan);
 
 	if (!chan)
 		return;
@@ -1297,7 +1286,7 @@ int lib_ring_buffer_snapshot(struct lttng_ust_lib_ring_buffer *buf,
 			     unsigned long *consumed, unsigned long *produced,
 			     struct lttng_ust_shm_handle *handle)
 {
-	struct channel *chan;
+	struct lttng_ust_lib_ring_buffer_channel *chan;
 	const struct lttng_ust_lib_ring_buffer_config *config;
 	unsigned long consumed_cur, write_offset;
 	int finalized;
@@ -1362,7 +1351,7 @@ int lib_ring_buffer_snapshot_sample_positions(
 			     unsigned long *consumed, unsigned long *produced,
 			     struct lttng_ust_shm_handle *handle)
 {
-	struct channel *chan;
+	struct lttng_ust_lib_ring_buffer_channel *chan;
 	const struct lttng_ust_lib_ring_buffer_config *config;
 
 	chan = shmp(handle, buf->backend.chan);
@@ -1393,7 +1382,7 @@ void lib_ring_buffer_move_consumer(struct lttng_ust_lib_ring_buffer *buf,
 				   struct lttng_ust_shm_handle *handle)
 {
 	struct lttng_ust_lib_ring_buffer_backend *bufb = &buf->backend;
-	struct channel *chan;
+	struct lttng_ust_lib_ring_buffer_channel *chan;
 	unsigned long consumed;
 
 	chan = shmp(handle, bufb->chan);
@@ -1424,7 +1413,7 @@ int lib_ring_buffer_get_subbuf(struct lttng_ust_lib_ring_buffer *buf,
 			       unsigned long consumed,
 			       struct lttng_ust_shm_handle *handle)
 {
-	struct channel *chan;
+	struct lttng_ust_lib_ring_buffer_channel *chan;
 	const struct lttng_ust_lib_ring_buffer_config *config;
 	unsigned long consumed_cur, consumed_idx, commit_count, write_offset;
 	int ret, finalized, nr_retry = LTTNG_UST_RING_BUFFER_GET_RETRY;
@@ -1588,7 +1577,7 @@ void lib_ring_buffer_put_subbuf(struct lttng_ust_lib_ring_buffer *buf,
 				struct lttng_ust_shm_handle *handle)
 {
 	struct lttng_ust_lib_ring_buffer_backend *bufb = &buf->backend;
-	struct channel *chan;
+	struct lttng_ust_lib_ring_buffer_channel *chan;
 	const struct lttng_ust_lib_ring_buffer_config *config;
 	unsigned long sb_bindex, consumed_idx, consumed;
 	struct lttng_ust_lib_ring_buffer_backend_pages_shmp *rpages;
@@ -1655,7 +1644,7 @@ void lib_ring_buffer_put_subbuf(struct lttng_ust_lib_ring_buffer *buf,
  */
 static
 void lib_ring_buffer_print_subbuffer_errors(struct lttng_ust_lib_ring_buffer *buf,
-					    struct channel *chan,
+					    struct lttng_ust_lib_ring_buffer_channel *chan,
 					    unsigned long cons_offset,
 					    int cpu,
 					    struct lttng_ust_shm_handle *handle)
@@ -1690,7 +1679,7 @@ void lib_ring_buffer_print_subbuffer_errors(struct lttng_ust_lib_ring_buffer *bu
 
 static
 void lib_ring_buffer_print_buffer_errors(struct lttng_ust_lib_ring_buffer *buf,
-					 struct channel *chan,
+					 struct lttng_ust_lib_ring_buffer_channel *chan,
 					 void *priv, int cpu,
 					 struct lttng_ust_shm_handle *handle)
 {
@@ -1720,7 +1709,7 @@ void lib_ring_buffer_print_buffer_errors(struct lttng_ust_lib_ring_buffer *buf,
 }
 
 static
-void lib_ring_buffer_print_errors(struct channel *chan,
+void lib_ring_buffer_print_errors(struct lttng_ust_lib_ring_buffer_channel *chan,
 				struct lttng_ust_lib_ring_buffer *buf, int cpu,
 				struct lttng_ust_shm_handle *handle)
 {
@@ -1762,7 +1751,7 @@ void lib_ring_buffer_print_errors(struct channel *chan,
  */
 static
 void lib_ring_buffer_switch_old_start(struct lttng_ust_lib_ring_buffer *buf,
-				      struct channel *chan,
+				      struct lttng_ust_lib_ring_buffer_channel *chan,
 				      struct switch_offsets *offsets,
 				      uint64_t tsc,
 				      struct lttng_ust_shm_handle *handle)
@@ -1803,7 +1792,7 @@ void lib_ring_buffer_switch_old_start(struct lttng_ust_lib_ring_buffer *buf,
  */
 static
 void lib_ring_buffer_switch_old_end(struct lttng_ust_lib_ring_buffer *buf,
-				    struct channel *chan,
+				    struct lttng_ust_lib_ring_buffer_channel *chan,
 				    struct switch_offsets *offsets,
 				    uint64_t tsc,
 				    struct lttng_ust_shm_handle *handle)
@@ -1858,7 +1847,7 @@ void lib_ring_buffer_switch_old_end(struct lttng_ust_lib_ring_buffer *buf,
  */
 static
 void lib_ring_buffer_switch_new_start(struct lttng_ust_lib_ring_buffer *buf,
-				      struct channel *chan,
+				      struct lttng_ust_lib_ring_buffer_channel *chan,
 				      struct switch_offsets *offsets,
 				      uint64_t tsc,
 				      struct lttng_ust_shm_handle *handle)
@@ -1898,7 +1887,7 @@ void lib_ring_buffer_switch_new_start(struct lttng_ust_lib_ring_buffer *buf,
  */
 static
 void lib_ring_buffer_switch_new_end(struct lttng_ust_lib_ring_buffer *buf,
-				    struct channel *chan,
+				    struct lttng_ust_lib_ring_buffer_channel *chan,
 				    struct switch_offsets *offsets,
 				    uint64_t tsc,
 				    struct lttng_ust_shm_handle *handle)
@@ -1933,7 +1922,7 @@ void lib_ring_buffer_switch_new_end(struct lttng_ust_lib_ring_buffer *buf,
 static
 int lib_ring_buffer_try_switch_slow(enum switch_mode mode,
 				    struct lttng_ust_lib_ring_buffer *buf,
-				    struct channel *chan,
+				    struct lttng_ust_lib_ring_buffer_channel *chan,
 				    struct switch_offsets *offsets,
 				    uint64_t *tsc,
 				    struct lttng_ust_shm_handle *handle)
@@ -2049,7 +2038,7 @@ int lib_ring_buffer_try_switch_slow(enum switch_mode mode,
 void lib_ring_buffer_switch_slow(struct lttng_ust_lib_ring_buffer *buf, enum switch_mode mode,
 				 struct lttng_ust_shm_handle *handle)
 {
-	struct channel *chan;
+	struct lttng_ust_lib_ring_buffer_channel *chan;
 	const struct lttng_ust_lib_ring_buffer_config *config;
 	struct switch_offsets offsets;
 	unsigned long oldidx;
@@ -2128,7 +2117,7 @@ bool handle_blocking_retry(int *timeout_left_ms)
  */
 static
 int lib_ring_buffer_try_reserve_slow(struct lttng_ust_lib_ring_buffer *buf,
-				     struct channel *chan,
+				     struct lttng_ust_lib_ring_buffer_channel *chan,
 				     struct switch_offsets *offsets,
 				     struct lttng_ust_lib_ring_buffer_ctx *ctx,
 				     void *client_ctx)
@@ -2322,7 +2311,7 @@ retry:
 int lib_ring_buffer_reserve_slow(struct lttng_ust_lib_ring_buffer_ctx *ctx,
 		void *client_ctx)
 {
-	struct channel *chan = ctx->chan;
+	struct lttng_ust_lib_ring_buffer_channel *chan = ctx->chan;
 	struct lttng_ust_shm_handle *handle = ctx->handle;
 	const struct lttng_ust_lib_ring_buffer_config *config = &chan->backend.config;
 	struct lttng_ust_lib_ring_buffer *buf;
@@ -2440,7 +2429,7 @@ void deliver_count_events(const struct lttng_ust_lib_ring_buffer_config *config,
 
 void lib_ring_buffer_check_deliver_slow(const struct lttng_ust_lib_ring_buffer_config *config,
 				   struct lttng_ust_lib_ring_buffer *buf,
-			           struct channel *chan,
+			           struct lttng_ust_lib_ring_buffer_channel *chan,
 			           unsigned long offset,
 				   unsigned long commit_count,
 			           unsigned long idx,