X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.h;h=8d2d289864ed1a3114bf846f7a67d5baa1538dc8;hp=86f747d6b6714b3d8b7230cea290ad89ac3c30a3;hb=eb2827a4f0ccc637bf1d42edebf2607dbea80428;hpb=c70636a7342f34e3be68fcf411cf3e3718b8e73f diff --git a/src/bin/lttng-sessiond/ust-app.h b/src/bin/lttng-sessiond/ust-app.h index 86f747d6b..8d2d28986 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,6 +11,7 @@ #include +#include #include #include "trace-ust.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; }; @@ -58,7 +49,7 @@ struct ust_app_ht_key { * Application registration data structure. */ struct ust_register_msg { - enum ustctl_socket_type type; + enum lttng_ust_ctl_socket_type type; uint32_t major; uint32_t minor; uint32_t abi_major; @@ -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,20 +105,38 @@ 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 { int handle; 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; }; @@ -147,9 +156,9 @@ struct ust_app_channel { 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; - struct ustctl_consumer_channel_attr attr; + char name[LTTNG_UST_ABI_SYM_NAME_LEN]; + struct lttng_ust_abi_object_data *obj; + struct lttng_ust_ctl_consumer_channel_attr attr; struct ust_app_stream_list streams; /* Session pointer that owns this object. */ struct ust_app_session *session; @@ -228,7 +237,7 @@ struct ust_app_session { unsigned int live_timer_interval; /* usec */ /* Metadata channel attributes. */ - struct ustctl_consumer_channel_attr metadata_attr; + struct lttng_ust_ctl_consumer_channel_attr metadata_attr; char root_shm_path[PATH_MAX]; char shm_path[PATH_MAX]; @@ -260,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. */ @@ -302,6 +311,25 @@ struct ust_app { * 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 @@ -315,8 +343,6 @@ 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_disable_channel_glb(struct ltt_ust_session *usess, @@ -331,6 +357,8 @@ 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_clean_list(void); int ust_app_ht_alloc(void); @@ -364,7 +392,11 @@ 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_object_data *data); + 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) @@ -372,6 +404,9 @@ int ust_app_supported(void) return 1; } +bool ust_app_supports_notifiers(const struct ust_app *app); +bool ust_app_supports_counters(const struct ust_app *app); + #else /* HAVE_LIBLTTNG_UST_CTL */ static inline @@ -424,14 +459,6 @@ void ust_app_unregister(int sock) { } static inline -void ust_app_lock_list(void) -{ -} -static inline -void ust_app_unlock_list(void) -{ -} -static inline void ust_app_clean_list(void) { } @@ -454,19 +481,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) +void ust_app_global_update_event_notifier_rules(struct ust_app *app) +{} +static inline +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_enable_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_create_channel_glb(struct ltt_ust_session *usess, +int ust_app_enable_channel_glb(struct ltt_ust_session *usess, struct ltt_ust_channel *uchan) { return 0; @@ -540,20 +572,35 @@ static inline 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; + return LTTNG_ERR_UNK; } static inline 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) { return 0; } static inline +bool ust_app_supports_notifiers(const struct ust_app *app) +{ + return false; +} +static inline +bool ust_app_supports_counters(const struct ust_app *app) +{ + return false; +} +static inline struct ust_app *ust_app_find_by_sock(int sock) { return NULL; @@ -595,22 +642,34 @@ int ust_app_regenerate_statedump_all(struct ltt_ust_session *usess) static inline enum lttng_error_code ust_app_rotate_session(struct ltt_session *session) { - return 0; + return LTTNG_ERR_UNK; } static inline enum lttng_error_code ust_app_create_channel_subdirectories( const struct ltt_ust_session *session) { - return 0; + return LTTNG_ERR_UNK; } static inline -int ust_app_release_object(struct ust_app *app, struct lttng_ust_object_data *data) +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 LTTNG_ERR_UNK; +} + +static inline +enum lttng_error_code ust_app_open_packets(struct ltt_session *session) +{ + return LTTNG_ERR_UNK; +} + #endif /* HAVE_LIBLTTNG_UST_CTL */ #endif /* _LTT_UST_APP_H */