#include <lttng/ust-events.h>
+#include <ust-helper.h>
#include "ust-context-provider.h"
struct lttng_ust_abi_obj;
struct lttng_event_enabler {
struct lttng_enabler base;
struct cds_list_head node; /* per-session list of enablers */
- struct lttng_channel *chan;
+ struct lttng_ust_channel_buffer *chan;
/*
* Unused, but kept around to make it explicit that the tracer can do
* it.
struct lttng_ust_event_common_private {
struct lttng_ust_event_common *pub; /* Public event interface */
- const struct lttng_ust_event_desc *desc;
+ struct lttng_ust_event_desc *desc;
/* Backward references: list of lttng_enabler_ref (ref to enablers) */
struct cds_list_head enablers_ref_head;
int registered; /* has reg'd tracepoint probe */
struct lttng_ust_event_recorder *pub; /* Public event interface */
struct cds_list_head node; /* Event recorder list */
struct cds_hlist_node hlist; /* Hash table of event recorders */
+ struct lttng_ust_ctx *ctx;
};
struct lttng_ust_event_notifier_private {
};
struct lttng_enum {
- const struct lttng_ust_enum_desc *desc;
+ struct lttng_ust_enum_desc *desc;
struct lttng_ust_session *session;
struct cds_list_head node; /* Enum list in session */
struct cds_hlist_node hlist; /* Session ht of enums */
uint64_t id; /* Enumeration ID in sessiond */
};
+struct lttng_ust_shm_handle;
+
struct lttng_ust_channel_ops_private {
struct lttng_ust_channel_ops *pub; /* Public channels ops interface */
- struct lttng_channel *(*channel_create)(const char *name,
+ struct lttng_ust_channel_buffer *(*channel_create)(const char *name,
void *buf_addr,
size_t subbuf_size, size_t num_subbuf,
unsigned int switch_timer_interval,
uint32_t chan_id,
const int *stream_fds, int nr_stream_fds,
int64_t blocking_timeout);
- void (*channel_destroy)(struct lttng_channel *chan);
+ void (*channel_destroy)(struct lttng_ust_channel_buffer *chan);
/*
* packet_avail_size returns the available size in the current
* packet. Note that the size returned is only a hint, since it
struct lttng_ust_shm_handle *handle);
};
+struct lttng_ust_channel_common_private {
+ struct lttng_ust_channel_common *pub; /* Public channel interface */
+
+ int objd; /* Object associated with channel. */
+ int tstate:1; /* Transient enable state */
+};
+
+struct lttng_ust_channel_buffer_private {
+ struct lttng_ust_channel_common_private parent;
+
+ struct lttng_ust_channel_buffer *pub; /* Public channel buffer interface */
+ struct cds_list_head node; /* Channel list in session */
+ int header_type; /* 0: unset, 1: compact, 2: large */
+ unsigned int id; /* Channel ID */
+ enum lttng_ust_abi_chan_type type;
+ struct lttng_ust_ctx *ctx;
+ unsigned char uuid[LTTNG_UST_UUID_LEN]; /* Trace session unique ID */
+};
+
+/*
+ * IMPORTANT: this structure is part of the ABI between the consumer
+ * daemon and the UST library within traced applications. Changing it
+ * breaks the UST communication protocol.
+ *
+ * TODO: remove unused fields on next UST communication protocol
+ * breaking update.
+ */
+struct lttng_ust_abi_channel_config {
+ void *unused1;
+ int unused2;
+ void *unused3;
+ void *unused4;
+ int unused5;
+ struct cds_list_head unused6;
+ void *unused7;
+ int unused8;
+ void *unused9;
+
+ /* Channel ID */
+ unsigned int id;
+ enum lttng_ust_abi_chan_type unused10;
+ unsigned char uuid[LTTNG_UST_UUID_LEN]; /* Trace session unique ID */
+ int unused11:1;
+};
+
+static inline
+struct lttng_ust_type_integer *lttng_ust_get_type_integer(struct lttng_ust_type_common *type)
+{
+ if (type->type != lttng_ust_type_integer)
+ return NULL;
+ return caa_container_of(type, struct lttng_ust_type_integer, parent);
+}
+
+static inline
+struct lttng_ust_type_float *lttng_ust_get_type_float(struct lttng_ust_type_common *type)
+{
+ if (type->type != lttng_ust_type_float)
+ return NULL;
+ return caa_container_of(type, struct lttng_ust_type_float, parent);
+}
+
+static inline
+struct lttng_ust_type_string *lttng_ust_get_type_string(struct lttng_ust_type_common *type)
+{
+ if (type->type != lttng_ust_type_string)
+ return NULL;
+ return caa_container_of(type, struct lttng_ust_type_string, parent);
+}
+
+static inline
+struct lttng_ust_type_enum *lttng_ust_get_type_enum(struct lttng_ust_type_common *type)
+{
+ if (type->type != lttng_ust_type_enum)
+ return NULL;
+ return caa_container_of(type, struct lttng_ust_type_enum, parent);
+}
+
+static inline
+struct lttng_ust_type_array *lttng_ust_get_type_array(struct lttng_ust_type_common *type)
+{
+ if (type->type != lttng_ust_type_array)
+ return NULL;
+ return caa_container_of(type, struct lttng_ust_type_array, parent);
+}
+
+static inline
+struct lttng_ust_type_sequence *lttng_ust_get_type_sequence(struct lttng_ust_type_common *type)
+{
+ if (type->type != lttng_ust_type_sequence)
+ return NULL;
+ return caa_container_of(type, struct lttng_ust_type_sequence, parent);
+}
+
+static inline
+struct lttng_ust_type_struct *lttng_ust_get_type_struct(struct lttng_ust_type_common *type)
+{
+ if (type->type != lttng_ust_type_struct)
+ return NULL;
+ return caa_container_of(type, struct lttng_ust_type_struct, parent);
+}
+
+/* Create dynamically allocated types. */
+static inline
+struct lttng_ust_type_common *lttng_ust_create_type_integer(unsigned int size,
+ unsigned short alignment, bool signedness, unsigned int byte_order,
+ unsigned int base)
+{
+ struct lttng_ust_type_integer *integer_type;
+
+ integer_type = zmalloc(sizeof(struct lttng_ust_type_integer));
+ if (!integer_type)
+ return NULL;
+ integer_type->parent.type = lttng_ust_type_integer;
+ integer_type->struct_size = sizeof(struct lttng_ust_type_integer);
+ integer_type->size = size;
+ integer_type->alignment = alignment;
+ integer_type->signedness = signedness;
+ integer_type->reverse_byte_order = byte_order != BYTE_ORDER;
+ integer_type->base = base;
+ return (struct lttng_ust_type_common *) integer_type;
+}
+
+static inline
+struct lttng_ust_type_common *lttng_ust_create_type_array_text(unsigned int length)
+{
+ struct lttng_ust_type_array *array_type;
+
+ array_type = zmalloc(sizeof(struct lttng_ust_type_array));
+ if (!array_type)
+ return NULL;
+ array_type->parent.type = lttng_ust_type_array;
+ array_type->struct_size = sizeof(struct lttng_ust_type_array);
+ array_type->length = length;
+ array_type->alignment = 0;
+ array_type->encoding = lttng_ust_string_encoding_UTF8;
+ array_type->elem_type = lttng_ust_create_type_integer(sizeof(char) * CHAR_BIT,
+ lttng_alignof(char) * CHAR_BIT, lttng_is_signed_type(char),
+ BYTE_ORDER, 10);
+ if (!array_type->elem_type)
+ goto error_elem;
+ return (struct lttng_ust_type_common *) array_type;
+
+error_elem:
+ free(array_type);
+ return NULL;
+}
+
+/*
+ * Destroy dynamically allocated types, including nested types.
+ * For enumerations, it does not free the enumeration mapping description.
+ */
+static inline
+void lttng_ust_destroy_type(struct lttng_ust_type_common *type)
+{
+ if (!type)
+ return;
+
+ switch (type->type) {
+ case lttng_ust_type_integer:
+ case lttng_ust_type_string:
+ case lttng_ust_type_float:
+ case lttng_ust_type_dynamic:
+ free(type);
+ break;
+ case lttng_ust_type_enum:
+ {
+ struct lttng_ust_type_enum *enum_type = (struct lttng_ust_type_enum *) type;
+
+ lttng_ust_destroy_type(enum_type->container_type);
+ free(enum_type);
+ break;
+ }
+ case lttng_ust_type_array:
+ {
+ struct lttng_ust_type_array *array_type = (struct lttng_ust_type_array *) type;
+
+ lttng_ust_destroy_type(array_type->elem_type);
+ free(array_type);
+ break;
+ }
+ case lttng_ust_type_sequence:
+ {
+ struct lttng_ust_type_sequence *sequence_type = (struct lttng_ust_type_sequence *) type;
+
+ lttng_ust_destroy_type(sequence_type->elem_type);
+ free(sequence_type);
+ break;
+ }
+ case lttng_ust_type_struct:
+ {
+ struct lttng_ust_type_struct *struct_type = (struct lttng_ust_type_struct *) type;
+ unsigned int i;
+
+ for (i = 0; i < struct_type->nr_fields; i++)
+ lttng_ust_destroy_type(struct_type->fields[i]->type);
+ free(struct_type);
+ break;
+ }
+ default:
+ abort();
+ }
+}
+
static inline
struct lttng_enabler *lttng_event_enabler_as_enabler(
struct lttng_event_enabler *event_enabler)
struct lttng_event_enabler *lttng_event_enabler_create(
enum lttng_enabler_format_type format_type,
struct lttng_ust_abi_event *event_param,
- struct lttng_channel *chan);
+ struct lttng_ust_channel_buffer *chan);
/*
* Destroy a `struct lttng_event_enabler` object.
* event_notifier enabler) to ensure each is linked to the provided instance.
*/
__attribute__((visibility("hidden")))
-void lttng_enabler_link_bytecode(const struct lttng_ust_event_desc *event_desc,
+void lttng_enabler_link_bytecode(struct lttng_ust_event_desc *event_desc,
struct lttng_ust_ctx **ctx,
struct cds_list_head *instance_bytecode_runtime_head,
struct cds_list_head *enabler_bytecode_runtime_head);
void lttng_handle_pending_statedump(void *owner);
__attribute__((visibility("hidden")))
-struct lttng_channel *lttng_channel_create(struct lttng_ust_session *session,
- const char *transport_name,
- void *buf_addr,
- size_t subbuf_size, size_t num_subbuf,
- unsigned int switch_timer_interval,
- unsigned int read_timer_interval,
- int **shm_fd, int **wait_fd,
- uint64_t **memory_map_size,
- struct lttng_channel *chan_priv_init);
-
-__attribute__((visibility("hidden")))
-int lttng_channel_enable(struct lttng_channel *channel);
+int lttng_channel_enable(struct lttng_ust_channel_common *lttng_channel);
__attribute__((visibility("hidden")))
-int lttng_channel_disable(struct lttng_channel *channel);
+int lttng_channel_disable(struct lttng_ust_channel_common *lttng_channel);
__attribute__((visibility("hidden")))
void lttng_transport_register(struct lttng_transport *transport);
__attribute__((visibility("hidden")))
struct lttng_enum *lttng_ust_enum_get_from_desc(struct lttng_ust_session *session,
- const struct lttng_ust_enum_desc *enum_desc);
+ struct lttng_ust_enum_desc *enum_desc);
__attribute__((visibility("hidden")))
int lttng_abi_create_root_handle(void);
__attribute__((visibility("hidden")))
void lttng_ust_abi_objd_table_owner_cleanup(void *owner);
+__attribute__((visibility("hidden")))
+struct lttng_ust_channel_buffer *lttng_ust_alloc_channel_buffer(void);
+
+__attribute__((visibility("hidden")))
+void lttng_ust_free_channel_common(struct lttng_ust_channel_common *chan);
+
#endif /* _LTTNG_UST_EVENTS_INTERNAL_H */
projects / lttng-ust.git / blobdiff