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

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index 4d1cace5..2f00440b 100644
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -184,38 +184,6 @@ struct lttng_ctx {
 	unsigned int allocated_fields;
 };
 
-struct tracepoint_loglevel_entry  {
-	const char *identifier;
-	long value;
-};
-
-struct loglevel_entry;
-
-/*
- * 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
@@ -227,7 +195,7 @@ struct session_wildcard {
 	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;
+	struct cds_list_head session_list; /* node of session wildcard list */
 	struct wildcard_entry *entry;
 	unsigned int enabled:1;
 };
@@ -236,8 +204,12 @@ struct session_wildcard {
  * 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];
 };
 
@@ -247,15 +219,13 @@ 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 */
 };
 
@@ -274,9 +244,6 @@ struct ust_pending_probe;
 /*
  * 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;
@@ -289,7 +256,6 @@ struct ltt_event {
 	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;
@@ -367,7 +333,6 @@ 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 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 */
@@ -448,27 +413,15 @@ 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);
 
-struct loglevel_entry *get_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 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 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);
+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 */