X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt-ring-buffer-client.h;h=8df37901095aade13f6281945ba9d32b5f940653;hb=786b8312cc69bfd8e12ec956351da3433db26155;hp=30f0104fdc46728468f78ddb3c33b977178a87de;hpb=da4e23320ee3bed6a19fe29c8a0b8b78387be7f3;p=lttng-modules.git

diff --git a/ltt-ring-buffer-client.h b/ltt-ring-buffer-client.h
index 30f0104f..8df37901 100644
--- a/ltt-ring-buffer-client.h
+++ b/ltt-ring-buffer-client.h
@@ -22,6 +22,14 @@
  * you ever add/remove a field from this header. Packed attribute is not used
  * because gcc generates poor code on at least powerpc and mips. Don't ever
  * let gcc add padding between the structure elements.
+ *
+ * The guarantee we have with timestamps is that all the events in a
+ * packet are included (inclusive) within the begin/end timestamps of
+ * the packet. Another guarantee we have is that the "timestamp begin",
+ * as well as the event timestamps, are monotonically increasing (never
+ * decrease) when moving forward in a stream (physically). But this
+ * guarantee does not apply to "timestamp end", because it is sampled at
+ * commit time, which is not ordered with respect to space reservation.
  */
 
 struct packet_header {
@@ -200,6 +208,7 @@ void ltt_write_event_header(const struct lib_ring_buffer_config *config,
 
 	ctx_record(ctx, ltt_chan, ltt_chan->ctx);
 	ctx_record(ctx, ltt_chan, event->ctx);
+	lib_ring_buffer_align_ctx(ctx, ctx->largest_align);
 
 	return;
 
@@ -263,6 +272,7 @@ void ltt_write_event_header_slow(const struct lib_ring_buffer_config *config,
 	}
 	ctx_record(ctx, ltt_chan, ltt_chan->ctx);
 	ctx_record(ctx, ltt_chan, event->ctx);
+	lib_ring_buffer_align_ctx(ctx, ctx->largest_align);
 }
 
 static const struct lib_ring_buffer_config client_config;
@@ -471,9 +481,25 @@ void ltt_event_write(struct lib_ring_buffer_ctx *ctx, const void *src,
 }
 
 static
-wait_queue_head_t *ltt_get_reader_wait_queue(struct channel *chan)
+void ltt_event_write_from_user(struct lib_ring_buffer_ctx *ctx,
+			       const void __user *src, size_t len)
+{
+	lib_ring_buffer_copy_from_user(&client_config, ctx, src, len);
+}
+
+static
+void ltt_event_memset(struct lib_ring_buffer_ctx *ctx,
+		int c, size_t len)
+{
+	lib_ring_buffer_memset(&client_config, ctx, c, len);
+}
+
+static
+wait_queue_head_t *ltt_get_writer_buf_wait_queue(struct channel *chan, int cpu)
 {
-	return &chan->read_wait;
+	struct lib_ring_buffer *buf = channel_get_ring_buffer(&client_config,
+					chan, cpu);
+	return &buf->write_wait;
 }
 
 static
@@ -507,8 +533,10 @@ static struct ltt_transport ltt_relay_transport = {
 		.event_reserve = ltt_event_reserve,
 		.event_commit = ltt_event_commit,
 		.event_write = ltt_event_write,
+		.event_write_from_user = ltt_event_write_from_user,
+		.event_memset = ltt_event_memset,
 		.packet_avail_size = NULL,	/* Would be racy anyway */
-		.get_reader_wait_queue = ltt_get_reader_wait_queue,
+		.get_writer_buf_wait_queue = ltt_get_writer_buf_wait_queue,
 		.get_hp_wait_queue = ltt_get_hp_wait_queue,
 		.is_finalized = ltt_is_finalized,
 		.is_disabled = ltt_is_disabled,