X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.h;h=252255710be6fcdc85196d64fa336f52d0b6f83e;hp=c6294d0a4626df9d51b8d602cb72ccbeb89d3cb6;hb=0c53bbada6234c946dcacf5cc3b9c7c0ab070810;hpb=d88aee689d5bd0067f362a323cb69c37717df59f diff --git a/src/bin/lttng-sessiond/ust-app.h b/src/bin/lttng-sessiond/ust-app.h index c6294d0a4..252255710 100644 --- a/src/bin/lttng-sessiond/ust-app.h +++ b/src/bin/lttng-sessiond/ust-app.h @@ -21,6 +21,8 @@ #include #include + +#include "jul.h" #include "trace-ust.h" #include "ust-registry.h" @@ -48,6 +50,7 @@ struct ust_app_ht_key { const char *name; const struct lttng_ust_filter_bytecode *filter; enum lttng_ust_loglevel_type loglevel; + const struct lttng_ust_event_exclusion *exclusion; }; /* @@ -102,6 +105,7 @@ struct ust_app_ctx { struct lttng_ust_context ctx; struct lttng_ust_object_data *obj; struct lttng_ht_node_ulong node; + struct cds_list_head list; }; struct ust_app_event { @@ -112,6 +116,7 @@ struct ust_app_event { char name[LTTNG_UST_SYM_NAME_LEN]; struct lttng_ht_node_str node; struct lttng_ust_filter_bytecode *filter; + struct lttng_ust_event_exclusion *exclusion; }; struct ust_app_stream { @@ -131,6 +136,8 @@ struct ust_app_channel { int is_sent; /* Unique key used to identify the channel on the consumer side. */ uint64_t key; + /* Id of the tracing channel set on creation. */ + uint64_t tracing_channel_id; /* Number of stream that this channel is expected to receive. */ unsigned int expected_stream_count; char name[LTTNG_UST_SYM_NAME_LEN]; @@ -139,12 +146,17 @@ struct ust_app_channel { struct ust_app_stream_list streams; /* Session pointer that owns this object. */ struct ust_app_session *session; - struct lttng_ht *ctx; - struct lttng_ht *events; /* - * UST event registry. The ONLY writer is the application thread. + * Contexts are kept in a hash table for fast lookup and in an ordered list + * so we are able to enable them on the tracer side in the same order the + * user added them. */ - struct ust_registry_channel registry; + struct lttng_ht *ctx; + struct cds_list_head ctx_list; + + struct lttng_ht *events; + uint64_t tracefile_size; + uint64_t tracefile_count; /* * Node indexed by channel name in the channels' hash table of a session. */ @@ -154,6 +166,8 @@ struct ust_app_channel { * ust_objd hash table in the ust_app object. */ struct lttng_ht_node_ulong ust_objd_node; + /* For delayed reclaim */ + struct rcu_head rcu_head; }; struct ust_app_session { @@ -168,21 +182,36 @@ struct ust_app_session { /* started: has the session been in started state at any time ? */ int started; /* allows detection of start vs restart. */ int handle; /* used has unique identifier for app session */ - int id; /* session unique identifier */ - struct ust_app_channel *metadata; - struct ust_registry_session registry; + + /* + * Tracing session ID. Multiple ust app session can have the same tracing + * session id making this value NOT unique to the object. + */ + uint64_t tracing_id; + uint64_t id; /* Unique session identifier */ struct lttng_ht *channels; /* Registered channels */ - struct lttng_ht_node_ulong node; + struct lttng_ht_node_u64 node; char path[PATH_MAX]; - /* UID/GID of the user owning the session */ + /* UID/GID of the application owning the session */ uid_t uid; gid_t gid; + /* Effective UID and GID. Same as the tracing session. */ + uid_t euid; + gid_t egid; struct cds_list_head teardown_node; /* * Once at least *one* session is created onto the application, the * corresponding consumer is set so we can use it on unregistration. */ struct consumer_output *consumer; + enum lttng_buffer_type buffer_type; + /* ABI of the session. Same value as the application. */ + uint32_t bits_per_long; + /* For delayed reclaim */ + struct rcu_head rcu_head; + /* If the channel's streams have to be outputed or not. */ + unsigned int output_traces; + unsigned int live_timer_interval; /* usec */ }; /* @@ -214,6 +243,8 @@ struct ust_app { uint32_t v_minor; /* Version minor number */ /* Extra for the NULL byte. */ char name[UST_APP_PROCNAME_LEN + 1]; + /* Type of buffer this application uses. */ + enum lttng_buffer_type buffer_type; struct lttng_ht *sessions; struct lttng_ht_node_ulong pid_n; struct lttng_ht_node_ulong sock_n; @@ -232,6 +263,13 @@ struct ust_app { * Hash table containing ust_app_channel indexed by channel objd. */ struct lttng_ht *ust_objd; + /* + * If this application is of the JUL domain and this is non negative then a + * lookup MUST be done to acquire a read side reference to the + * corresponding JUL app object. If the lookup fails, this should be set to + * a negative value indicating that the JUL application is gone. + */ + int jul_app_sock; }; #ifdef HAVE_LIBLTTNG_UST_CTL @@ -245,8 +283,6 @@ int ust_app_register_done(int sock) int ust_app_version(struct ust_app *app); void ust_app_unregister(int sock); unsigned long ust_app_list_count(void); -int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app); -int ust_app_stop_trace(struct ltt_ust_session *usess, struct ust_app *app); int ust_app_start_trace_all(struct ltt_ust_session *usess); int ust_app_stop_trace_all(struct ltt_ust_session *usess); int ust_app_destroy_trace_all(struct ltt_ust_session *usess); @@ -289,6 +325,19 @@ int ust_app_recv_notify(int sock); void ust_app_add(struct ust_app *app); struct ust_app *ust_app_create(struct ust_register_msg *msg, int sock); void ust_app_notify_sock_unregister(int sock); +ssize_t ust_app_push_metadata(struct ust_registry_session *registry, + struct consumer_socket *socket, int send_zero_data); +void ust_app_destroy(struct ust_app *app); +int ust_app_snapshot_record(struct ltt_ust_session *usess, + struct snapshot_output *output, int wait, unsigned int nb_streams); +unsigned int ust_app_get_nb_stream(struct ltt_ust_session *usess); +struct ust_app *ust_app_find_by_sock(int sock); + +static inline +int ust_app_supported(void) +{ + return 1; +} #else /* HAVE_LIBLTTNG_UST_CTL */ @@ -475,6 +524,44 @@ static inline void ust_app_notify_sock_unregister(int sock) { } +static inline +ssize_t ust_app_push_metadata(struct ust_registry_session *registry, + struct consumer_socket *socket, int send_zero_data) +{ + return 0; +} +static inline +void ust_app_destroy(struct ust_app *app) +{ + return; +} +static inline +int ust_app_snapshot_record(struct ltt_ust_session *usess, + struct snapshot_output *output, int wait, unsigned int nb_stream) +{ + return 0; +} +static inline +unsigned int ust_app_get_nb_stream(struct ltt_ust_session *usess) +{ + return 0; +} + +static inline +int ust_app_supported(void) +{ + return 0; +} +static inline +struct ust_app *ust_app_find_by_sock(int sock) +{ + return NULL; +} +static inline +struct ust_app *ust_app_find_by_pid(pid_t pid) +{ + return NULL; +} #endif /* HAVE_LIBLTTNG_UST_CTL */