X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=lttng-ring-buffer-client.h;h=7055e770734e52a6f339f3c6b78e1c7913f07a1d;hb=refs%2Fheads%2Fstable-2.4;hp=50c47b3bf49f6c2dd24e250cf1a9b97808cd8e27;hpb=2348ca17d04c122d21f9329faa6941d0b147b378;p=lttng-modules.git

diff --git a/lttng-ring-buffer-client.h b/lttng-ring-buffer-client.h
index 50c47b3b..7055e770 100644
--- a/lttng-ring-buffer-client.h
+++ b/lttng-ring-buffer-client.h
@@ -32,6 +32,8 @@
 #define LTTNG_COMPACT_EVENT_BITS	5
 #define LTTNG_COMPACT_TSC_BITS		27
 
+static struct lttng_transport lttng_relay_transport;
+
 /*
  * Keep the natural field alignment for _each field_ within this structure if
  * you ever add/remove a field from this header. Packed attribute is not used
@@ -86,6 +88,7 @@ size_t ctx_get_size(size_t offset, struct lttng_ctx *ctx)
 
 	if (likely(!ctx))
 		return 0;
+	offset += lib_ring_buffer_align(offset, ctx->largest_align);
 	for (i = 0; i < ctx->nr_fields; i++)
 		offset += ctx->fields[i].get_size(offset);
 	return offset - orig_offset;
@@ -100,6 +103,7 @@ void ctx_record(struct lib_ring_buffer_ctx *bufctx,
 
 	if (likely(!ctx))
 		return;
+	lib_ring_buffer_align_ctx(bufctx, ctx->largest_align);
 	for (i = 0; i < ctx->nr_fields; i++)
 		ctx->fields[i].record(&ctx->fields[i], bufctx, chan);
 }
@@ -394,17 +398,7 @@ static struct packet_header *client_packet_header(
 		const struct lib_ring_buffer_config *config,
 		struct lib_ring_buffer *buf)
 {
-	struct lib_ring_buffer_backend *bufb;
-	unsigned long sb_bindex;
-	struct packet_header *header;
-
-	bufb = &buf->backend;
-	sb_bindex = subbuffer_id_get_index(config, bufb->buf_rsb.id);
-	header = (struct packet_header *)
-		lib_ring_buffer_offset_address(bufb,
-				sb_bindex * bufb->chan->backend.subbuf_size);
-
-	return header;
+	return lib_ring_buffer_read_offset_address(&buf->backend, 0);
 }
 
 static int client_timestamp_begin(const struct lib_ring_buffer_config *config,
@@ -496,6 +490,18 @@ static const struct lib_ring_buffer_config client_config = {
 	.wakeup = RING_BUFFER_WAKEUP_BY_TIMER,
 };
 
+static
+void release_priv_ops(void *priv_ops)
+{
+	module_put(THIS_MODULE);
+}
+
+static
+void lttng_channel_destroy(struct channel *chan)
+{
+	channel_destroy(chan);
+}
+
 static
 struct channel *_channel_create(const char *name,
 				struct lttng_channel *lttng_chan, void *buf_addr,
@@ -503,23 +509,28 @@ struct channel *_channel_create(const char *name,
 				unsigned int switch_timer_interval,
 				unsigned int read_timer_interval)
 {
-	lttng_chan->ops->timestamp_begin = client_timestamp_begin;
-	lttng_chan->ops->timestamp_end = client_timestamp_end;
-	lttng_chan->ops->events_discarded = client_events_discarded;
-	lttng_chan->ops->content_size = client_content_size;
-	lttng_chan->ops->packet_size = client_packet_size;
-	lttng_chan->ops->stream_id = client_stream_id;
-	lttng_chan->ops->current_timestamp = client_current_timestamp;
+	struct channel *chan;
 
-	return channel_create(&client_config, name, lttng_chan, buf_addr,
+	chan = channel_create(&client_config, name, lttng_chan, buf_addr,
 			      subbuf_size, num_subbuf, switch_timer_interval,
 			      read_timer_interval);
-}
+	if (chan) {
+		/*
+		 * Ensure this module is not unloaded before we finish
+		 * using lttng_relay_transport.ops.
+		 */
+		if (!try_module_get(THIS_MODULE)) {
+			printk(KERN_WARNING "LTT : Can't lock transport module.\n");
+			goto error;
+		}
+		chan->backend.priv_ops = &lttng_relay_transport.ops;
+		chan->backend.release_priv_ops = release_priv_ops;
+	}
+	return chan;
 
-static
-void lttng_channel_destroy(struct channel *chan)
-{
-	channel_destroy(chan);
+error:
+	lttng_channel_destroy(chan);
+	return NULL;
 }
 
 static
@@ -619,6 +630,21 @@ void lttng_event_memset(struct lib_ring_buffer_ctx *ctx,
 	lib_ring_buffer_memset(&client_config, ctx, c, len);
 }
 
+static
+void lttng_event_strcpy(struct lib_ring_buffer_ctx *ctx, const char *src,
+		size_t len)
+{
+	lib_ring_buffer_strcpy(&client_config, ctx, src, len, '#');
+}
+
+static
+void lttng_event_strcpy_from_user(struct lib_ring_buffer_ctx *ctx,
+		const char __user *src, size_t len)
+{
+	lib_ring_buffer_strcpy_from_user_inatomic(&client_config, ctx, src,
+			len, '#');
+}
+
 static
 wait_queue_head_t *lttng_get_writer_buf_wait_queue(struct channel *chan, int cpu)
 {
@@ -660,11 +686,20 @@ static struct lttng_transport lttng_relay_transport = {
 		.event_write = lttng_event_write,
 		.event_write_from_user = lttng_event_write_from_user,
 		.event_memset = lttng_event_memset,
+		.event_strcpy = lttng_event_strcpy,
+		.event_strcpy_from_user = lttng_event_strcpy_from_user,
 		.packet_avail_size = NULL,	/* Would be racy anyway */
 		.get_writer_buf_wait_queue = lttng_get_writer_buf_wait_queue,
 		.get_hp_wait_queue = lttng_get_hp_wait_queue,
 		.is_finalized = lttng_is_finalized,
 		.is_disabled = lttng_is_disabled,
+		.timestamp_begin = client_timestamp_begin,
+		.timestamp_end = client_timestamp_end,
+		.events_discarded = client_events_discarded,
+		.content_size = client_content_size,
+		.packet_size = client_packet_size,
+		.stream_id = client_stream_id,
+		.current_timestamp = client_current_timestamp,
 	},
 };