unsigned int allocated_fields;
};
-struct tracepoint_loglevel_entry {
- const char *identifier;
- long value;
-};
-
/*
- * Entry describing an active loglevel, along with the event attribute
- * and channel information configuring the events that need to be
- * enabled.
+ * Entry describing a per-session active wildcard, along with the event
+ * attribute and channel information configuring the events that need to
+ * be enabled.
*/
-struct loglevel_entry {
- struct cds_hlist_node hlist;
+struct session_wildcard {
struct ltt_channel *chan;
struct lttng_ctx *ctx; /* TODO */
struct lttng_ust_event event_param;
struct cds_list_head events; /* list of events enabled */
- struct cds_list_head list; /* per-session list of loglevels */
+ struct cds_list_head list; /* per-session list of wildcards */
+ struct cds_list_head session_list; /* node of session wildcard list */
+ struct wildcard_entry *entry;
unsigned int enabled:1;
+};
+
+/*
+ * Entry describing an active wildcard (per name) for all sessions.
+ */
+struct wildcard_entry {
+ /* node of global wildcards list */
+ struct cds_list_head list;
+ /* head of session list to which this wildcard apply */
+ struct cds_list_head session_list;
+ enum lttng_ust_loglevel_type loglevel_type;
+ int loglevel;
char name[0];
};
const struct lttng_event_ctx *ctx; /* context */
const struct lttng_event_field *fields; /* event payload */
unsigned int nr_fields;
- const struct tracepoint_loglevel_entry **loglevel;
+ const int **loglevel;
};
struct lttng_probe_desc {
const char *provider;
const struct lttng_event_desc **event_desc;
unsigned int nr_events;
- const struct tracepoint_loglevel_entry **loglevels;
- unsigned int nr_loglevels;
struct cds_list_head head; /* chain registered probes */
};
/*
* ltt_event structure is referred to by the tracing fast path. It must be
* kept small.
- * Note about loglevel_list: this list is only used to enable/disable
- * events on a per-loglevel basis. The events created internally by the
- * loglevel are only freed when the session is destroyed.
*/
struct ltt_event {
unsigned int id;
union {
} u;
struct cds_list_head list; /* Event list */
- struct cds_list_head loglevel_list; /* Event list for loglevel */
+ struct cds_list_head wildcard_list; /* Event list for wildcard */
struct ust_pending_probe *pending_probe;
unsigned int metadata_dumped:1;
};
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,
+ int **shm_fd, int **wait_fd,
+ uint64_t **memory_map_size,
struct ltt_channel *chan_priv_init);
void (*channel_destroy)(struct ltt_channel *ltt_chan);
struct lttng_ust_lib_ring_buffer *(*buffer_read_open)(struct channel *chan,
struct lttng_ust_shm_handle *handle,
- int *shm_fd, int *wait_fd,
- uint64_t *memory_map_size);
+ int **shm_fd, int **wait_fd,
+ uint64_t **memory_map_size);
void (*buffer_read_close)(struct lttng_ust_lib_ring_buffer *buf,
struct lttng_ust_shm_handle *handle);
int (*event_reserve)(struct lttng_ust_lib_ring_buffer_ctx *ctx,
struct ltt_channel *metadata; /* Metadata channel */
struct cds_list_head chan; /* Channel list head */
struct cds_list_head events; /* Event list head */
- struct cds_list_head loglevels; /* Loglevel list head */
+ struct cds_list_head wildcards; /* Wildcard list head */
struct cds_list_head list; /* Session list */
unsigned int free_chan_id; /* Next chan ID to allocate */
uuid_t uuid; /* Trace session unique ID */
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,
+ int **shm_fd, int **wait_fd,
+ uint64_t **memory_map_size,
struct ltt_channel *chan_priv_init);
struct ltt_channel *ltt_global_channel_create(struct ltt_session *session,
int overwrite, 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);
+ int **shm_fd, int **wait_fd,
+ uint64_t **memory_map_size);
int ltt_event_create(struct ltt_channel *chan,
struct lttng_ust_event *event_param,
struct lttng_ust_tracepoint_iter *
lttng_ust_tracepoint_list_get_iter_next(struct lttng_ust_tracepoint_list *list);
-struct loglevel_entry *get_loglevel(const char *name);
-struct loglevel_entry *add_loglevel(const char *name,
- struct ltt_channel *chan,
- struct lttng_ust_event *event_param);
-void _remove_loglevel(struct loglevel_entry *e);
-int ltt_loglevel_enable(struct loglevel_entry *loglevel);
-int ltt_loglevel_disable(struct loglevel_entry *loglevel);
-int ltt_loglevel_create(struct ltt_channel *chan,
+int ltt_wildcard_enable(struct session_wildcard *wildcard);
+int ltt_wildcard_disable(struct session_wildcard *wildcard);
+int ltt_wildcard_create(struct ltt_channel *chan,
struct lttng_ust_event *event_param,
- struct loglevel_entry **_entry);
+ struct session_wildcard **sl);
+int ltt_loglevel_match(const struct lttng_event_desc *desc,
+ enum lttng_ust_loglevel_type req_type,
+ int req_loglevel);
+void ltt_probes_create_wildcard_events(struct wildcard_entry *entry,
+ struct session_wildcard *wildcard);
#endif /* _LTTNG_UST_EVENTS_H */
projects / lttng-ust.git / blobdiff