X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.h;h=b1b200f1d188d6e20b4c28c006bc178467cd5e9a;hp=4a818df1a06ab996d6510d0d6e785ac40f20b004;hb=51755dc8c7607233c5f62b7931326d7d95df7910;hpb=f76d886f794c80a3c761613532d6a9a72a918cb8

diff --git a/src/bin/lttng-sessiond/trace-ust.h b/src/bin/lttng-sessiond/trace-ust.h
index 4a818df1a..b1b200f1d 100644
--- a/src/bin/lttng-sessiond/trace-ust.h
+++ b/src/bin/lttng-sessiond/trace-ust.h
@@ -51,7 +51,7 @@ struct ltt_ust_event {
 	struct lttng_ust_event attr;
 	struct lttng_ht_node_str node;
 	char *filter_expression;
-	struct lttng_ust_filter_bytecode *filter;
+	struct lttng_filter_bytecode *filter;
 	struct lttng_event_exclusion *exclusion;
 	/*
 	 * An internal event is an event which was created by the session daemon
@@ -66,6 +66,11 @@ struct ltt_ust_event {
 struct ltt_ust_channel {
 	uint64_t id;	/* unique id per session. */
 	unsigned int enabled;
+	/*
+	 * A UST channel can be part of a userspace sub-domain such as JUL,
+	 * Log4j, Python.
+	 */
+	enum lttng_domain_type domain;
 	char name[LTTNG_UST_SYM_NAME_LEN];
 	struct lttng_ust_channel_attr attr;
 	struct lttng_ht *ctx;
@@ -189,7 +194,8 @@ struct agent *trace_ust_find_agent(struct ltt_ust_session *session,
  * Create functions malloc() the data structure.
  */
 struct ltt_ust_session *trace_ust_create_session(uint64_t session_id);
-struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *attr);
+struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *attr,
+		enum lttng_domain_type domain);
 struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev,
 		char *filter_expression,
 		struct lttng_filter_bytecode *filter,
@@ -243,7 +249,8 @@ struct ltt_ust_session *trace_ust_create_session(unsigned int session_id)
 	return NULL;
 }
 static inline
-struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *attr)
+struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *attr,
+		enum lttng_domain_type domain)
 {
 	return NULL;
 }