X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.h;h=8be813877410fb129a1b0ff3124693580c89161a;hp=f4244fdefae8196a2dadfc092e844dc90a626f05;hb=3d07185530211f3a650a7218199af44d4c77bf13;hpb=850767541647c102a299d7fbc39c97555ac70224 diff --git a/src/bin/lttng-sessiond/trace-ust.h b/src/bin/lttng-sessiond/trace-ust.h index f4244fdef..8be813877 100644 --- a/src/bin/lttng-sessiond/trace-ust.h +++ b/src/bin/lttng-sessiond/trace-ust.h @@ -27,18 +27,21 @@ #include #include "consumer.h" +#include "agent.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 */ struct ltt_ust_context { struct lttng_ust_context ctx; struct lttng_ht_node_ulong node; + struct cds_list_head list; }; /* UST event */ @@ -46,7 +49,9 @@ 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; }; /* UST channel */ @@ -56,21 +61,13 @@ struct ltt_ust_channel { 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; uint64_t tracefile_count; }; -/* UST Metadata */ -struct ltt_ust_metadata { - int handle; - struct lttng_ust_object_data *obj; - char pathname[PATH_MAX]; /* Trace file path name */ - struct lttng_ust_channel_attr attr; - struct lttng_ust_object_data *stream_obj; -}; - /* UST domain global (LTTNG_DOMAIN_UST) */ struct ltt_ust_domain_global { struct lttng_ht *channels; @@ -80,11 +77,14 @@ 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; + /* 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 @@ -109,6 +109,16 @@ struct ltt_ust_session { unsigned int output_traces; 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; + + /* + * Path where to keep the shared memory files. + */ + char root_shm_path[PATH_MAX]; + char shm_path[PATH_MAX]; }; /* @@ -150,9 +160,12 @@ int trace_ust_ht_match_event_by_name(struct cds_lfht_node *node, * Lookup functions. NULL is returned if not found. */ struct ltt_ust_event *trace_ust_find_event(struct lttng_ht *ht, - char *name, struct lttng_filter_bytecode *filter, int loglevel); + char *name, struct lttng_filter_bytecode *filter, int loglevel, + 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. @@ -160,10 +173,13 @@ 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, - struct lttng_filter_bytecode *filter); -struct ltt_ust_metadata *trace_ust_create_metadata(char *path); + char *filter_expression, + struct lttng_filter_bytecode *filter, + 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); @@ -172,7 +188,6 @@ void trace_ust_delete_channel(struct lttng_ht *ht, * it's applies. */ void trace_ust_destroy_session(struct ltt_ust_session *session); -void trace_ust_destroy_metadata(struct ltt_ust_metadata *metadata); void trace_ust_destroy_channel(struct ltt_ust_channel *channel); void trace_ust_destroy_event(struct ltt_ust_event *event); @@ -207,26 +222,17 @@ 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, - struct lttng_filter_bytecode *filter) -{ - return NULL; -} -static inline -struct ltt_ust_metadata *trace_ust_create_metadata(char *path) + const char *filter_expression, + struct lttng_filter_bytecode *filter, + struct lttng_event_exclusion *exclusion) { return NULL; } - static inline void trace_ust_destroy_session(struct ltt_ust_session *session) { } -static inline -void trace_ust_destroy_metadata(struct ltt_ust_metadata *metadata) -{ -} - static inline void trace_ust_destroy_channel(struct ltt_ust_channel *channel) { @@ -242,8 +248,15 @@ 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) + char *name, struct lttng_filter_bytecode *filter, int loglevel, + struct lttng_event_exclusion *exclusion) { return NULL; } @@ -253,6 +266,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 */