static
int notification_init(struct lttng_event_notifier_notification *notif,
- struct lttng_event_notifier *event_notifier)
+ struct lttng_kernel_event_notifier *event_notifier)
{
struct lttng_msgpack_writer *writer = ¬if->writer;
int ret = 0;
notif->has_captures = false;
- if (event_notifier->num_captures > 0) {
+ if (event_notifier->priv->num_captures > 0) {
lttng_msgpack_writer_init(writer, notif->capture_buf,
CAPTURE_BUFFER_SIZE);
- ret = lttng_msgpack_begin_array(writer, event_notifier->num_captures);
+ ret = lttng_msgpack_begin_array(writer, event_notifier->priv->num_captures);
if (ret) {
WARN_ON_ONCE(1);
goto end;
}
static
-void record_error(struct lttng_event_notifier *event_notifier)
+void record_error(struct lttng_kernel_event_notifier *event_notifier)
{
- struct lttng_event_notifier_group *event_notifier_group = event_notifier->group;
+ struct lttng_event_notifier_group *event_notifier_group = event_notifier->priv->group;
struct lttng_counter *error_counter;
size_t dimension_index[1];
int ret;
if (!error_counter)
return;
- dimension_index[0] = event_notifier->error_counter_index;
+ dimension_index[0] = event_notifier->priv->error_counter_index;
ret = error_counter->ops->counter_add(error_counter->counter,
dimension_index, 1);
static
void notification_send(struct lttng_event_notifier_notification *notif,
- struct lttng_event_notifier *event_notifier)
+ struct lttng_kernel_event_notifier *event_notifier)
{
- struct lttng_event_notifier_group *event_notifier_group = event_notifier->group;
- struct lib_ring_buffer_ctx ctx;
+ struct lttng_event_notifier_group *event_notifier_group = event_notifier->priv->group;
+ 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;
reserve_size = sizeof(kernel_notif);
- kernel_notif.token = event_notifier->user_token;
+ kernel_notif.token = event_notifier->priv->parent.user_token;
if (notif->has_captures) {
capture_buffer_content_len = notif->writer.write_pos - notif->writer.buffer;
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, ¬if->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);
}
-void lttng_event_notifier_notification_send(struct lttng_event_notifier *event_notifier,
- struct lttng_probe_ctx *lttng_probe_ctx,
+void lttng_event_notifier_notification_send(struct lttng_kernel_event_notifier *event_notifier,
const char *stack_data,
- struct lttng_kernel_notifier_ctx *notif_ctx)
+ struct lttng_kernel_probe_ctx *probe_ctx,
+ struct lttng_kernel_notification_ctx *notif_ctx)
{
struct lttng_event_notifier_notification notif = { 0 };
int ret;
- if (unlikely(!READ_ONCE(event_notifier->enabled)))
+ if (unlikely(!READ_ONCE(event_notifier->parent.enabled)))
return;
ret = notification_init(¬if, 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
* fails, append an empty capture to the buffer.
*/
list_for_each_entry_rcu(capture_bc_runtime,
- &event_notifier->capture_bytecode_runtime_head, node) {
+ &event_notifier->priv->capture_bytecode_runtime_head, node) {
struct lttng_interpreter_output output;
- if (capture_bc_runtime->interpreter_funcs.capture(capture_bc_runtime,
- lttng_probe_ctx, stack_data, &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(¬if, &output);
else
ret = notification_append_empty_capture(¬if);