X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Flttng-ring-buffer-event-notifier-client.h;h=ccd3a0206f12d1a6c56437302b21de17f350bc2b;hb=HEAD;hp=17f9791a9421df02f5a507f7cebb20a4d4c650d5;hpb=e20c0fec4a2e120143f2e71c63d9fcd664af55a4;p=lttng-modules.git

diff --git a/src/lttng-ring-buffer-event-notifier-client.h b/src/lttng-ring-buffer-event-notifier-client.h
index 17f9791a..fa7bbf57 100644
--- a/src/lttng-ring-buffer-event-notifier-client.h
+++ b/src/lttng-ring-buffer-event-notifier-client.h
@@ -86,7 +86,7 @@ static size_t client_packet_header_size(void)
 	return offsetof(struct event_notifier_packet_header, header_end);
 }
 
-static void client_buffer_begin(struct lttng_kernel_ring_buffer *buf, u64 tsc,
+static void client_buffer_begin(struct lttng_kernel_ring_buffer *buf, u64 timestamp,
 				unsigned int subbuf_idx)
 {
 }
@@ -95,8 +95,9 @@ static void client_buffer_begin(struct lttng_kernel_ring_buffer *buf, u64 tsc,
  * offset is assumed to never be 0 here : never deliver a completely empty
  * subbuffer. data_size is between 1 and subbuf_size.
  */
-static void client_buffer_end(struct lttng_kernel_ring_buffer *buf, u64 tsc,
-			      unsigned int subbuf_idx, unsigned long data_size)
+static void client_buffer_end(struct lttng_kernel_ring_buffer *buf, u64 timestamp,
+			      unsigned int subbuf_idx, unsigned long data_size,
+			      const struct lttng_kernel_ring_buffer_ctx *ctx)
 {
 }
 
@@ -199,7 +200,7 @@ static const struct lttng_kernel_ring_buffer_config client_config = {
 	.cb.buffer_finalize = client_buffer_finalize,
 	.cb.record_get = client_record_get,
 
-	.tsc_bits = 0,
+	.timestamp_bits = 0,
 	.alloc = RING_BUFFER_ALLOC_GLOBAL,
 	.sync = RING_BUFFER_SYNC_GLOBAL,
 	.mode = RING_BUFFER_MODE_TEMPLATE,
@@ -328,15 +329,17 @@ void lttng_event_commit(struct lttng_kernel_ring_buffer_ctx *ctx)
 
 static
 void lttng_event_write(struct lttng_kernel_ring_buffer_ctx *ctx, const void *src,
-		     size_t len)
+		     size_t len, size_t alignment)
 {
+	lib_ring_buffer_align_ctx(ctx, alignment);
 	lib_ring_buffer_write(&client_config, ctx, src, len);
 }
 
 static
 void lttng_event_write_from_user(struct lttng_kernel_ring_buffer_ctx *ctx,
-			       const void __user *src, size_t len)
+			       const void __user *src, size_t len, size_t alignment)
 {
+	lib_ring_buffer_align_ctx(ctx, alignment);
 	lib_ring_buffer_copy_from_user_inatomic(&client_config, ctx, src, len);
 }