X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fagent.h;h=72aa48108cfc5f4cacc2d0e5a3851d5ee38e9191;hp=f8d9ca6ea5b35eabac13c6182e0a3c6a5bca2966;hb=2463b7879c00298daa79744cdaae82ac061a4ed8;hpb=f60140a188c6c0cd1acf948c37e338e96a74be8d diff --git a/src/bin/lttng-sessiond/agent.h b/src/bin/lttng-sessiond/agent.h index f8d9ca6ea..72aa48108 100644 --- a/src/bin/lttng-sessiond/agent.h +++ b/src/bin/lttng-sessiond/agent.h @@ -1,38 +1,38 @@ /* - * 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 2 +#define AGENT_MINOR_VERSION 0 + /* * Hash table that contains the agent app created upon registration indexed by - * socket. + * socket. Global to the session daemon. */ -struct lttng_ht *agent_apps_ht_by_sock; +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; }; /* @@ -43,6 +43,8 @@ struct agent_register_msg { /* This maps to a lttng_domain_type. */ uint32_t domain; uint32_t pid; + uint32_t major_version; + uint32_t minor_version; }; /* @@ -52,7 +54,7 @@ struct agent_register_msg { */ struct agent_app { /* - * PID sent during registration of a AGENT application. + * PID sent during registration of an agent application. */ pid_t pid; @@ -74,7 +76,7 @@ struct agent_app { struct agent_event { /* Name of the event. */ char name[LTTNG_SYMBOL_NAME_LEN]; - int loglevel; + int loglevel_value; enum lttng_loglevel_type loglevel_type; /* @@ -85,8 +87,16 @@ struct agent_event { /* Hash table node of the agent domain object. */ struct lttng_ht_node_str node; - /* Bytecode filter associated with the event . NULL if none. */ - struct lttng_filter_bytecode *filter; + /* Filter associated with the event. NULL if none. */ + struct lttng_bytecode *filter; + char *filter_expression; + struct lttng_event_exclusion *exclusion; + + /* + * Multiple triggers and events can use this agent event. + * The event can only be disabled when the count is zero. + */ + unsigned int user_refcount; }; /* @@ -107,12 +117,17 @@ 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; }; -/* Setup agent subsystem. */ -int agent_setup(void); +/* Allocate agent apps hash table */ +int agent_app_ht_alloc(void); +/* Clean-up agent apps hash table */ +void agent_app_ht_clean(void); /* Initialize an already allocated agent domain. */ int agent_init(struct agent *agt); @@ -122,16 +137,29 @@ void agent_add(struct agent *agt, struct lttng_ht *ht); /* Agent event API. */ struct agent_event *agent_create_event(const char *name, - struct lttng_filter_bytecode *filter); + 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); @@ -139,6 +167,7 @@ void agent_add_app(struct agent_app *app); void agent_delete_app(struct agent_app *app); struct agent_app *agent_find_app_by_sock(int sock); void agent_destroy_app(struct agent_app *app); +void agent_destroy_app_by_sock(int sock); int agent_send_registration_done(struct agent_app *app); /* Agent action API */ @@ -146,8 +175,16 @@ 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); + +/* todo: find a better place for this */ +struct agent *trigger_find_agent(enum lttng_domain_type domain_type); +void trigger_agent_ht_clean(void); +int trigger_agent_ht_alloc(void); + #endif /* LTTNG_SESSIOND_AGENT_H */