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 f4244fdefae8196a2dadfc092e844dc90a626f05..06d0202d1d1fdb323f94baafd8577c8e58714f29 100644 (file)
--- a/src/bin/lttng-sessiond/trace-ust.h
+++ b/src/bin/lttng-sessiond/trace-ust.h
@@ -27,18 +27,21 @@
 #include <common/defaults.h>
 
 #include "consumer.h"
 #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;
 #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 */
 struct ltt_ust_context {
        struct lttng_ust_context ctx;
        struct lttng_ht_node_ulong node;
 };
 
 /* Context hash table nodes */
 struct ltt_ust_context {
        struct lttng_ust_context ctx;
        struct lttng_ht_node_ulong node;

+       struct cds_list_head list;

 };
 
 /* UST event */
 };
 
 /* UST event */


@@ -47,6 +50,7 @@ struct ltt_ust_event {
        struct lttng_ust_event attr;
        struct lttng_ht_node_str node;
        struct lttng_ust_filter_bytecode *filter;
        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 */
 };
 
 /* UST channel */


@@ -56,6 +60,7 @@ struct ltt_ust_channel {
        char name[LTTNG_UST_SYM_NAME_LEN];
        struct lttng_ust_channel_attr attr;
        struct lttng_ht *ctx;
        char name[LTTNG_UST_SYM_NAME_LEN];
        struct lttng_ust_channel_attr attr;
        struct lttng_ht *ctx;

+       struct cds_list_head ctx_list;

        struct lttng_ht *events;
        struct lttng_ht_node_str node;
        uint64_t tracefile_size;
        struct lttng_ht *events;
        struct lttng_ht_node_str node;
        uint64_t tracefile_size;


@@ -82,6 +87,7 @@ struct ltt_ust_session {
        uint64_t id;    /* Unique identifier of session */
        int start_trace;
        struct ltt_ust_domain_global domain_global;
        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;
        /* UID/GID of the user owning the session */
        uid_t uid;
        gid_t gid;


@@ -109,6 +115,7 @@ struct ltt_ust_session {
        unsigned int output_traces;
        unsigned int snapshot_mode;
        unsigned int has_non_default_channel;
        unsigned int output_traces;
        unsigned int snapshot_mode;
        unsigned int has_non_default_channel;

+       unsigned int live_timer_interval;       /* usec */

 };
 
 /*
 };
 
 /*