X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fagent.h;h=ea5662754aef05fdecafe576b0abb97c2b9783eb;hp=ed263e3fbf6472c77df2e0fb60d46108d325068e;hb=a2b988e2cc31f76365b600ca4e3a26604de00022;hpb=51755dc8c7607233c5f62b7931326d7d95df7910

diff --git a/src/bin/lttng-sessiond/agent.h b/src/bin/lttng-sessiond/agent.h
index ed263e3fb..ea5662754 100644
--- a/src/bin/lttng-sessiond/agent.h
+++ b/src/bin/lttng-sessiond/agent.h
@@ -1,5 +1,6 @@
 /*
  * 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
@@ -18,14 +19,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 +36,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;
 };
 
 /*
@@ -80,7 +82,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;
 
 	/*
@@ -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;
 };
@@ -131,19 +136,28 @@ 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 agent_event *agent_create_event(const char *name,
+		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);