X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.h;h=9316fa8174df1db069fec8cc2d91f61444f182ec;hp=4a818df1a06ab996d6510d0d6e785ac40f20b004;hb=d070c424703336e9cca9d1603e1a81bee5b59560;hpb=5b37cc51aaa06af23d7bd70368ffd94f569effba diff --git a/src/bin/lttng-sessiond/trace-ust.h b/src/bin/lttng-sessiond/trace-ust.h index 4a818df1a..9316fa817 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 @@ -34,13 +34,14 @@ 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; }; @@ -51,7 +52,7 @@ 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 @@ -66,6 +67,11 @@ struct ltt_ust_event { 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; @@ -74,6 +80,9 @@ 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; + uint64_t monitor_timer_interval; }; /* UST domain global (LTTNG_DOMAIN_UST) */ @@ -101,14 +110,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. */ @@ -137,6 +139,9 @@ struct ltt_ust_session { 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; }; /* @@ -178,7 +183,8 @@ 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); @@ -189,12 +195,13 @@ 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, - bool internal_event); + 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, @@ -209,6 +216,8 @@ 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); @@ -243,18 +252,19 @@ 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, +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) + bool internal_event, struct ltt_ust_event **ust_event) { - return NULL; + return LTTNG_ERR_NO_UST; } static inline void trace_ust_destroy_session(struct ltt_ust_session *session) @@ -270,6 +280,12 @@ static inline void trace_ust_destroy_event(struct ltt_ust_event *event) { } + +static inline +void trace_ust_free_session(struct ltt_ust_session *session) +{ +} + static inline struct ltt_ust_context *trace_ust_create_context( struct lttng_event_context *ctx) @@ -282,8 +298,10 @@ int trace_ust_match_context(struct ltt_ust_context *uctx, { 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;