Backported to glibc 2.8

[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 07af0f1eeb96ac74d57aa87b679989e6570d6572..bac5c328bf4f9169256d413723f0083144a6fc88 100644 (file)
--- a/src/bin/lttng-sessiond/trace-ust.h
+++ b/src/bin/lttng-sessiond/trace-ust.h
@@ -49,6 +49,7 @@ struct ltt_ust_event {
        unsigned int enabled;
        struct lttng_ust_event attr;
        struct lttng_ht_node_str node;
+       char *filter_expression;
        struct lttng_ust_filter_bytecode *filter;
        struct lttng_event_exclusion *exclusion;
 };
@@ -76,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;
        /* 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
@@ -107,6 +109,9 @@ struct ltt_ust_session {
        unsigned int snapshot_mode;
        unsigned int has_non_default_channel;
        unsigned int live_timer_interval;       /* usec */
+
+       /* Metadata channel attributes. */
+       struct lttng_ust_channel_attr metadata_attr;
 };
 
 /*
@@ -159,6 +164,7 @@ struct ltt_ust_channel *trace_ust_find_channel_by_name(struct lttng_ht *ht,
 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_event *trace_ust_create_event(struct lttng_event *ev,
+               char *filter_expression,
                struct lttng_filter_bytecode *filter,
                struct lttng_event_exclusion *exclusion);
 struct ltt_ust_context *trace_ust_create_context(
@@ -205,6 +211,7 @@ struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *attr)
 }
 static inline
 struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev,
+               const char *filter_expression,
                struct lttng_filter_bytecode *filter,
                struct lttng_event_exclusion *exclusion)
 {