X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fagent.h;h=c88af21c5a13e53536a248d87be6495905ff452f;hp=ed263e3fbf6472c77df2e0fb60d46108d325068e;hb=246611b0dffa58fbc0e2329ddf6f9dc9d9eff7ce;hpb=51755dc8c7607233c5f62b7931326d7d95df7910 diff --git a/src/bin/lttng-sessiond/agent.h b/src/bin/lttng-sessiond/agent.h index ed263e3fb..c88af21c5 100644 --- a/src/bin/lttng-sessiond/agent.h +++ b/src/bin/lttng-sessiond/agent.h @@ -1,31 +1,21 @@ /* - * Copyright (C) 2013 - David Goulet + * Copyright (C) 2013 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 LTTNG_SESSIOND_AGENT_H #define LTTNG_SESSIOND_AGENT_H -#define _GNU_SOURCE #include #include #include /* Agent protocol version that is verified during the agent registration. */ -#define AGENT_MAJOR_VERSION 1 +#define AGENT_MAJOR_VERSION 2 #define AGENT_MINOR_VERSION 0 /* @@ -34,9 +24,15 @@ */ extern struct lttng_ht *agent_apps_ht_by_sock; +/* + * Hash table that contains the trigger agents by domain */ +extern struct lttng_ht *trigger_agents_ht_by_domain; + struct agent_ht_key { const char *name; - int loglevel; + int loglevel_value; + enum lttng_loglevel_type loglevel_type; + const char *filter_expression; }; /* @@ -76,29 +72,43 @@ struct agent_app { /* * Agent event representation. + * Accesses to this structure are protected by the session list lock. */ struct agent_event { /* Name of the event. */ char name[LTTNG_SYMBOL_NAME_LEN]; - int loglevel; + int loglevel_value; enum lttng_loglevel_type loglevel_type; /* - * Tells if the event is enabled or not on the agent. + * Tells if the event is enabled or not on the agent. While this can be + * implicitly tested as a boolean, it is in fact a reference count and + * the AGENT_EVENT_IS_ENABLED macro should be used to prevent accidental + * comparisons to non-zero literals (e.g. '1'). + * + * Multiple triggers and events can map to the same agent event as it + * is merely a "filter" in front of a user space tracer enabler. + * + * This count is updated to ensure an event is only disabled when all + * matching enablers are disabled. */ - unsigned int enabled:1; + unsigned int enabled_count; /* Hash table node of the agent domain object. */ struct lttng_ht_node_str node; /* Filter associated with the event. NULL if none. */ - struct lttng_filter_bytecode *filter; + struct lttng_bytecode *filter; char *filter_expression; struct lttng_event_exclusion *exclusion; }; +#define AGENT_EVENT_IS_ENABLED(agent_event) (!!agent_event->enabled_count) + /* - * Agent object containing events enabled/disabled for it. + * Agent object containing events enabled/disabled for a given domain in a + * scope. The scope is typically a session, but can also be "global" in the + * context of event notifiers: see event_notifiers_find_agent(). */ struct agent { /* @@ -115,6 +125,9 @@ struct agent { /* Contains event indexed by name. */ struct lttng_ht *events; + /* Application context list (struct agent_app_ctx). */ + struct cds_list_head app_ctx_list; + /* Node used for the hash table indexed by domain type. */ struct lttng_ht_node_u64 node; }; @@ -131,19 +144,30 @@ void agent_destroy(struct agent *agt); void agent_add(struct agent *agt, struct lttng_ht *ht); /* Agent event API. */ -struct agent_event *agent_create_event(const char *name, int loglevel, - enum lttng_loglevel_type loglevel_type, - struct lttng_filter_bytecode *filter, +struct agent_event *agent_create_event(const char *name, + enum lttng_loglevel_type loglevel_type, int loglevel_value, + struct lttng_bytecode *filter, char *filter_expression); void agent_add_event(struct agent_event *event, struct agent *agt); -struct agent_event *agent_find_event(const char *name, int loglevel, - struct agent *agt); -struct agent_event *agent_find_event_by_name(const char *name, +struct agent_event *agent_find_event(const char *name, + enum lttng_loglevel_type loglevel_type, + int loglevel_value, + const char *filter_expression, struct agent *agt); +void agent_find_events_by_name(const char *name, struct agent *agt, + struct lttng_ht_iter* iter); +void agent_event_next_duplicate(const char *name, + struct agent *agt, struct lttng_ht_iter* iter); void agent_delete_event(struct agent_event *event, struct agent *agt); void agent_destroy_event(struct agent_event *event); +/* Agent context API.*/ +int agent_enable_context(const struct lttng_event_context *ctx, + enum lttng_domain_type domain); +int agent_add_context(const struct lttng_event_context *ctx, + struct agent *agt); + /* Agent app API. */ struct agent_app *agent_create_app(pid_t pid, enum lttng_domain_type domain, struct lttcomm_sock *sock); @@ -159,8 +183,17 @@ int agent_enable_event(struct agent_event *event, enum lttng_domain_type domain); int agent_disable_event(struct agent_event *event, enum lttng_domain_type domain); -void agent_update(struct agent *agt, int sock); +void agent_update(const struct agent *agt, const struct agent_app *app); int agent_list_events(struct lttng_event **events, enum lttng_domain_type domain); +struct agent_event *agent_find_event_by_trigger( + const struct lttng_trigger *trigger, struct agent *agt); + +/* Global event notifier per-domain agents. */ +struct agent *agent_find_by_event_notifier_domain( + enum lttng_domain_type domain_type); +void agent_by_event_notifier_domain_ht_destroy(void); +int agent_by_event_notifier_domain_ht_create(void); + #endif /* LTTNG_SESSIOND_AGENT_H */