X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fagent.h;h=b94ceb0b9ef968c908179f4210bb2d48f04ce469;hb=f76d886f794c80a3c761613532d6a9a72a918cb8;hp=f8d9ca6ea5b35eabac13c6182e0a3c6a5bca2966;hpb=f60140a188c6c0cd1acf948c37e338e96a74be8d;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/agent.h b/src/bin/lttng-sessiond/agent.h
index f8d9ca6ea..b94ceb0b9 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;
 
@@ -86,6 +92,7 @@ struct agent_event {
 	struct lttng_ht_node_str node;
 
 	/* Bytecode filter associated with the event . NULL if none. */
+	char *filter_expression;
 	struct lttng_filter_bytecode *filter;
 };
 
@@ -111,8 +118,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);
@@ -139,6 +148,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 */