X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.h;h=cc7cd332ccdaf393369314daa44a978d65ab96c2;hp=2d0b042e5e3a90fab3d9f9d2841b3bfac9ea6047;hb=246611b0dffa58fbc0e2329ddf6f9dc9d9eff7ce;hpb=2d97a0067600335f07eecb2c1d9ba68fc164583e diff --git a/src/bin/lttng-sessiond/trace-ust.h b/src/bin/lttng-sessiond/trace-ust.h index 2d0b042e5..cc7cd332c 100644 --- a/src/bin/lttng-sessiond/trace-ust.h +++ b/src/bin/lttng-sessiond/trace-ust.h @@ -1,19 +1,9 @@ /* - * Copyright (C) 2011 - David Goulet - * Copyright (C) 2016 - Jérémie Galarneau + * 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, - * 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 @@ -22,9 +12,10 @@ #include #include -#include -#include #include +#include +#include +#include #include "consumer.h" #include "lttng-ust-ctl.h" @@ -33,8 +24,8 @@ struct agent; struct ltt_ust_ht_key { const char *name; - const struct lttng_filter_bytecode *filter; - enum lttng_ust_loglevel_type loglevel_type; + const struct lttng_bytecode *filter; + enum lttng_ust_abi_loglevel_type loglevel_type; int loglevel_value; const struct lttng_event_exclusion *exclusion; }; @@ -49,10 +40,10 @@ 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_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 @@ -72,8 +63,8 @@ struct ltt_ust_channel { * Log4j, Python. */ enum lttng_domain_type domain; - char name[LTTNG_UST_SYM_NAME_LEN]; - struct lttng_ust_channel_attr attr; + 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; @@ -130,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. @@ -147,9 +138,9 @@ struct ltt_ust_session { 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; + struct process_attr_tracker *tracker_vpid; + struct process_attr_tracker *tracker_vuid; + struct process_attr_tracker *tracker_vgid; }; /* @@ -191,8 +182,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, - enum lttng_ust_loglevel_type loglevel_type, int loglevel_value, + 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, const char *name); @@ -207,7 +198,7 @@ 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_bytecode *filter, struct lttng_event_exclusion *exclusion, bool internal_event, struct ltt_ust_event **ust_event); struct ltt_ust_context *trace_ust_create_context( @@ -227,20 +218,24 @@ 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, +int trace_ust_id_tracker_lookup(enum lttng_process_attr process_attr, struct ltt_ust_session *session, - const struct lttng_tracker_id *id); -int trace_ust_untrack_id(enum lttng_tracker_type tracker_type, + int id); +enum lttng_error_code trace_ust_process_attr_tracker_set_tracking_policy( struct ltt_ust_session *session, - const struct lttng_tracker_id *id); - -int trace_ust_id_tracker_lookup(enum lttng_tracker_type tracker_type, + 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, - int id); - -ssize_t trace_ust_list_tracker_ids(enum lttng_tracker_type tracker_type, + 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, - struct lttng_tracker_id ***_ids); + 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 */ @@ -275,7 +270,7 @@ struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *attr, static inline enum lttng_error_code trace_ust_create_event(struct lttng_event *ev, const char *filter_expression, - struct lttng_filter_bytecode *filter, + struct lttng_bytecode *filter, struct lttng_event_exclusion *exclusion, bool internal_event, struct ltt_ust_event **ust_event) { @@ -315,8 +310,8 @@ int trace_ust_match_context(const struct ltt_ust_context *uctx, } 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, + char *name, struct lttng_bytecode *filter, + enum lttng_ust_abi_loglevel_type loglevel_type, int loglevel_value, struct lttng_event_exclusion *exclusion) { return NULL; @@ -333,32 +328,44 @@ struct agent *trace_ust_find_agent(struct ltt_ust_session *session, { return NULL; } -static inline int trace_ust_track_id(enum lttng_tracker_type tracker_type, +static inline int trace_ust_id_tracker_lookup( + enum lttng_process_attr process_attr, struct ltt_ust_session *session, - const struct lttng_tracker_id *id); + int id) { return 0; } -static inline int trace_ust_untrack_id(enum lttng_tracker_type tracker_type, +static inline enum lttng_error_code +trace_ust_process_attr_tracker_set_tracking_policy( struct ltt_ust_session *session, - const struct lttng_tracker_id *id) + enum lttng_process_attr process_attr, + enum lttng_tracking_policy policy) { - return 0; + return LTTNG_OK; } -static inline int trace_ust_id_tracker_lookup( - enum lttng_tracker_type tracker_type, +static inline enum lttng_error_code +trace_ust_process_attr_tracker_inclusion_set_add_value( struct ltt_ust_session *session, - int pid) + enum lttng_process_attr process_attr, + const struct process_attr_value *value) { - return 0; + return LTTNG_OK; } -static inline ssize_t trace_ust_list_tracker_ids( - enum lttng_tracker_type tracker_type, +static inline enum lttng_error_code +trace_ust_process_attr_tracker_inclusion_set_remove_value( struct ltt_ust_session *session, - struct lttng_tracker_id **_ids) + enum lttng_process_attr process_attr, + const struct process_attr_value *value) { - return -1; + return LTTNG_OK; } +static inline const struct process_attr_tracker * +trace_ust_get_process_attr_tracker(struct ltt_ust_session *session, + enum lttng_process_attr process_attr) +{ + return NULL; +} + #endif /* HAVE_LIBLTTNG_UST_CTL */ #endif /* _LTT_TRACE_UST_H */