X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fagent.h;h=2b3d864a6515b54ff5cf817ab818d2da3e66c8da;hp=77c8faf584886e4590a7ae92ba73d4528aecaa3d;hb=6b10b3b01eb754c0c3149490f700763dbac60ed5;hpb=8404118c67ee01844e0bcee69d05c684689506b0

diff --git a/src/bin/lttng-sessiond/agent.h b/src/bin/lttng-sessiond/agent.h
index 77c8faf58..2b3d864a6 100644
--- a/src/bin/lttng-sessiond/agent.h
+++ b/src/bin/lttng-sessiond/agent.h
@@ -18,14 +18,13 @@
 #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 +35,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 +59,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 +81,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 +92,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;
 };
 
 /*
@@ -131,13 +133,18 @@ 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);