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 b737b166a567972970282094f46dc3deef7d81f1..2b3d864a6515b54ff5cf817ab818d2da3e66c8da 100644 (file)
--- a/src/bin/lttng-sessiond/agent.h
+++ b/src/bin/lttng-sessiond/agent.h
@@ -18,14 +18,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
 
 /*
@@ -37,6 +36,8 @@ extern struct lttng_ht *agent_apps_ht_by_sock;
 struct agent_ht_key {
        const char *name;
        int loglevel_value;
+       enum lttng_loglevel_type loglevel_type;
+       char *filter_expression;
 };
 
 /*
@@ -131,16 +132,19 @@ 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);