X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.h;h=fc9eef4b7b927820e15429e76afe098d5892ceb0;hp=bac5c328bf4f9169256d413723f0083144a6fc88;hb=967bc289202ddf847f0d48ede0a483e969726ac4;hpb=14fb1ebe1000da2c3ccca45e7e97ad6637947cfe diff --git a/src/bin/lttng-sessiond/trace-ust.h b/src/bin/lttng-sessiond/trace-ust.h index bac5c328b..fc9eef4b7 100644 --- a/src/bin/lttng-sessiond/trace-ust.h +++ b/src/bin/lttng-sessiond/trace-ust.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, @@ -18,7 +19,6 @@ #ifndef _LTT_TRACE_UST_H #define _LTT_TRACE_UST_H -#include #include #include @@ -27,19 +27,21 @@ #include #include "consumer.h" -#include "jul.h" #include "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; + enum lttng_ust_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; }; @@ -50,14 +52,26 @@ struct ltt_ust_event { struct lttng_ust_event attr; struct lttng_ht_node_str node; char *filter_expression; - struct lttng_ust_filter_bytecode *filter; + struct lttng_filter_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; + /* + * 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_SYM_NAME_LEN]; struct lttng_ust_channel_attr attr; struct lttng_ht *ctx; @@ -66,6 +80,8 @@ struct ltt_ust_channel { 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; }; /* UST domain global (LTTNG_DOMAIN_UST) */ @@ -74,24 +90,26 @@ struct ltt_ust_domain_global { struct cds_list_head registry_buffer_uid_list; }; +struct ust_pid_tracker_node { + struct lttng_ht_node_ulong node; +}; + +struct ust_pid_tracker { + struct lttng_ht *ht; +}; + /* UST session */ struct ltt_ust_session { uint64_t id; /* Unique identifier of session */ struct ltt_ust_domain_global domain_global; - struct jul_domain domain_jul; + /* Hash table of agent indexed by agent domain. */ + struct lttng_ht *agents; /* UID/GID of the user owning the session */ uid_t uid; 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. */ @@ -112,6 +130,14 @@ struct ltt_ust_session { /* Metadata channel attributes. */ struct lttng_ust_channel_attr metadata_attr; + + /* + * Path where to keep the shared memory files. + */ + char root_shm_path[PATH_MAX]; + char shm_path[PATH_MAX]; + + struct ust_pid_tracker pid_tracker; }; /* @@ -153,22 +179,29 @@ 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_filter_bytecode *filter, + enum lttng_ust_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); +struct agent *trace_ust_find_agent(struct ltt_ust_session *session, + enum lttng_domain_type domain_type); /* * 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_channel *trace_ust_create_channel(struct lttng_channel *attr, + enum lttng_domain_type domain); struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev, char *filter_expression, struct lttng_filter_bytecode *filter, - struct lttng_event_exclusion *exclusion); + struct lttng_event_exclusion *exclusion, + bool internal_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); void trace_ust_delete_channel(struct lttng_ht *ht, struct ltt_ust_channel *channel); @@ -179,6 +212,15 @@ 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); + +int trace_ust_track_pid(struct ltt_ust_session *session, int pid); +int trace_ust_untrack_pid(struct ltt_ust_session *session, int pid); + +int trace_ust_pid_tracker_lookup(struct ltt_ust_session *session, int pid); + +ssize_t trace_ust_list_tracker_pids(struct ltt_ust_session *session, + int32_t **_pids); #else /* HAVE_LIBLTTNG_UST_CTL */ @@ -205,7 +247,8 @@ struct ltt_ust_session *trace_ust_create_session(unsigned int session_id) 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, + enum lttng_domain_type domain) { return NULL; } @@ -213,7 +256,8 @@ 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) + struct lttng_event_exclusion *exclusion, + bool internal_event) { return NULL; } @@ -237,8 +281,16 @@ struct ltt_ust_context *trace_ust_create_context( { return NULL; } -static inline struct ltt_ust_event *trace_ust_find_event(struct lttng_ht *ht, - char *name, struct lttng_filter_bytecode *filter, int loglevel, +static inline +int trace_ust_match_context(struct ltt_ust_context *uctx, + struct lttng_event_context *ctx) +{ + return 0; +} +static inline +struct ltt_ust_event *trace_ust_find_event(struct lttng_ht *ht, + char *name, struct lttng_filter_bytecode *filter, + enum lttng_ust_loglevel_type loglevel_type, int loglevel_value, struct lttng_event_exclusion *exclusion) { return NULL; @@ -249,7 +301,33 @@ void trace_ust_delete_channel(struct lttng_ht *ht, { return; } - +static inline +struct agent *trace_ust_find_agent(struct ltt_ust_session *session, + enum lttng_domain_type domain_type) +{ + return NULL; +} +static inline +int trace_ust_track_pid(struct ltt_ust_session *session, int pid) +{ + return 0; +} +static inline +int trace_ust_untrack_pid(struct ltt_ust_session *session, int pid) +{ + return 0; +} +static inline +int trace_ust_pid_tracker_lookup(struct ltt_ust_session *session, int pid) +{ + return 0; +} +static inline +ssize_t trace_ust_list_tracker_pids(struct ltt_ust_session *session, + int32_t **_pids) +{ + return -1; +} #endif /* HAVE_LIBLTTNG_UST_CTL */ #endif /* _LTT_TRACE_UST_H */