X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.h;h=216bccb80f6bc75f28e88e4891d092d0621d47ed;hp=06d0202d1d1fdb323f94baafd8577c8e58714f29;hb=4e6581a7740c292be662d108a21a80e478b42a71;hpb=7724731bcd8d8e340adc41bc46a5994668679e85 diff --git a/src/bin/lttng-sessiond/trace-ust.h b/src/bin/lttng-sessiond/trace-ust.h index 06d0202d1..216bccb80 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" +#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; + 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; }; @@ -49,14 +51,27 @@ struct ltt_ust_event { unsigned int enabled; struct lttng_ust_event attr; struct lttng_ht_node_str node; - struct lttng_ust_filter_bytecode *filter; - const struct lttng_event_exclusion *exclusion; + char *filter_expression; + 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; @@ -65,15 +80,9 @@ struct ltt_ust_channel { struct lttng_ht_node_str node; uint64_t tracefile_size; uint64_t tracefile_count; -}; - -/* UST Metadata */ -struct ltt_ust_metadata { - int handle; - struct lttng_ust_object_data *obj; - char pathname[PATH_MAX]; /* Trace file path name */ - struct lttng_ust_channel_attr attr; - struct lttng_ust_object_data *stream_obj; + 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) */ @@ -82,23 +91,26 @@ struct ltt_ust_domain_global { struct cds_list_head registry_buffer_uid_list; }; +struct ust_id_tracker_node { + struct lttng_ht_node_ulong node; +}; + +struct ust_id_tracker { + struct lttng_ht *ht; +}; + /* UST session */ struct ltt_ust_session { uint64_t id; /* Unique identifier of session */ - int start_trace; 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; - /* - * 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. - */ + /* Is the session active meaning has is been started or stopped. */ + unsigned int active:1; 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. */ @@ -116,6 +128,28 @@ struct ltt_ust_session { unsigned int snapshot_mode; unsigned int has_non_default_channel; unsigned int live_timer_interval; /* usec */ + + /* 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]; + + /* 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 lttng_tracker_list *tracker_list_vpid; + struct lttng_tracker_list *tracker_list_vuid; + struct lttng_tracker_list *tracker_list_vgid; }; /* @@ -157,20 +191,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); + const 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_event *trace_ust_create_event(struct lttng_event *ev, - struct lttng_filter_bytecode *filter); -struct ltt_ust_metadata *trace_ust_create_metadata(char *path); +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, + bool internal_event, struct ltt_ust_event **ust_event); struct ltt_ust_context *trace_ust_create_context( - 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); @@ -179,9 +222,25 @@ void trace_ust_delete_channel(struct lttng_ht *ht, * it's applies. */ void trace_ust_destroy_session(struct ltt_ust_session *session); -void trace_ust_destroy_metadata(struct ltt_ust_metadata *metadata); 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_id(enum lttng_tracker_type tracker_type, + struct ltt_ust_session *session, + const struct lttng_tracker_id *id); +int trace_ust_untrack_id(enum lttng_tracker_type tracker_type, + struct ltt_ust_session *session, + const struct lttng_tracker_id *id); + +int trace_ust_id_tracker_lookup(enum lttng_tracker_type tracker_type, + struct ltt_ust_session *session, + int id); + +int trace_ust_list_tracker_ids(enum lttng_tracker_type tracker_type, + struct ltt_ust_session *session, + struct lttng_tracker_ids **_ids); #else /* HAVE_LIBLTTNG_UST_CTL */ @@ -197,7 +256,7 @@ static inline int trace_ust_ht_match_event_by_name(struct cds_lfht_node *node, } static inline struct ltt_ust_channel *trace_ust_find_channel_by_name(struct lttng_ht *ht, - char *name) + const char *name) { return NULL; } @@ -208,49 +267,57 @@ 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; } static inline -struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev, - struct lttng_filter_bytecode *filter) +enum lttng_error_code trace_ust_create_event(struct lttng_event *ev, + const char *filter_expression, + struct lttng_filter_bytecode *filter, + struct lttng_event_exclusion *exclusion, + bool internal_event, struct ltt_ust_event **ust_event) { - return NULL; + return LTTNG_ERR_NO_UST; } static inline -struct ltt_ust_metadata *trace_ust_create_metadata(char *path) +void trace_ust_destroy_session(struct ltt_ust_session *session) { - return NULL; } static inline -void trace_ust_destroy_session(struct ltt_ust_session *session) +void trace_ust_destroy_channel(struct ltt_ust_channel *channel) { } static inline -void trace_ust_destroy_metadata(struct ltt_ust_metadata *metadata) +void trace_ust_destroy_event(struct ltt_ust_event *event) { } static inline -void trace_ust_destroy_channel(struct ltt_ust_channel *channel) +void trace_ust_free_session(struct ltt_ust_session *session) { } static inline -void trace_ust_destroy_event(struct ltt_ust_event *event) +struct ltt_ust_context *trace_ust_create_context( + const struct lttng_event_context *ctx) { + return NULL; } static inline -struct ltt_ust_context *trace_ust_create_context( - struct lttng_event_context *ctx) +int trace_ust_match_context(const struct ltt_ust_context *uctx, + const struct lttng_event_context *ctx) { - return NULL; + 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) +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; } @@ -260,7 +327,38 @@ 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_id(enum lttng_tracker_type tracker_type, + struct ltt_ust_session *session, + const struct lttng_tracker_id *id) +{ + return 0; +} +static inline int trace_ust_untrack_id(enum lttng_tracker_type tracker_type, + struct ltt_ust_session *session, + const struct lttng_tracker_id *id) +{ + return 0; +} +static inline int trace_ust_id_tracker_lookup( + enum lttng_tracker_type tracker_type, + struct ltt_ust_session *session, + int pid) +{ + return 0; +} +static inline int trace_ust_list_tracker_ids( + enum lttng_tracker_type tracker_type, + struct ltt_ust_session *session, + struct lttng_tracker_ids **_ids) +{ + return -1; +} #endif /* HAVE_LIBLTTNG_UST_CTL */ #endif /* _LTT_TRACE_UST_H */