X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.h;h=a06c471cce9a6c10a7673f10e86ab1d55da31eb7;hp=9316fa8174df1db069fec8cc2d91f61444f182ec;hb=refs%2Fheads%2Fsow-2019-0002-rev1;hpb=d070c424703336e9cca9d1603e1a81bee5b59560 diff --git a/src/bin/lttng-sessiond/trace-ust.h b/src/bin/lttng-sessiond/trace-ust.h index 9316fa817..a06c471cc 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 @@ -27,7 +17,7 @@ #include #include "consumer.h" -#include "ust-ctl.h" +#include "lttng-ust-ctl.h" struct agent; @@ -91,11 +81,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; }; @@ -138,10 +128,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 lttng_tracker_list *tracker_list_vpid; + struct lttng_tracker_list *tracker_list_vuid; + struct lttng_tracker_list *tracker_list_vgid; }; /* @@ -187,7 +185,7 @@ struct ltt_ust_event *trace_ust_find_event(struct lttng_ht *ht, 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); @@ -203,9 +201,9 @@ enum lttng_error_code trace_ust_create_event(struct lttng_event *ev, 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); @@ -219,13 +217,20 @@ 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); +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_pid_tracker_lookup(struct ltt_ust_session *session, int pid); +int trace_ust_id_tracker_lookup(enum lttng_tracker_type tracker_type, + struct ltt_ust_session *session, + int id); -ssize_t trace_ust_list_tracker_pids(struct ltt_ust_session *session, - int32_t **_pids); +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 */ @@ -241,7 +246,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; } @@ -288,13 +293,13 @@ 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) + const struct lttng_event_context *ctx) { 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, + const struct lttng_event_context *ctx) { return 0; } @@ -318,24 +323,29 @@ struct agent *trace_ust_find_agent(struct ltt_ust_session *session, { return NULL; } -static inline -int trace_ust_track_pid(struct ltt_ust_session *session, int pid) +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_pid(struct ltt_ust_session *session, int pid) +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_pid_tracker_lookup(struct ltt_ust_session *session, int pid) +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 -ssize_t trace_ust_list_tracker_pids(struct ltt_ust_session *session, - int32_t **_pids) +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; }