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.
uint64_t num_captures;
};
-enum lttng_ust_bytecode_node_type {
- LTTNG_UST_BYTECODE_NODE_TYPE_FILTER,
- LTTNG_UST_BYTECODE_NODE_TYPE_CAPTURE,
+enum lttng_ust_bytecode_type {
+ LTTNG_UST_BYTECODE_TYPE_FILTER,
+ LTTNG_UST_BYTECODE_TYPE_CAPTURE,
};
struct lttng_ust_bytecode_node {
- enum lttng_ust_bytecode_node_type type;
+ enum lttng_ust_bytecode_type type;
struct cds_list_head node;
struct lttng_enabler *enabler;
struct {
} bc;
};
+/*
+ * Bytecode interpreter return value.
+ */
+enum lttng_ust_bytecode_interpreter_ret {
+ LTTNG_UST_BYTECODE_INTERPRETER_ERROR = -1,
+ LTTNG_UST_BYTECODE_INTERPRETER_OK = 0,
+};
+
+struct lttng_interpreter_output;
+struct lttng_ust_bytecode_runtime_private;
+
+enum lttng_ust_bytecode_filter_result {
+ LTTNG_UST_BYTECODE_FILTER_ACCEPT = 0,
+ LTTNG_UST_BYTECODE_FILTER_REJECT = 1,
+};
+
+struct lttng_ust_bytecode_filter_ctx {
+ enum lttng_ust_bytecode_filter_result result;
+};
+
struct lttng_ust_excluder_node {
struct cds_list_head node;
struct lttng_enabler *enabler;
int notification_fd;
struct cds_list_head node; /* Event notifier group handle list */
struct cds_list_head enablers_head;
- struct cds_list_head event_notifiers_head; /* list of event_notifiers */
+ struct cds_list_head event_notifiers_head; /* list of event_notifiers */
struct lttng_ust_event_notifier_ht event_notifiers_ht; /* hashtable of event_notifiers */
- struct lttng_ust_ctx *ctx; /* contexts for filters. */
+ struct lttng_ust_ctx *ctx; /* contexts for filters. */
struct lttng_counter *error_counter;
size_t error_counter_len;
struct lttng_transport {
char *name;
struct cds_list_head node;
- struct lttng_ust_channel_ops ops;
+ struct lttng_ust_channel_buffer_ops ops;
const struct lttng_ust_lib_ring_buffer_config *client_config;
};
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 */
+ int registered; /* has reg'd tracepoint probe */
uint64_t user_token;
+
+ int has_enablers_without_filter_bytecode;
+ /* list of struct lttng_ust_bytecode_runtime, sorted by seqnum */
+ struct cds_list_head filter_bytecode_runtime_head;
};
struct lttng_ust_event_recorder_private {
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 {
uint64_t error_counter_index;
struct cds_list_head node; /* Event notifier list */
struct cds_hlist_node hlist; /* Hash table of event notifiers */
+ struct cds_list_head capture_bytecode_runtime_head;
};
-struct lttng_ust_bytecode_runtime_private {
- struct bytecode_runtime *pub; /* Public bytecode runtime interface */
-
+struct lttng_ust_bytecode_runtime {
+ enum lttng_ust_bytecode_type type;
struct lttng_ust_bytecode_node *bc;
int link_failed;
+ int (*interpreter_func)(struct lttng_ust_bytecode_runtime *bytecode_runtime,
+ const char *interpreter_stack_data,
+ void *ctx);
+ struct cds_list_head node; /* list of bytecode runtime in event */
/*
* Pointer to a URCU-protected pointer owned by an `struct
* lttng_session`or `struct lttng_event_notifier_group`.
struct cds_list_head events_head; /* list of events */
struct cds_list_head node; /* Session list */
- /* New UST 2.1 */
/* List of enablers */
struct cds_list_head enablers_head;
struct lttng_ust_event_ht events_ht; /* ht of events */
void *owner; /* object owner */
int tstate:1; /* Transient enable state */
- /* New UST 2.4 */
int statedump_pending:1;
- /* New UST 2.8 */
struct lttng_ust_enum_ht enums_ht; /* ht of enumerations */
struct cds_list_head enums_head;
- struct lttng_ust_ctx *ctx; /* contexts for filters. */
+ struct lttng_ust_ctx *ctx; /* contexts for filters. */
+
+ unsigned char uuid[LTTNG_UST_UUID_LEN]; /* Trace session unique ID */
+ bool uuid_set; /* Is uuid set ? */
};
struct lttng_enum {
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 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_channel_ops_private {
- struct lttng_ust_channel_ops *pub; /* Public channels ops interface */
+struct lttng_ust_shm_handle;
- struct lttng_channel *(*channel_create)(const char *name,
+struct lttng_ust_channel_buffer_ops_private {
+ struct lttng_ust_channel_buffer_ops *pub; /* Public channel buffer ops interface */
+
+ 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)
{
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.
const char *counter_transport_name,
size_t number_dimensions, const struct lttng_counter_dimension *dimensions);
-#ifdef HAVE_PERF_EVENT
+#ifdef HAVE_LINUX_PERF_EVENT_H
__attribute__((visibility("hidden")))
int lttng_add_perf_counter_to_ctx(uint32_t type,
__attribute__((visibility("hidden")))
void lttng_perf_counter_exit(void);
-#else /* #ifdef HAVE_PERF_EVENT */
+#else /* #ifdef HAVE_LINUX_PERF_EVENT_H */
static inline
int lttng_add_perf_counter_to_ctx(uint32_t type,
void lttng_perf_counter_exit(void)
{
}
-#endif /* #else #ifdef HAVE_PERF_EVENT */
+#endif /* #else #ifdef HAVE_LINUX_PERF_EVENT_H */
__attribute__((visibility("hidden")))
int lttng_probes_get_event_list(struct lttng_ust_tracepoint_list *list);
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")))
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);
+
+__attribute__((visibility("hidden")))
+int lttng_ust_interpret_event_filter(struct lttng_ust_event_common *event,
+ const char *interpreter_stack_data,
+ void *filter_ctx);
+
+__attribute__((visibility("hidden")))
+int lttng_ust_session_uuid_validate(struct lttng_ust_session *session,
+ unsigned char *uuid);
+
#endif /* _LTTNG_UST_EVENTS_INTERNAL_H */
projects / lttng-ust.git / blobdiff