X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-event-notifier-notification.c;h=811dc50ad8dc93ea7230a71a8c106d9fb6316da4;hb=f5ffbd770ec2b9d1ac9b7059eb33a01432043bce;hp=2286aa79f6fcb688b435031d12ed86754c0f2b5c;hpb=a775608d0d1d6142c80c26b21ff79bf7e04d8e53;p=lttng-modules.git

diff --git a/src/lttng-event-notifier-notification.c b/src/lttng-event-notifier-notification.c
index 2286aa79..811dc50a 100644
--- a/src/lttng-event-notifier-notification.c
+++ b/src/lttng-event-notifier-notification.c
@@ -381,7 +381,7 @@ void notification_send(struct lttng_event_notifier_notification *notif,
 		struct lttng_kernel_event_notifier *event_notifier)
 {
 	struct lttng_event_notifier_group *event_notifier_group = event_notifier->priv->group;
-	struct lib_ring_buffer_ctx ctx;
+	struct lttng_kernel_ring_buffer_ctx ctx;
 	struct lttng_kernel_abi_event_notifier_notification kernel_notif;
 	size_t capture_buffer_content_len, reserve_size;
 	int ret;
@@ -400,26 +400,24 @@ void notification_send(struct lttng_event_notifier_notification *notif,
 	reserve_size += capture_buffer_content_len;
 	kernel_notif.capture_buf_size = capture_buffer_content_len;
 
-	lib_ring_buffer_ctx_init(&ctx, event_notifier_group->chan, NULL, reserve_size,
-			lttng_alignof(kernel_notif), -1);
-	ret = event_notifier_group->ops->event_reserve(&ctx, 0);
+	lib_ring_buffer_ctx_init(&ctx, event_notifier_group->chan, reserve_size,
+			lttng_alignof(kernel_notif), NULL);
+	ret = event_notifier_group->ops->event_reserve(&ctx);
 	if (ret < 0) {
 		record_error(event_notifier);
 		return;
 	}
 
-	lib_ring_buffer_align_ctx(&ctx, lttng_alignof(kernel_notif));
-
 	/* Write the notif structure. */
 	event_notifier_group->ops->event_write(&ctx, &kernel_notif,
-			sizeof(kernel_notif));
+			sizeof(kernel_notif), lttng_alignof(kernel_notif));
 
 	/*
 	 * Write the capture buffer. No need to realigned as the below is a raw
 	 * char* buffer.
 	 */
 	event_notifier_group->ops->event_write(&ctx, &notif->capture_buf,
-			capture_buffer_content_len);
+			capture_buffer_content_len, 1);
 
 	event_notifier_group->ops->event_commit(&ctx);
 	irq_work_queue(&event_notifier_group->wakeup_pending);
@@ -427,7 +425,7 @@ void notification_send(struct lttng_event_notifier_notification *notif,
 
 void lttng_event_notifier_notification_send(struct lttng_kernel_event_notifier *event_notifier,
 		const char *stack_data,
-		struct lttng_probe_ctx *probe_ctx,
+		struct lttng_kernel_probe_ctx *probe_ctx,
 		struct lttng_kernel_notification_ctx *notif_ctx)
 {
 	struct lttng_event_notifier_notification notif = { 0 };
@@ -443,7 +441,7 @@ void lttng_event_notifier_notification_send(struct lttng_kernel_event_notifier *
 	}
 
 	if (unlikely(notif_ctx->eval_capture)) {
-		struct lttng_bytecode_runtime *capture_bc_runtime;
+		struct lttng_kernel_bytecode_runtime *capture_bc_runtime;
 
 		/*
 		 * Iterate over all the capture bytecodes. If the interpreter
@@ -455,8 +453,8 @@ void lttng_event_notifier_notification_send(struct lttng_kernel_event_notifier *
 				&event_notifier->priv->capture_bytecode_runtime_head, node) {
 			struct lttng_interpreter_output output;
 
-			if (capture_bc_runtime->interpreter_funcs.capture(capture_bc_runtime,
-					stack_data, probe_ctx, &output) & LTTNG_INTERPRETER_RECORD_FLAG)
+			if (capture_bc_runtime->interpreter_func(capture_bc_runtime,
+					stack_data, probe_ctx, &output) == LTTNG_KERNEL_BYTECODE_INTERPRETER_OK)
 				ret = notification_append_capture(&notif, &output);
 			else
 				ret = notification_append_empty_capture(&notif);