X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Fevent-notifier-notification.c;h=b3e2c94f1bd7a2d7180ad64256bcb325ea393e85;hb=6ba6fd60507f8e045bdc4f1be14e9d99c6a15f7f;hp=559c7fe88e21a62d42382d3aa657a595aa680aa0;hpb=8c3470eaadb6e01fe65e1b852907467c0527ba05;p=lttng-ust.git diff --git a/liblttng-ust/event-notifier-notification.c b/liblttng-ust/event-notifier-notification.c index 559c7fe8..b3e2c94f 100644 --- a/liblttng-ust/event-notifier-notification.c +++ b/liblttng-ust/event-notifier-notification.c @@ -8,9 +8,13 @@ #include #include +#include + #include #include +#include +#include "lttng-tracer-core.h" #include "ust-events-internal.h" #include "../libmsgpack/msgpack.h" #include "lttng-bytecode.h" @@ -24,7 +28,7 @@ * of the notification struct we are sending alongside the capture buffer. */ #define CAPTURE_BUFFER_SIZE \ - (PIPE_BUF - sizeof(struct lttng_ust_event_notifier_notification) - 1) + (PIPE_BUF - sizeof(struct lttng_ust_abi_event_notifier_notification) - 1) struct lttng_event_notifier_notification { int notification_fd; @@ -60,11 +64,11 @@ void capture_enum(struct lttng_msgpack_writer *writer, static int64_t capture_sequence_element_signed(uint8_t *ptr, - const struct lttng_integer_type *type) + const struct lttng_ust_type_integer *integer_type) { int64_t value; - unsigned int size = type->size; - bool byte_order_reversed = type->reverse_byte_order; + unsigned int size = integer_type->size; + bool byte_order_reversed = integer_type->reverse_byte_order; switch (size) { case 8: @@ -109,11 +113,11 @@ int64_t capture_sequence_element_signed(uint8_t *ptr, static uint64_t capture_sequence_element_unsigned(uint8_t *ptr, - const struct lttng_integer_type *type) + const struct lttng_ust_type_integer *integer_type) { uint64_t value; - unsigned int size = type->size; - bool byte_order_reversed = type->reverse_byte_order; + unsigned int size = integer_type->size; + bool byte_order_reversed = integer_type->reverse_byte_order; switch (size) { case 8: @@ -160,8 +164,8 @@ static void capture_sequence(struct lttng_msgpack_writer *writer, struct lttng_interpreter_output *output) { - const struct lttng_integer_type *integer_type; - const struct lttng_type *nested_type; + const struct lttng_ust_type_integer *integer_type; + const struct lttng_ust_type_common *nested_type; uint8_t *ptr; bool signedness; int i; @@ -170,13 +174,13 @@ void capture_sequence(struct lttng_msgpack_writer *writer, ptr = (uint8_t *) output->u.sequence.ptr; nested_type = output->u.sequence.nested_type; - switch (nested_type->atype) { - case atype_integer: - integer_type = &nested_type->u.integer; + switch (nested_type->type) { + case lttng_ust_type_integer: + integer_type = lttng_ust_get_type_integer(nested_type); break; - case atype_enum_nestable: + case lttng_ust_type_enum: /* Treat enumeration as an integer. */ - integer_type = &nested_type->u.enum_nestable.container_type->u.integer; + integer_type = lttng_ust_get_type_integer(lttng_ust_get_type_enum(nested_type)->container_type); break; default: /* Capture of array of non-integer are not supported. */ @@ -210,19 +214,19 @@ void capture_sequence(struct lttng_msgpack_writer *writer, static void notification_init(struct lttng_event_notifier_notification *notif, - struct lttng_event_notifier *event_notifier) + struct lttng_ust_event_notifier *event_notifier) { struct lttng_msgpack_writer *writer = ¬if->writer; - notif->event_notifier_token = event_notifier->user_token; - notif->notification_fd = event_notifier->group->notification_fd; + notif->event_notifier_token = event_notifier->priv->parent.user_token; + notif->notification_fd = event_notifier->priv->group->notification_fd; 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); - lttng_msgpack_begin_array(writer, event_notifier->num_captures); + lttng_msgpack_begin_array(writer, event_notifier->priv->num_captures); notif->has_captures = true; } } @@ -266,10 +270,10 @@ void notification_append_empty_capture( lttng_msgpack_write_nil(¬if->writer); } -static void record_error(struct lttng_event_notifier *event_notifier) +static void record_error(struct lttng_ust_event_notifier *event_notifier) { struct lttng_event_notifier_group *event_notifier_group = - event_notifier->group; + event_notifier->priv->group; struct lttng_counter *error_counter; size_t dimension_index[1]; int ret; @@ -287,7 +291,7 @@ static void record_error(struct lttng_event_notifier *event_notifier) if (!error_counter) return; - dimension_index[0] = event_notifier->error_counter_index; + dimension_index[0] = event_notifier->priv->error_counter_index; ret = event_notifier_group->error_counter->ops->counter_add( error_counter->counter, dimension_index, 1); if (ret) @@ -296,17 +300,17 @@ static void record_error(struct lttng_event_notifier *event_notifier) static void notification_send(struct lttng_event_notifier_notification *notif, - struct lttng_event_notifier *event_notifier) + struct lttng_ust_event_notifier *event_notifier) { ssize_t ret; size_t content_len; int iovec_count = 1; - struct lttng_ust_event_notifier_notification ust_notif = {0}; + struct lttng_ust_abi_event_notifier_notification ust_notif = {0}; struct iovec iov[2]; assert(notif); - ust_notif.token = event_notifier->user_token; + ust_notif.token = event_notifier->priv->parent.user_token; /* * Prepare sending the notification from multiple buffers using an @@ -356,8 +360,9 @@ void notification_send(struct lttng_event_notifier_notification *notif, } void lttng_event_notifier_notification_send( - struct lttng_event_notifier *event_notifier, - const char *stack_data) + struct lttng_ust_event_notifier *event_notifier, + const char *stack_data, + struct lttng_ust_notification_ctx *notif_ctx) { /* * This function is called from the probe, we must do dynamic @@ -367,8 +372,8 @@ void lttng_event_notifier_notification_send( notification_init(¬if, event_notifier); - if (caa_unlikely(!cds_list_empty(&event_notifier->capture_bytecode_runtime_head))) { - struct lttng_bytecode_runtime *capture_bc_runtime; + if (caa_unlikely(notif_ctx->eval_capture)) { + struct lttng_ust_bytecode_runtime *capture_bc_runtime; /* * Iterate over all the capture bytecodes. If the interpreter @@ -376,12 +381,12 @@ void lttng_event_notifier_notification_send( * `output` parameter to the capture buffer. If the interpreter * fails, append an empty capture to the buffer. */ - cds_list_for_each_entry(capture_bc_runtime, - &event_notifier->capture_bytecode_runtime_head, node) { + cds_list_for_each_entry_rcu(capture_bc_runtime, + &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, &output) & LTTNG_INTERPRETER_RECORD_FLAG) + if (capture_bc_runtime->interpreter_func(capture_bc_runtime, + stack_data, &output) == LTTNG_UST_BYTECODE_INTERPRETER_OK) notification_append_capture(¬if, &output); else notification_append_empty_capture(¬if);