X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Flttng%2Fust-events.h;h=b74a176755af19f0bc12da564035a14db5bd3877;hb=54d2e210785c7d839615e4398455d11a75206fb7;hp=5867b124878c6993291591094d049634c5c699f1;hpb=1f18504e513d549093432516f983105ad5142808;p=lttng-ust.git

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index 5867b124..b74a1767 100644
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -189,19 +189,55 @@ struct tracepoint_loglevel_entry  {
 	long value;
 };
 
+struct loglevel_entry;
+
 /*
- * 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 loglevel, along with the event
+ * attribute and channel information configuring the events that need to
+ * be enabled.
+ */
+struct session_loglevel {
+	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 session_list;
+	struct loglevel_entry *entry;
+	unsigned int enabled:1;
+};
+
+/*
+ * Entry describing an active loglevel (per name) for all sessions.
  */
 struct loglevel_entry {
 	struct cds_hlist_node hlist;
+	struct cds_list_head session_list;
+	char name[0];
+};
+
+/*
+ * 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 loglevels */
+	struct cds_list_head list;	/* per-session list of wildcards */
+	struct cds_list_head session_list;
+	struct wildcard_entry *entry;
 	unsigned int enabled:1;
+};
+
+/*
+ * Entry describing an active wildcard (per name) for all sessions.
+ */
+struct wildcard_entry {
+	struct cds_list_head list;
+	struct cds_list_head session_list;
 	char name[0];
 };
 
@@ -254,6 +290,7 @@ struct ltt_event {
 	} 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;
 };
@@ -331,6 +368,7 @@ struct ltt_session {
 	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 */
@@ -411,14 +449,26 @@ 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 loglevel_entry *get_loglevel_value(int64_t value);
+struct session_loglevel *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);
+void _remove_loglevel(struct session_loglevel *loglevel);
+int ltt_loglevel_enable(struct session_loglevel *loglevel);
+int ltt_loglevel_disable(struct session_loglevel *loglevel);
 int ltt_loglevel_create(struct ltt_channel *chan,
 	struct lttng_ust_event *event_param,
-	struct loglevel_entry **_entry);
+	struct session_loglevel **sl);
+
+struct wildcard_entry *match_wildcard(const char *name);
+struct session_wildcard *add_wildcard(const char *name,
+	struct ltt_channel *chan,
+	struct lttng_ust_event *event_param);
+void _remove_wildcard(struct session_wildcard *wildcard);
+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);
 
 #endif /* _LTTNG_UST_EVENTS_H */