Notify java agent of enabled application contexts

[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 949c0d1d47ff79727c1e77b4e895018dcf6d67cc..c0808c48fe50ab0845aba4572d3607b576446f4e 100644 (file)
--- a/src/bin/lttng-sessiond/agent.h
+++ b/src/bin/lttng-sessiond/agent.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2013 - David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2016 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License, version 2 only, as
@@ -18,14 +19,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
 
 /*
@@ -38,6 +38,7 @@ struct agent_ht_key {
        const char *name;
        int loglevel_value;
        enum lttng_loglevel_type loglevel_type;
+       char *filter_expression;
 };
 
 /*
@@ -116,6 +117,9 @@ struct agent {
        /* Contains event indexed by name. */
        struct lttng_ht *events;
 
+       /* Application context list (struct agent_app_ctx). */
+       struct cds_list_head app_ctx_list;
+
        /* Node used for the hash table indexed by domain type. */
        struct lttng_ht_node_u64 node;
 };
@@ -140,12 +144,19 @@ void agent_add_event(struct agent_event *event, struct agent *agt);
 
 struct agent_event *agent_find_event(const char *name,
                enum lttng_loglevel_type loglevel_type, int loglevel_value,
-               struct agent *agt);
-struct agent_event *agent_find_event_by_name(const char *name,
-               struct agent *agt);
+               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);
 
+/* Agent context API.*/
+int agent_enable_context(struct lttng_event_context *ctx,
+               enum lttng_domain_type domain);
+int agent_add_context(struct lttng_event_context *ctx, struct agent *agt);
+
 /* Agent app API. */
 struct agent_app *agent_create_app(pid_t pid, enum lttng_domain_type domain,
                struct lttcomm_sock *sock);