Add event exclusion data to ltt_ust_event structure

[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 1c37b3f0f1bb977a49429f31f2ce9f47a7f74e2b..06d0202d1d1fdb323f94baafd8577c8e58714f29 100644 (file)
--- a/src/bin/lttng-sessiond/trace-ust.h
+++ b/src/bin/lttng-sessiond/trace-ust.h
@@ -27,12 +27,14 @@
 #include <common/defaults.h>
 
 #include "consumer.h"
+#include "jul.h"
 #include "ust-ctl.h"
 
 struct ltt_ust_ht_key {
        const char *name;
        const struct lttng_filter_bytecode *filter;
        enum lttng_ust_loglevel_type loglevel;
+       const struct lttng_event_exclusion *exclusion;
 };
 
 /* Context hash table nodes */
@@ -48,6 +50,7 @@ struct ltt_ust_event {
        struct lttng_ust_event attr;
        struct lttng_ht_node_str node;
        struct lttng_ust_filter_bytecode *filter;
+       const struct lttng_event_exclusion *exclusion;
 };
 
 /* UST channel */
@@ -84,6 +87,7 @@ 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;
        /* UID/GID of the user owning the session */
        uid_t uid;
        gid_t gid;
@@ -111,6 +115,7 @@ struct ltt_ust_session {
        unsigned int output_traces;
        unsigned int snapshot_mode;
        unsigned int has_non_default_channel;
+       unsigned int live_timer_interval;       /* usec */
 };
 
 /*