X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.h;h=3dfb562150fe437f4263000fca9e4cc2fde20eae;hp=a5dc0d300c51a790bd762d85307829bd50389a44;hb=412d7227e69ec845e44c49082a417f9454d9b55d;hpb=d5a1b7aa06b4c924b1cd30623758343c74ecab5c diff --git a/src/bin/lttng-sessiond/ust-app.h b/src/bin/lttng-sessiond/ust-app.h index a5dc0d300..3dfb56215 100644 --- a/src/bin/lttng-sessiond/ust-app.h +++ b/src/bin/lttng-sessiond/ust-app.h @@ -1,19 +1,9 @@ /* - * Copyright (C) 2011 - David Goulet - * Copyright (C) 2016 - Jérémie Galarneau + * 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, - * as published by the Free Software Foundation. + * SPDX-License-Identifier: GPL-2.0-only * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #ifndef _LTT_UST_APP_H @@ -21,7 +11,8 @@ #include -#include +#include +#include #include "trace-ust.h" #include "ust-registry.h" @@ -32,10 +23,10 @@ /* Process name (short). */ #define UST_APP_PROCNAME_LEN 16 -struct lttng_filter_bytecode; +struct lttng_bytecode; struct lttng_ust_filter_bytecode; -extern int ust_consumerd64_fd, ust_consumerd32_fd; +extern int the_ust_consumerd64_fd, the_ust_consumerd32_fd; /* * Object used to close the notify socket in a call_rcu(). Since the @@ -49,8 +40,8 @@ struct ust_app_notify_sock_obj { struct ust_app_ht_key { const char *name; - const struct lttng_filter_bytecode *filter; - enum lttng_ust_loglevel_type loglevel_type; + const struct lttng_bytecode *filter; + enum lttng_ust_abi_loglevel_type loglevel_type; const struct lttng_event_exclusion *exclusion; }; @@ -81,7 +72,7 @@ struct ust_register_msg { * Global applications HT used by the session daemon. This table is indexed by * PID using the pid_n node and pid value of an ust_app. */ -struct lttng_ht *ust_app_ht; +extern struct lttng_ht *ust_app_ht; /* * Global applications HT used by the session daemon. This table is indexed by @@ -89,13 +80,13 @@ struct lttng_ht *ust_app_ht; * * The 'sock' in question here is the 'command' socket. */ -struct lttng_ht *ust_app_ht_by_sock; +extern struct lttng_ht *ust_app_ht_by_sock; /* * Global applications HT used by the session daemon. This table is indexed by * socket using the notify_sock_n node and notify_sock value of an ust_app. */ -struct lttng_ht *ust_app_ht_by_notify_sock; +extern struct lttng_ht *ust_app_ht_by_notify_sock; /* Stream list containing ust_app_stream. */ struct ust_app_stream_list { @@ -106,7 +97,7 @@ struct ust_app_stream_list { struct ust_app_ctx { int handle; struct lttng_ust_context_attr ctx; - struct lttng_ust_object_data *obj; + struct lttng_ust_abi_object_data *obj; struct lttng_ht_node_ulong node; struct cds_list_head list; }; @@ -114,12 +105,30 @@ struct ust_app_ctx { struct ust_app_event { int enabled; int handle; - struct lttng_ust_object_data *obj; - struct lttng_ust_event attr; - char name[LTTNG_UST_SYM_NAME_LEN]; + struct lttng_ust_abi_object_data *obj; + struct lttng_ust_abi_event attr; + char name[LTTNG_UST_ABI_SYM_NAME_LEN]; struct lttng_ht_node_str node; - struct lttng_filter_bytecode *filter; + struct lttng_bytecode *filter; + struct lttng_event_exclusion *exclusion; +}; + +struct ust_app_event_notifier_rule { + int enabled; + uint64_t error_counter_index; + int handle; + struct lttng_ust_abi_object_data *obj; + /* Holds a strong reference. */ + struct lttng_trigger *trigger; + /* Unique ID returned by the tracer to identify this event notifier. */ + uint64_t token; + struct lttng_ht_node_u64 node; + /* The trigger object owns the filter. */ + const struct lttng_bytecode *filter; + /* Owned by this. */ struct lttng_event_exclusion *exclusion; + /* For delayed reclaim. */ + struct rcu_head rcu_head; }; struct ust_app_stream { @@ -127,7 +136,7 @@ struct ust_app_stream { char pathname[PATH_MAX]; /* Format is %s_%d respectively channel name and CPU number. */ char name[DEFAULT_STREAM_NAME_LEN]; - struct lttng_ust_object_data *obj; + struct lttng_ust_abi_object_data *obj; /* Using a list of streams to keep order. */ struct cds_list_head list; }; @@ -140,15 +149,15 @@ struct ust_app_channel { /* * Unique key used to identify the channel on the consumer side. * 0 is a reserved 'invalid' value used to indicate that the consumer - * does not know about this channel (i.e. an error occured). + * does not know about this channel (i.e. an error occurred). */ 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]; - struct lttng_ust_object_data *obj; + char name[LTTNG_UST_ABI_SYM_NAME_LEN]; + struct lttng_ust_abi_object_data *obj; struct ustctl_consumer_channel_attr attr; struct ust_app_stream_list streams; /* Session pointer that owns this object. */ @@ -206,13 +215,12 @@ struct ust_app_session { * ust_sessions_objd hash table in the ust_app object. */ struct lttng_ht_node_ulong ust_objd_node; + /* Starts with 'ust'; no leading slash. */ char path[PATH_MAX]; /* UID/GID of the application owning the session */ - uid_t uid; - gid_t gid; + struct lttng_credentials real_credentials; /* Effective UID and GID. Same as the tracing session. */ - uid_t euid; - gid_t egid; + struct lttng_credentials effective_credentials; struct cds_list_head teardown_node; /* * Once at least *one* session is created onto the application, the @@ -261,7 +269,7 @@ struct ust_app { int compatible; /* If the lttng-ust tracer version does not match the supported version of the session daemon, this flag is set to 0 (NOT compatible) else 1. */ - struct lttng_ust_tracer_version version; + struct lttng_ust_abi_tracer_version version; uint32_t v_major; /* Version major number */ uint32_t v_minor; /* Version minor number */ /* Extra for the NULL byte. */ @@ -298,6 +306,30 @@ struct ust_app { * to a negative value indicating that the agent application is gone. */ int agent_app_sock; + /* + * Time at which the app is registred. + * Used for path creation + */ + time_t registration_time; + /* + * Event notifier + */ + struct { + /* + * Handle to the lttng_ust object representing the event + * notifier group. + */ + struct lttng_ust_abi_object_data *object; + struct lttng_pipe *event_pipe; + struct lttng_ust_abi_object_data *counter; + struct lttng_ust_abi_object_data **counter_cpu; + int nr_counter_cpu; + } event_notifier_group; + /* + * Hashtable indexing the application's event notifier rule's + * (ust_app_event_notifier_rule) by their token's value. + */ + struct lttng_ht *token_to_event_notifier_rule_ht; }; #ifdef HAVE_LIBLTTNG_UST_CTL @@ -311,27 +343,24 @@ int ust_app_stop_trace_all(struct ltt_ust_session *usess); int ust_app_destroy_trace_all(struct ltt_ust_session *usess); int ust_app_list_events(struct lttng_event **events); int ust_app_list_event_fields(struct lttng_event_field **fields); -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_enable_event_pid(struct ltt_ust_session *usess, - struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent, - pid_t pid); int ust_app_disable_channel_glb(struct ltt_ust_session *usess, struct ltt_ust_channel *uchan); 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_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, struct ust_app *app); void ust_app_global_update_all(struct ltt_ust_session *usess); +void ust_app_global_update_event_notifier_rules(struct ust_app *app); +void ust_app_global_update_all_event_notifier_rules(void); + +void ust_app_update_event_notifier_error_count(struct lttng_trigger *trigger); void ust_app_clean_list(void); int ust_app_ht_alloc(void); @@ -345,11 +374,12 @@ 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, +enum lttng_error_code ust_app_snapshot_record( + const struct ltt_ust_session *usess, + const struct consumer_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); + const 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, @@ -360,7 +390,15 @@ int ust_app_pid_get_channel_runtime_stats(struct ltt_ust_session *usess, struct consumer_output *consumer, int overwrite, uint64_t *discarded, uint64_t *lost); int ust_app_regenerate_statedump_all(struct ltt_ust_session *usess); -int ust_app_rotate_session(struct ltt_session *session); +enum lttng_error_code ust_app_rotate_session(struct ltt_session *session); +enum lttng_error_code ust_app_create_channel_subdirectories( + const struct ltt_ust_session *session); +int ust_app_release_object(struct ust_app *app, + struct lttng_ust_abi_object_data *data); +enum lttng_error_code ust_app_clear_session(struct ltt_session *session); +enum lttng_error_code ust_app_open_packets(struct ltt_session *session); + +int ust_app_setup_event_notifier_group(struct ust_app *app); static inline int ust_app_supported(void) @@ -450,25 +488,24 @@ static inline 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, - struct ltt_ust_channel *uchan) -{ - return 0; -} +void ust_app_global_update_event_notifier_rules(struct ust_app *app) +{} static inline -int ust_app_enable_channel_glb(struct ltt_ust_session *usess, - struct ltt_ust_channel *uchan) +void ust_app_global_update_all_event_notifier_rules(void) +{} +static inline +int ust_app_setup_event_notifier_group(struct ust_app *app) { return 0; } static inline -int ust_app_create_channel_glb(struct ltt_ust_session *usess, +int ust_app_disable_channel_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, +int ust_app_enable_channel_glb(struct ltt_ust_session *usess, struct ltt_ust_channel *uchan) { return 0; @@ -539,8 +576,8 @@ 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, uint64_t max_stream_size) +enum lttng_error_code ust_app_snapshot_record(struct ltt_ust_session *usess, + const struct consumer_output *output, int wait, uint64_t max_stream_size) { return 0; } @@ -549,7 +586,12 @@ unsigned int ust_app_get_nb_stream(struct ltt_ust_session *usess) { return 0; } - +static inline +void ust_app_update_event_notifier_error_count( + struct lttng_trigger *lttng_trigger) +{ + return; +} static inline int ust_app_supported(void) { @@ -567,7 +609,7 @@ struct ust_app *ust_app_find_by_pid(pid_t pid) } static inline uint64_t ust_app_get_size_one_more_packet_per_stream( - struct ltt_ust_session *usess, uint64_t cur_nr_packets) { + const struct ltt_ust_session *usess, uint64_t cur_nr_packets) { return 0; } static inline @@ -600,6 +642,31 @@ enum lttng_error_code ust_app_rotate_session(struct ltt_session *session) return 0; } +static inline +enum lttng_error_code ust_app_create_channel_subdirectories( + const struct ltt_ust_session *session) +{ + return 0; +} + +static inline +int ust_app_release_object(struct ust_app *app, struct lttng_ust_abi_object_data *data) +{ + return 0; +} + +static inline +enum lttng_error_code ust_app_clear_session(struct ltt_session *session) +{ + return 0; +} + +static inline +enum lttng_error_code ust_app_open_packets(struct ltt_session *session) +{ + return 0; +} + #endif /* HAVE_LIBLTTNG_UST_CTL */ #endif /* _LTT_UST_APP_H */