X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.h;h=d4df48d189f9d99b0eadb0edba49ecb32bc3fb9e;hb=4878de5c7deb512bbdac4fdfc498907efa06fb7c;hp=7d64269089d7a4f140754505c624dab74c3a6c8e;hpb=a5dfbb9db7ba31913657ed921006b13977b7b426;p=lttng-tools.git diff --git a/src/bin/lttng-sessiond/trace-ust.h b/src/bin/lttng-sessiond/trace-ust.h index 7d6426908..d4df48d18 100644 --- a/src/bin/lttng-sessiond/trace-ust.h +++ b/src/bin/lttng-sessiond/trace-ust.h @@ -1,45 +1,38 @@ /* - * Copyright (C) 2011 - David Goulet + * Copyright (C) 2011 EfficiOS Inc. + * 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_TRACE_UST_H #define _LTT_TRACE_UST_H -#include #include #include -#include -#include #include +#include +#include +#include #include "consumer.h" -#include "agent.h" -#include "ust-ctl.h" +#include "lttng-ust-ctl.h" + +struct agent; struct ltt_ust_ht_key { const char *name; - const struct lttng_filter_bytecode *filter; - enum lttng_ust_loglevel_type loglevel; + const struct lttng_bytecode *filter; + enum lttng_ust_abi_loglevel_type loglevel_type; + int loglevel_value; const struct lttng_event_exclusion *exclusion; }; /* Context hash table nodes */ struct ltt_ust_context { - struct lttng_ust_context ctx; + struct lttng_ust_context_attr ctx; struct lttng_ht_node_ulong node; struct cds_list_head list; }; @@ -47,25 +40,40 @@ struct ltt_ust_context { /* UST event */ struct ltt_ust_event { unsigned int enabled; - struct lttng_ust_event attr; + struct lttng_ust_abi_event attr; struct lttng_ht_node_str node; char *filter_expression; - struct lttng_ust_filter_bytecode *filter; + struct lttng_bytecode *filter; struct lttng_event_exclusion *exclusion; + /* + * An internal event is an event which was created by the session daemon + * through which, for example, events emitted in Agent domains are + * "funelled". This is used to hide internal events from external + * clients as they should never be modified by the external world. + */ + bool internal; }; /* UST channel */ struct ltt_ust_channel { uint64_t id; /* unique id per session. */ unsigned int enabled; - char name[LTTNG_UST_SYM_NAME_LEN]; - struct lttng_ust_channel_attr attr; + /* + * A UST channel can be part of a userspace sub-domain such as JUL, + * Log4j, Python. + */ + enum lttng_domain_type domain; + char name[LTTNG_UST_ABI_SYM_NAME_LEN]; + struct lttng_ust_abi_channel_attr attr; struct lttng_ht *ctx; struct cds_list_head ctx_list; struct lttng_ht *events; struct lttng_ht_node_str node; uint64_t tracefile_size; uint64_t tracefile_count; + uint64_t per_pid_closed_app_discarded; + uint64_t per_pid_closed_app_lost; + uint64_t monitor_timer_interval; }; /* UST domain global (LTTNG_DOMAIN_UST) */ @@ -74,11 +82,11 @@ struct ltt_ust_domain_global { struct cds_list_head registry_buffer_uid_list; }; -struct ust_pid_tracker_node { +struct ust_id_tracker_node { struct lttng_ht_node_ulong node; }; -struct ust_pid_tracker { +struct ust_id_tracker { struct lttng_ht *ht; }; @@ -93,14 +101,7 @@ struct ltt_ust_session { gid_t gid; /* Is the session active meaning has is been started or stopped. */ unsigned int active:1; - /* - * Two consumer_output object are needed where one is for the current - * output object and the second one is the temporary object used to store - * URI being set by the lttng_set_consumer_uri call. Once - * lttng_enable_consumer is called, the two pointers are swapped. - */ struct consumer_output *consumer; - struct consumer_output *tmp_consumer; /* Sequence number for filters so the tracer knows the ordering. */ uint64_t filter_seq_num; /* This indicates which type of buffer this session is set for. */ @@ -120,7 +121,7 @@ struct ltt_ust_session { unsigned int live_timer_interval; /* usec */ /* Metadata channel attributes. */ - struct lttng_ust_channel_attr metadata_attr; + struct lttng_ust_abi_channel_attr metadata_attr; /* * Path where to keep the shared memory files. @@ -128,7 +129,18 @@ struct ltt_ust_session { char root_shm_path[PATH_MAX]; char shm_path[PATH_MAX]; - struct ust_pid_tracker pid_tracker; + /* Current trace chunk of the ltt_session. */ + struct lttng_trace_chunk *current_trace_chunk; + + /* Trackers used for actual lookup on app registration. */ + struct ust_id_tracker vpid_tracker; + struct ust_id_tracker vuid_tracker; + struct ust_id_tracker vgid_tracker; + + /* Tracker list of keys requested by users. */ + struct process_attr_tracker *tracker_vpid; + struct process_attr_tracker *tracker_vuid; + struct process_attr_tracker *tracker_vgid; }; /* @@ -170,10 +182,11 @@ int trace_ust_ht_match_event_by_name(struct cds_lfht_node *node, * Lookup functions. NULL is returned if not found. */ struct ltt_ust_event *trace_ust_find_event(struct lttng_ht *ht, - char *name, struct lttng_filter_bytecode *filter, int loglevel, + char *name, struct lttng_bytecode *filter, + enum lttng_ust_abi_loglevel_type loglevel_type, int loglevel_value, struct lttng_event_exclusion *exclusion); struct ltt_ust_channel *trace_ust_find_channel_by_name(struct lttng_ht *ht, - char *name); + const char *name); struct agent *trace_ust_find_agent(struct ltt_ust_session *session, enum lttng_domain_type domain_type); @@ -181,15 +194,18 @@ struct agent *trace_ust_find_agent(struct ltt_ust_session *session, * Create functions malloc() the data structure. */ struct ltt_ust_session *trace_ust_create_session(uint64_t session_id); -struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *attr); -struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev, +struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *attr, + enum lttng_domain_type domain); + +enum lttng_error_code trace_ust_create_event(struct lttng_event *ev, char *filter_expression, - struct lttng_filter_bytecode *filter, - struct lttng_event_exclusion *exclusion); + struct lttng_bytecode *filter, + struct lttng_event_exclusion *exclusion, + bool internal_event, struct ltt_ust_event **ust_event); struct ltt_ust_context *trace_ust_create_context( - struct lttng_event_context *ctx); -int trace_ust_match_context(struct ltt_ust_context *uctx, - struct lttng_event_context *ctx); + const struct lttng_event_context *ctx); +int trace_ust_match_context(const struct ltt_ust_context *uctx, + const struct lttng_event_context *ctx); void trace_ust_delete_channel(struct lttng_ht *ht, struct ltt_ust_channel *channel); @@ -200,109 +216,189 @@ void trace_ust_delete_channel(struct lttng_ht *ht, void trace_ust_destroy_session(struct ltt_ust_session *session); void trace_ust_destroy_channel(struct ltt_ust_channel *channel); void trace_ust_destroy_event(struct ltt_ust_event *event); +void trace_ust_destroy_context(struct ltt_ust_context *ctx); +void trace_ust_free_session(struct ltt_ust_session *session); -int trace_ust_track_pid(struct ltt_ust_session *session, int pid); -int trace_ust_untrack_pid(struct ltt_ust_session *session, int pid); - -ssize_t trace_ust_list_tracker_pids(struct ltt_ust_session *session, - int32_t **_pids); +int trace_ust_id_tracker_lookup(enum lttng_process_attr process_attr, + struct ltt_ust_session *session, + int id); +enum lttng_error_code trace_ust_process_attr_tracker_set_tracking_policy( + struct ltt_ust_session *session, + enum lttng_process_attr process_attr, + enum lttng_tracking_policy policy); +enum lttng_error_code trace_ust_process_attr_tracker_inclusion_set_add_value( + struct ltt_ust_session *session, + enum lttng_process_attr process_attr, + const struct process_attr_value *value); +enum lttng_error_code trace_ust_process_attr_tracker_inclusion_set_remove_value( + struct ltt_ust_session *session, + enum lttng_process_attr process_attr, + const struct process_attr_value *value); +const struct process_attr_tracker *trace_ust_get_process_attr_tracker( + struct ltt_ust_session *session, + enum lttng_process_attr process_attr); #else /* HAVE_LIBLTTNG_UST_CTL */ -static inline int trace_ust_ht_match_event(struct cds_lfht_node *node, - const void *_key) +static inline int trace_ust_ht_match_event( + struct cds_lfht_node *node __attribute__((unused)), + const void *_key __attribute__((unused))) { return 0; } -static inline int trace_ust_ht_match_event_by_name(struct cds_lfht_node *node, - const void *_key) + +static inline int trace_ust_ht_match_event_by_name( + struct cds_lfht_node *node __attribute__((unused)), + const void *_key __attribute__((unused))) { return 0; } + static inline -struct ltt_ust_channel *trace_ust_find_channel_by_name(struct lttng_ht *ht, - char *name) +struct ltt_ust_channel *trace_ust_find_channel_by_name( + struct lttng_ht *ht __attribute__((unused)), + const char *name __attribute__((unused))) { return NULL; } static inline -struct ltt_ust_session *trace_ust_create_session(unsigned int session_id) +struct ltt_ust_session *trace_ust_create_session( + unsigned int session_id __attribute__((unused))) { return NULL; } + static inline -struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *attr) +struct ltt_ust_channel *trace_ust_create_channel( + struct lttng_channel *attr __attribute__((unused)), + enum lttng_domain_type domain __attribute__((unused))) { return NULL; } + static inline -struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev, - const char *filter_expression, - struct lttng_filter_bytecode *filter, - struct lttng_event_exclusion *exclusion) +enum lttng_error_code trace_ust_create_event( + struct lttng_event *ev __attribute__((unused)), + const char *filter_expression __attribute__((unused)), + struct lttng_bytecode *filter __attribute__((unused)), + struct lttng_event_exclusion *exclusion __attribute__((unused)), + bool internal_event __attribute__((unused)), + struct ltt_ust_event **ust_event __attribute__((unused))) +{ + return LTTNG_ERR_NO_UST; +} + +static inline +void trace_ust_destroy_session( + struct ltt_ust_session *session __attribute__((unused))) { - return NULL; } + static inline -void trace_ust_destroy_session(struct ltt_ust_session *session) +void trace_ust_destroy_channel( + struct ltt_ust_channel *channel __attribute__((unused))) { } static inline -void trace_ust_destroy_channel(struct ltt_ust_channel *channel) +void trace_ust_destroy_event( + struct ltt_ust_event *event __attribute__((unused))) { } static inline -void trace_ust_destroy_event(struct ltt_ust_event *event) +void trace_ust_free_session( + struct ltt_ust_session *session __attribute__((unused))) { } + static inline struct ltt_ust_context *trace_ust_create_context( - struct lttng_event_context *ctx) + const struct lttng_event_context *ctx __attribute__((unused))) { return NULL; } + static inline -int trace_ust_match_context(struct ltt_ust_context *uctx, - struct lttng_event_context *ctx) +int trace_ust_match_context( + const struct ltt_ust_context *uctx __attribute__((unused)), + const struct lttng_event_context *ctx __attribute__((unused))) { return 0; } -static inline struct ltt_ust_event *trace_ust_find_event(struct lttng_ht *ht, - char *name, struct lttng_filter_bytecode *filter, int loglevel, - struct lttng_event_exclusion *exclusion) + +static inline +struct ltt_ust_event *trace_ust_find_event( + struct lttng_ht *ht __attribute__((unused)), + char *name __attribute__((unused)), + struct lttng_bytecode *filter __attribute__((unused)), + enum lttng_ust_abi_loglevel_type loglevel_type __attribute__((unused)), + int loglevel_value __attribute__((unused)), + struct lttng_event_exclusion *exclusion __attribute__((unused))) { return NULL; } + static inline -void trace_ust_delete_channel(struct lttng_ht *ht, - struct ltt_ust_channel *channel) +void trace_ust_delete_channel( + struct lttng_ht *ht __attribute__((unused)), + struct ltt_ust_channel *channel __attribute__((unused))) { return; } + static inline -struct agent *trace_ust_find_agent(struct ltt_ust_session *session, - enum lttng_domain_type domain_type) +struct agent *trace_ust_find_agent( + struct ltt_ust_session *session __attribute__((unused)), + enum lttng_domain_type domain_type __attribute__((unused))) { return NULL; } -static inline -int trace_ust_track_pid(struct ltt_ust_session *session, int pid) + +static inline int trace_ust_id_tracker_lookup( + enum lttng_process_attr process_attr __attribute__((unused)), + struct ltt_ust_session *session __attribute__((unused)), + int id __attribute__((unused))) { return 0; } -static inline -int trace_ust_untrack_pid(struct ltt_ust_session *session, int pid) + +static inline enum lttng_error_code +trace_ust_process_attr_tracker_set_tracking_policy( + struct ltt_ust_session *session __attribute__((unused)), + enum lttng_process_attr process_attr __attribute__((unused)), + enum lttng_tracking_policy policy __attribute__((unused))) { - return 0; + return LTTNG_OK; +} + +static inline enum lttng_error_code +trace_ust_process_attr_tracker_inclusion_set_add_value( + struct ltt_ust_session *session __attribute__((unused)), + enum lttng_process_attr process_attr __attribute__((unused)), + const struct process_attr_value *value __attribute__((unused))) +{ + return LTTNG_OK; } -ssize_t trace_ust_list_tracker_pids(struct ltt_ust_session *session, - int32_t **_pids) + +static inline enum lttng_error_code +trace_ust_process_attr_tracker_inclusion_set_remove_value( + struct ltt_ust_session *session __attribute__((unused)), + enum lttng_process_attr process_attr __attribute__((unused)), + const struct process_attr_value *value __attribute__((unused))) +{ + return LTTNG_OK; +} + +static inline const struct process_attr_tracker * +trace_ust_get_process_attr_tracker( + struct ltt_ust_session *session __attribute__((unused)), + enum lttng_process_attr process_attr __attribute__((unused))) { - return -1; + return NULL; } + #endif /* HAVE_LIBLTTNG_UST_CTL */ #endif /* _LTT_TRACE_UST_H */