X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.h;h=449173cd36a94a2f965a6a31c2ee351732e8fc22;hp=b90ff4bcef8833459268ba02f62dfc2e40bfc7e8;hb=da8734126339713603c25799dcd1dd72726730de;hpb=88e3c2f5610b9ac89b0923d448fee34140fc46fb diff --git a/src/bin/lttng-sessiond/ust-app.h b/src/bin/lttng-sessiond/ust-app.h index b90ff4bce..449173cd3 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,7 @@ #include -#include +#include #include "trace-ust.h" #include "ust-registry.h" @@ -81,7 +71,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 +79,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 { @@ -206,13 +196,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 @@ -298,6 +287,22 @@ 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_object_data *object; + struct lttng_pipe *event_pipe; + } event_notifier_group; }; #ifdef HAVE_LIBLTTNG_UST_CTL @@ -311,8 +316,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, @@ -340,11 +343,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); -enum lttng_error_code 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, @@ -356,6 +360,14 @@ int ust_app_pid_get_channel_runtime_stats(struct ltt_ust_session *usess, int overwrite, uint64_t *discarded, uint64_t *lost); int ust_app_regenerate_statedump_all(struct ltt_ust_session *usess); 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); +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) @@ -445,19 +457,21 @@ 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_tokens(struct ust_app *app) +{} +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; @@ -529,7 +543,7 @@ void ust_app_destroy(struct ust_app *app) } static inline enum lttng_error_code ust_app_snapshot_record(struct ltt_ust_session *usess, - struct snapshot_output *output, int wait, uint64_t max_stream_size) + const struct consumer_output *output, int wait, uint64_t max_stream_size) { return 0; } @@ -556,7 +570,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 @@ -589,6 +603,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_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 */