X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.h;h=674c2e29247c4f4d1ba3779bbefbcbadc72318f3;hb=770f96f4b3f8e4c181fd6ce94266392a480ee26a;hp=bac5c328bf4f9169256d413723f0083144a6fc88;hpb=14fb1ebe1000da2c3ccca45e7e97ad6637947cfe;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/trace-ust.h b/src/bin/lttng-sessiond/trace-ust.h
index bac5c328b..674c2e292 100644
--- a/src/bin/lttng-sessiond/trace-ust.h
+++ b/src/bin/lttng-sessiond/trace-ust.h
@@ -27,7 +27,7 @@
 #include <common/defaults.h>
 
 #include "consumer.h"
-#include "jul.h"
+#include "agent.h"
 #include "ust-ctl.h"
 
 struct ltt_ust_ht_key {
@@ -78,20 +78,14 @@ struct ltt_ust_domain_global {
 struct ltt_ust_session {
 	uint64_t id;    /* Unique identifier of session */
 	struct ltt_ust_domain_global domain_global;
-	struct jul_domain domain_jul;
+	/* Hash table of agent indexed by agent domain. */
+	struct lttng_ht *agents;
 	/* UID/GID of the user owning the session */
 	uid_t uid;
 	gid_t gid;
 	/* Is the session active meaning has is been started or stopped. */
 	unsigned int active:1;
-	/*
-	 * Two consumer_output object are needed where one is for the current
-	 * output object and the second one is the temporary object used to store
-	 * URI being set by the lttng_set_consumer_uri call. Once
-	 * lttng_enable_consumer is called, the two pointers are swapped.
-	 */
 	struct consumer_output *consumer;
-	struct consumer_output *tmp_consumer;
 	/* Sequence number for filters so the tracer knows the ordering. */
 	uint64_t filter_seq_num;
 	/* This indicates which type of buffer this session is set for. */
@@ -157,6 +151,8 @@ struct ltt_ust_event *trace_ust_find_event(struct lttng_ht *ht,
 		struct lttng_event_exclusion *exclusion);
 struct ltt_ust_channel *trace_ust_find_channel_by_name(struct lttng_ht *ht,
 		char *name);
+struct agent *trace_ust_find_agent(struct ltt_ust_session *session,
+		enum lttng_domain_type domain_type);
 
 /*
  * Create functions malloc() the data structure.
@@ -169,6 +165,8 @@ struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev,
 		struct lttng_event_exclusion *exclusion);
 struct ltt_ust_context *trace_ust_create_context(
 		struct lttng_event_context *ctx);
+int trace_ust_match_context(struct ltt_ust_context *uctx,
+		struct lttng_event_context *ctx);
 void trace_ust_delete_channel(struct lttng_ht *ht,
 		struct ltt_ust_channel *channel);
 
@@ -237,6 +235,12 @@ struct ltt_ust_context *trace_ust_create_context(
 {
 	return NULL;
 }
+static inline
+int trace_ust_match_context(struct ltt_ust_context *uctx,
+		struct lttng_event_context *ctx)
+{
+	return 0;
+}
 static inline struct ltt_ust_event *trace_ust_find_event(struct lttng_ht *ht,
 		char *name, struct lttng_filter_bytecode *filter, int loglevel,
 		struct lttng_event_exclusion *exclusion)
@@ -249,6 +253,12 @@ void trace_ust_delete_channel(struct lttng_ht *ht,
 {
 	return;
 }
+static inline
+struct agent *trace_ust_find_agent(struct ltt_ust_session *session,
+		enum lttng_domain_type domain_type)
+{
+	return NULL;
+}
 
 #endif /* HAVE_LIBLTTNG_UST_CTL */