#include <assert.h>
#include <errno.h>
-#include <lttng/ust-events.h>
#include <lttng/ust-endian.h>
#include <usterr-signal-safe.h>
+#include "ust-events-internal.h"
#include "../libmsgpack/msgpack.h"
#include "lttng-bytecode.h"
-#include "share.h"
+#include "ust-share.h"
/*
* We want this write to be atomic AND non-blocking, meaning that we
* 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;
static
int64_t capture_sequence_element_signed(uint8_t *ptr,
- const struct lttng_integer_type *type)
+ 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:
static
uint64_t capture_sequence_element_unsigned(uint8_t *ptr,
- const struct lttng_integer_type *type)
+ 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:
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;
+ struct lttng_ust_type_integer *integer_type;
+ struct lttng_ust_type_common *nested_type;
uint8_t *ptr;
bool signedness;
int i;
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:
+ 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. */
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;
}
}
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;
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)
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
ust_notif.capture_buf_size = content_len;
/* Send all the buffers. */
- ret = patient_writev(notif->notification_fd, iov, iovec_count);
+ ret = ust_patient_writev(notif->notification_fd, iov, iovec_count);
if (ret == -1) {
if (errno == EAGAIN) {
record_error(event_notifier);
}
void lttng_event_notifier_notification_send(
- struct lttng_event_notifier *event_notifier,
+ struct lttng_ust_event_notifier *event_notifier,
const char *stack_data)
{
/*
notification_init(¬if, event_notifier);
if (caa_unlikely(!cds_list_empty(&event_notifier->capture_bytecode_runtime_head))) {
- struct lttng_bytecode_runtime *capture_bc_runtime;
+ struct lttng_ust_bytecode_runtime *capture_bc_runtime;
/*
* Iterate over all the capture bytecodes. If the interpreter