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

diff --git a/src/bin/lttng-sessiond/agent.h b/src/bin/lttng-sessiond/agent.h
index 3dbf7179a..ed263e3fb 100644
--- a/src/bin/lttng-sessiond/agent.h
+++ b/src/bin/lttng-sessiond/agent.h
@@ -24,11 +24,15 @@
 #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_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;
 
 struct agent_ht_key {
 	const char *name;
@@ -43,6 +47,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 +58,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;
 
@@ -85,8 +91,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. */
+	/* Filter associated with the event. NULL if none. */
 	struct lttng_filter_bytecode *filter;
+	char *filter_expression;
+	struct lttng_event_exclusion *exclusion;
 };
 
 /*
@@ -111,8 +119,10 @@ struct agent {
 	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);
@@ -121,8 +131,10 @@ 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,
-		struct lttng_filter_bytecode *filter);
+struct agent_event *agent_create_event(const char *name, int loglevel,
+		enum lttng_loglevel_type loglevel_type,
+		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,
@@ -139,6 +151,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 */
@@ -147,6 +160,7 @@ int agent_enable_event(struct agent_event *event,
 int agent_disable_event(struct agent_event *event,
 		enum lttng_domain_type domain);
 void agent_update(struct agent *agt, int sock);
-int agent_list_events(struct lttng_event **events);
+int agent_list_events(struct lttng_event **events,
+		enum lttng_domain_type domain);
 
 #endif /* LTTNG_SESSIOND_AGENT_H */