Refactor JUL to agent namespace

[lttng-tools.git] / src / bin / lttng-sessiond / trace-ust.h

diff --git a/src/bin/lttng-sessiond/trace-ust.h b/src/bin/lttng-sessiond/trace-ust.h
index 6a41f0f9fbcdf6994c9807d153e37051b513bcdc..d58e37121696e3a4fda50fe0990316de7950229b 100644 (file)
--- 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 {
@@ -77,12 +77,13 @@ struct ltt_ust_domain_global {
 /* UST session */
 struct ltt_ust_session {
        uint64_t id;    /* Unique identifier of session */
-       int start_trace;
        struct ltt_ust_domain_global domain_global;
-       struct jul_domain domain_jul;
+       struct agent agent;
        /* 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
@@ -168,6 +169,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);
 
@@ -236,6 +239,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)