Save filter expression as part of agent events and save them

[lttng-tools.git] / src / bin / lttng-sessiond / agent.h

diff --git a/src/bin/lttng-sessiond/agent.h b/src/bin/lttng-sessiond/agent.h
index 6564b88c84f6e260d1f875074d6bb313fa4b73aa..ed263e3fbf6472c77df2e0fb60d46108d325068e 100644 (file)
--- a/src/bin/lttng-sessiond/agent.h
+++ b/src/bin/lttng-sessiond/agent.h
@@ -30,9 +30,9 @@
 
 /*
  * 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;
@@ -58,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;
 
@@ -91,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;
 };
 
 /*
@@ -117,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);
@@ -127,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,
@@ -145,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 */