X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.h;h=03a50e87799574d708a978c9163cf29cec38fbfe;hp=249d568d1fb66f31aaf15cd65fe786e0c17f398e;hb=e9404c27e7cc9d841785e6c4292c1add19fbc1cc;hpb=f20baf8e44b5d8a1c90b8b029b876762f6f916a6 diff --git a/src/bin/lttng-sessiond/ust-app.h b/src/bin/lttng-sessiond/ust-app.h index 249d568d1..03a50e877 100644 --- a/src/bin/lttng-sessiond/ust-app.h +++ b/src/bin/lttng-sessiond/ust-app.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2011 - David Goulet + * Copyright (C) 2016 - Jérémie Galarneau * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License, version 2 only, @@ -15,14 +16,13 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef _LTT_UST_APP_H +#ifndef _LTT_UST_APP_H #define _LTT_UST_APP_H #include #include -#include "jul.h" #include "trace-ust.h" #include "ust-registry.h" @@ -48,8 +48,9 @@ struct ust_app_notify_sock_obj { struct ust_app_ht_key { const char *name; - const struct lttng_ust_filter_bytecode *filter; - enum lttng_ust_loglevel_type loglevel; + const struct lttng_filter_bytecode *filter; + enum lttng_ust_loglevel_type loglevel_type; + const struct lttng_event_exclusion *exclusion; }; /* @@ -101,7 +102,7 @@ struct ust_app_stream_list { struct ust_app_ctx { int handle; - struct lttng_ust_context ctx; + struct lttng_ust_context_attr ctx; struct lttng_ust_object_data *obj; struct lttng_ht_node_ulong node; struct cds_list_head list; @@ -114,7 +115,8 @@ struct ust_app_event { struct lttng_ust_event attr; char name[LTTNG_UST_SYM_NAME_LEN]; struct lttng_ht_node_str node; - struct lttng_ust_filter_bytecode *filter; + struct lttng_filter_bytecode *filter; + struct lttng_event_exclusion *exclusion; }; struct ust_app_stream { @@ -155,6 +157,7 @@ struct ust_app_channel { struct lttng_ht *events; uint64_t tracefile_size; uint64_t tracefile_count; + uint64_t monitor_timer_interval; /* * Node indexed by channel name in the channels' hash table of a session. */ @@ -181,6 +184,8 @@ struct ust_app_session { int started; /* allows detection of start vs restart. */ int handle; /* used has unique identifier for app session */ + bool deleted; /* Session deleted flag. Check with lock held. */ + /* * Tracing session ID. Multiple ust app session can have the same tracing * session id making this value NOT unique to the object. @@ -189,6 +194,11 @@ struct ust_app_session { uint64_t id; /* Unique session identifier */ struct lttng_ht *channels; /* Registered channels */ struct lttng_ht_node_u64 node; + /* + * Node indexed by UST session object descriptor (handle). Stored in the + * ust_sessions_objd hash table in the ust_app object. + */ + struct lttng_ht_node_ulong ust_objd_node; char path[PATH_MAX]; /* UID/GID of the application owning the session */ uid_t uid; @@ -210,6 +220,12 @@ struct ust_app_session { /* If the channel's streams have to be outputed or not. */ unsigned int output_traces; unsigned int live_timer_interval; /* usec */ + + /* Metadata channel attributes. */ + struct ustctl_consumer_channel_attr metadata_attr; + + char root_shm_path[PATH_MAX]; + char shm_path[PATH_MAX]; }; /* @@ -218,6 +234,8 @@ struct ust_app_session { */ struct ust_app { int sock; + pthread_mutex_t sock_lock; /* Protects sock protocol. */ + int notify_sock; pid_t pid; pid_t ppid; @@ -262,25 +280,25 @@ struct ust_app { */ 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. + * Hash table containing ust_app_session indexed by objd. */ - int jul_app_sock; + struct lttng_ht *ust_sessions_objd; + + /* + * If this application is of the agent domain and this is non negative then + * a lookup MUST be done to acquire a read side reference to the + * corresponding agent app object. If the lookup fails, this should be set + * to a negative value indicating that the agent application is gone. + */ + int agent_app_sock; }; #ifdef HAVE_LIBLTTNG_UST_CTL int ust_app_register(struct ust_register_msg *msg, int sock); -static inline -int ust_app_register_done(int sock) -{ - return ustctl_register_done(sock); -} +int ust_app_register_done(struct ust_app *app); 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_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); @@ -290,9 +308,6 @@ int ust_app_create_channel_glb(struct ltt_ust_session *usess, struct ltt_ust_channel *uchan); int ust_app_create_event_glb(struct ltt_ust_session *usess, struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent); -int ust_app_disable_event_pid(struct ltt_ust_session *usess, - struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent, - pid_t pid); int ust_app_enable_event_pid(struct ltt_ust_session *usess, struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent, pid_t pid); @@ -302,21 +317,18 @@ int ust_app_enable_channel_glb(struct ltt_ust_session *usess, struct ltt_ust_channel *uchan); int ust_app_enable_event_glb(struct ltt_ust_session *usess, struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent); -int ust_app_disable_all_event_glb(struct ltt_ust_session *usess, - struct ltt_ust_channel *uchan); int ust_app_enable_all_event_glb(struct ltt_ust_session *usess, struct ltt_ust_channel *uchan); int ust_app_disable_event_glb(struct ltt_ust_session *usess, struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent); int ust_app_add_ctx_channel_glb(struct ltt_ust_session *usess, struct ltt_ust_channel *uchan, struct ltt_ust_context *uctx); -void ust_app_global_update(struct ltt_ust_session *usess, int sock); +void ust_app_global_update(struct ltt_ust_session *usess, struct ust_app *app); +void ust_app_global_update_all(struct ltt_ust_session *usess); void ust_app_clean_list(void); -void ust_app_ht_alloc(void); -struct lttng_ht *ust_app_get_ht(void); +int ust_app_ht_alloc(void); struct ust_app *ust_app_find_by_pid(pid_t pid); -int ust_app_calibrate_glb(struct lttng_ust_calibrate *calibrate); struct ust_app_stream *ust_app_alloc_stream(void); int ust_app_recv_registration(int sock, struct ust_register_msg *msg); int ust_app_recv_notify(int sock); @@ -327,9 +339,20 @@ 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 snapshot_output *output, int wait, + uint64_t nb_packets_per_stream); +uint64_t ust_app_get_size_one_more_packet_per_stream( + struct ltt_ust_session *usess, uint64_t cur_nr_packets); struct ust_app *ust_app_find_by_sock(int sock); +int ust_app_uid_get_channel_runtime_stats(uint64_t ust_session_id, + struct cds_list_head *buffer_reg_uid_list, + struct consumer_output *consumer, uint64_t uchan_id, + int overwrite, uint64_t *discarded, uint64_t *lost); +int ust_app_pid_get_channel_runtime_stats(struct ltt_ust_session *usess, + struct ltt_ust_channel *uchan, + struct consumer_output *consumer, + int overwrite, uint64_t *discarded, uint64_t *lost); +int ust_app_regenerate_statedump_all(struct ltt_ust_session *usess); static inline int ust_app_supported(void) @@ -375,7 +398,7 @@ int ust_app_register(struct ust_register_msg *msg, int sock) return -ENOSYS; } static inline -int ust_app_register_done(int sock) +int ust_app_register_done(struct ust_app *app) { return -ENOSYS; } @@ -389,11 +412,6 @@ void ust_app_unregister(int sock) { } static inline -unsigned int ust_app_list_count(void) -{ - return 0; -} -static inline void ust_app_lock_list(void) { } @@ -416,15 +434,12 @@ struct ust_app *ust_app_get_by_pid(pid_t pid) return NULL; } static inline -struct lttng_ht *ust_app_get_ht(void) +int ust_app_ht_alloc(void) { - return NULL; + return 0; } static inline -void ust_app_ht_alloc(void) -{} -static inline -void ust_app_global_update(struct ltt_ust_session *usess, int sock) +void ust_app_global_update(struct ltt_ust_session *usess, struct ust_app *app) {} static inline int ust_app_disable_channel_glb(struct ltt_ust_session *usess, @@ -445,12 +460,6 @@ int ust_app_create_channel_glb(struct ltt_ust_session *usess, return 0; } static inline -int ust_app_disable_all_event_glb(struct ltt_ust_session *usess, - struct ltt_ust_channel *uchan) -{ - return 0; -} -static inline int ust_app_enable_all_event_glb(struct ltt_ust_session *usess, struct ltt_ust_channel *uchan) { @@ -488,18 +497,6 @@ int ust_app_enable_event_pid(struct ltt_ust_session *usess, return 0; } static inline -int ust_app_disable_event_pid(struct ltt_ust_session *usess, - struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent, - pid_t pid) -{ - return 0; -} -static inline -int ust_app_calibrate_glb(struct lttng_ust_calibrate *calibrate) -{ - return 0; -} -static inline int ust_app_recv_registration(int sock, struct ust_register_msg *msg) { return 0; @@ -535,7 +532,7 @@ void ust_app_destroy(struct ust_app *app) } static inline int ust_app_snapshot_record(struct ltt_ust_session *usess, - struct snapshot_output *output, int wait, unsigned int nb_stream) + struct snapshot_output *output, int wait, uint64_t max_stream_size) { return 0; } @@ -555,6 +552,39 @@ 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; +} +static inline +uint64_t ust_app_get_size_one_more_packet_per_stream( + struct ltt_ust_session *usess, uint64_t cur_nr_packets) { + return 0; +} +static inline +int ust_app_uid_get_channel_runtime_stats(uint64_t ust_session_id, + struct cds_list_head *buffer_reg_uid_list, + struct consumer_output *consumer, int overwrite, + uint64_t uchan_id, uint64_t *discarded, uint64_t *lost) +{ + return 0; +} + +static inline +int ust_app_pid_get_channel_runtime_stats(struct ltt_ust_session *usess, + struct ltt_ust_channel *uchan, + struct consumer_output *consumer, + int overwrite, uint64_t *discarded, uint64_t *lost) +{ + return 0; +} + +static inline +int ust_app_regenerate_statedump_all(struct ltt_ust_session *usess) +{ + return 0; +} #endif /* HAVE_LIBLTTNG_UST_CTL */