X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Fust-events.h;h=2f00440bdc173dbced449363e252860c190cd178;hb=457a6b5879a7dd8cdd1b5b22b20d028a59489159;hp=45358d422ec9c54d972c5e16c5379790b97d9855;hpb=7c2caf2b9750e82bf14e6ff39e517afef593c2fe;p=lttng-ust.git

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index 45358d42..2f00440b 100644
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -19,6 +19,7 @@
  */
 
 #include <urcu/list.h>
+#include <urcu/hlist.h>
 #include <uuid/uuid.h>
 #include <stdint.h>
 #include <lttng/ust-abi.h>
@@ -183,9 +184,33 @@ struct lttng_ctx {
 	unsigned int allocated_fields;
 };
 
-struct tracepoint_loglevel_entry  {
-	const char *identifier;
-	long value;
+/*
+ * Entry describing a per-session active wildcard, along with the event
+ * attribute and channel information configuring the events that need to
+ * be enabled.
+ */
+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 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];
 };
 
 struct lttng_event_desc {
@@ -194,21 +219,24 @@ struct lttng_event_desc {
 	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 */
 };
 
-struct tp_loglevel_iter {
-	struct lttng_probe_desc *desc;
-	const struct tracepoint_loglevel_entry *loglevel;
+struct tp_list_entry {
+	struct lttng_ust_tracepoint_iter tp;
+	struct cds_list_head head;
+};
+
+struct lttng_ust_tracepoint_list {
+	struct tp_list_entry *iter;
+	struct cds_list_head head;
 };
 
 struct ust_pending_probe;
@@ -228,6 +256,7 @@ struct ltt_event {
 	union {
 	} u;
 	struct cds_list_head list;		/* Event list */
+	struct cds_list_head wildcard_list;	/* Event list for wildcard */
 	struct ust_pending_probe *pending_probe;
 	unsigned int metadata_dumped:1;
 };
@@ -241,14 +270,14 @@ struct ltt_channel_ops {
 				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,
@@ -304,6 +333,7 @@ struct ltt_session {
 	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 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 */
@@ -327,16 +357,16 @@ struct ltt_channel *ltt_channel_create(struct ltt_session *session,
 				       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,
@@ -378,4 +408,20 @@ const struct lttng_ust_lib_ring_buffer_client_cb *lttng_client_callbacks_overwri
 
 struct ltt_transport *ltt_transport_find(const char *name);
 
+int ltt_probes_get_event_list(struct lttng_ust_tracepoint_list *list);
+void ltt_probes_prune_event_list(struct lttng_ust_tracepoint_list *list);
+struct lttng_ust_tracepoint_iter *
+	lttng_ust_tracepoint_list_get_iter_next(struct lttng_ust_tracepoint_list *list);
+
+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 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 */