X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fagent.h;h=f8e67efdae82b7130e951d721859841991fa2e76;hp=77c8faf584886e4590a7ae92ba73d4528aecaa3d;hb=505b2d90aa87592186ecc2a119cf67fb3f90d168;hpb=8404118c67ee01844e0bcee69d05c684689506b0

diff --git a/src/bin/lttng-sessiond/agent.h b/src/bin/lttng-sessiond/agent.h
index 77c8faf58..f8e67efda 100644
--- a/src/bin/lttng-sessiond/agent.h
+++ b/src/bin/lttng-sessiond/agent.h
@@ -1,31 +1,21 @@
 /*
- * 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
 #define LTTNG_SESSIOND_AGENT_H
 
-#define _GNU_SOURCE
 #include <inttypes.h>
 
 #include <common/hashtable/hashtable.h>
 #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
 
 /*
@@ -36,7 +26,9 @@ extern struct lttng_ht *agent_apps_ht_by_sock;
 
 struct agent_ht_key {
 	const char *name;
-	int loglevel;
+	int loglevel_value;
+	enum lttng_loglevel_type loglevel_type;
+	char *filter_expression;
 };
 
 /*
@@ -58,7 +50,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;
 
@@ -80,7 +72,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;
 
 	/*
@@ -91,9 +83,10 @@ 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. */
-	char *filter_expression;
+	/* Filter associated with the event. NULL if none. */
 	struct lttng_filter_bytecode *filter;
+	char *filter_expression;
+	struct lttng_event_exclusion *exclusion;
 };
 
 /*
@@ -114,6 +107,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,16 +127,27 @@ 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_filter_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 *agt);
+struct agent_event *agent_find_event(const char *name,
+		enum lttng_loglevel_type loglevel_type, int loglevel_value,
+		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);
@@ -156,7 +163,7 @@ 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);