X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.h;h=45521e66b32d4a0598c1f1f7d597c478eba02125;hp=59ef85b78cf9c082eb00b407066a1e78a272acb7;hb=44cdb3a261262ebabea3fb0cae9360ac05e66f2c;hpb=d7ba13889c8692b14f99238ddf2721ed78df89d2 diff --git a/src/bin/lttng-sessiond/ust-app.h b/src/bin/lttng-sessiond/ust-app.h index 59ef85b78..45521e66b 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,16 +16,16 @@ * 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 -#include "agent.h" #include "trace-ust.h" #include "ust-registry.h" +#include "session.h" #define UST_APP_EVENT_LIST_SIZE 32 @@ -48,9 +49,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_ust_event_exclusion *exclusion; + const struct lttng_filter_bytecode *filter; + enum lttng_ust_loglevel_type loglevel_type; + const struct lttng_event_exclusion *exclusion; }; /* @@ -80,19 +81,21 @@ 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 * socket using the sock_n node and sock value of an ust_app. + * + * 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 { @@ -102,7 +105,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; @@ -115,8 +118,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_ust_event_exclusion *exclusion; + struct lttng_filter_bytecode *filter; + struct lttng_event_exclusion *exclusion; }; struct ust_app_stream { @@ -134,7 +137,11 @@ struct ust_app_channel { int handle; /* Channel and streams were sent to the UST tracer. */ int is_sent; - /* Unique key used to identify the channel on the consumer side. */ + /* + * 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 occurred). + */ uint64_t key; /* Id of the tracing channel set on creation. */ uint64_t tracing_channel_id; @@ -157,6 +164,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. */ @@ -183,6 +191,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. @@ -191,13 +201,17 @@ 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; + /* 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 @@ -216,6 +230,7 @@ struct ust_app_session { /* Metadata channel attributes. */ struct ustctl_consumer_channel_attr metadata_attr; + char root_shm_path[PATH_MAX]; char shm_path[PATH_MAX]; }; @@ -225,6 +240,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; @@ -268,6 +285,10 @@ struct ust_app { * Hash table containing ust_app_channel indexed by channel objd. */ struct lttng_ht *ust_objd; + /* + * Hash table containing ust_app_session indexed by objd. + */ + struct lttng_ht *ust_sessions_objd; /* * If this application is of the agent domain and this is non negative then @@ -276,16 +297,17 @@ 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; }; #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); int ust_app_start_trace_all(struct ltt_ust_session *usess); @@ -293,31 +315,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, 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); 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,12 +342,28 @@ 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, + 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); +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); static inline int ust_app_supported(void) @@ -378,7 +409,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; } @@ -419,7 +450,7 @@ int ust_app_ht_alloc(void) return 0; } 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, @@ -434,18 +465,6 @@ int ust_app_enable_channel_glb(struct ltt_ust_session *usess, return 0; } static inline -int ust_app_create_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, - struct ltt_ust_channel *uchan) -{ - return 0; -} -static inline int ust_app_create_event_glb(struct ltt_ust_session *usess, struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent) { @@ -477,11 +496,6 @@ int ust_app_enable_event_pid(struct ltt_ust_session *usess, 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; @@ -516,8 +530,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; } @@ -544,7 +558,55 @@ 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 +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; +} + +static inline +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; }