X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fagent.h;h=72aa48108cfc5f4cacc2d0e5a3851d5ee38e9191;hp=7fba3e9e31c7400865aa1ae4727e49fcc72c6fb0;hb=2463b7879c00298daa79744cdaae82ac061a4ed8;hpb=890d8fe47755c3bad936389cf48ffa141cff41c9

diff --git a/src/bin/lttng-sessiond/agent.h b/src/bin/lttng-sessiond/agent.h
index 7fba3e9e3..72aa48108 100644
--- a/src/bin/lttng-sessiond/agent.h
+++ b/src/bin/lttng-sessiond/agent.h
@@ -1,18 +1,9 @@
 /*
- * Copyright (C) 2013 - David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2013 David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * 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
@@ -24,7 +15,7 @@
 #include <lttng/lttng.h>
 
 /* 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
 
 /*
@@ -33,10 +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_value;
 	enum lttng_loglevel_type loglevel_type;
+	const char *filter_expression;
 };
 
 /*
@@ -92,9 +88,15 @@ struct agent_event {
 	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;
+
+	/*
+	 * Multiple triggers and events can use this agent event.
+	 * The event can only be disabled when the count is zero.
+	 */
+	unsigned int user_refcount;
 };
 
 /*
@@ -115,6 +117,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;
 };
@@ -133,12 +138,14 @@ void agent_add(struct agent *agt, struct lttng_ht *ht);
 /* Agent event API. */
 struct agent_event *agent_create_event(const char *name,
 		enum lttng_loglevel_type loglevel_type, int loglevel_value,
-		struct lttng_filter_bytecode *filter,
+		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,
-		enum lttng_loglevel_type loglevel_type, int loglevel_value,
+		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);
@@ -147,6 +154,12 @@ void agent_event_next_duplicate(const char *name,
 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);
@@ -162,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 */