Fix: include the filter expression in agent events' primary key

[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 f8d9ca6ea5b35eabac13c6182e0a3c6a5bca2966..2b3d864a6515b54ff5cf817ab818d2da3e66c8da 100644 (file)
--- a/src/bin/lttng-sessiond/agent.h
+++ b/src/bin/lttng-sessiond/agent.h
@@ -18,21 +18,26 @@
 #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            2
+#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;
-       int loglevel;
+       int loglevel_value;
+       enum lttng_loglevel_type loglevel_type;
+       char *filter_expression;
 };
 
 /*
@@ -43,6 +48,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 +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;
 
@@ -74,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;
 
        /*
@@ -85,8 +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. */
+       /* Filter associated with the event. NULL if none. */
        struct lttng_filter_bytecode *filter;
+       char *filter_expression;
+       struct lttng_event_exclusion *exclusion;
 };
 
 /*
@@ -111,8 +120,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);
@@ -122,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);
 
@@ -139,6 +155,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 */