X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fagent.c;h=0bce01b44567d9d49c31e3e40788e0c47491b66f;hb=4ff45c64c1ef980d3de6a849494d9e63b1ba2544;hp=310a7e8e1f7513dba73bd9d8d6a07ed16998eead;hpb=6712db617fe9155ea236f6840c2bd18dbec4c871;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/agent.c b/src/bin/lttng-sessiond/agent.c
index 310a7e8e1..0bce01b44 100644
--- a/src/bin/lttng-sessiond/agent.c
+++ b/src/bin/lttng-sessiond/agent.c
@@ -143,7 +143,7 @@ static int ht_match_event(struct cds_lfht_node *node,
 	}
 
 	/* Filter expression */
-	if (!!event->filter_expression ^ !!key->filter_expression) {
+	if (!!event->filter_expression != !!key->filter_expression) {
 		/* One has a filter expression, the other does not */
 		goto no_match;
 	}
@@ -390,7 +390,7 @@ error:
  *
  * Return LTTNG_OK on success or else a LTTNG_ERR* code.
  */
-static int enable_event(struct agent_app *app, struct agent_event *event)
+static int enable_event(const struct agent_app *app, struct agent_event *event)
 {
 	int ret;
 	char *bytes_to_send;
@@ -505,8 +505,8 @@ end:
  *
  * Return LTTNG_OK on success or else a LTTNG_ERR* code.
  */
-static int app_context_op(struct agent_app *app,
-		struct agent_app_ctx *ctx, enum lttcomm_agent_command cmd)
+static int app_context_op(const struct agent_app *app,
+		const struct agent_app_ctx *ctx, enum lttcomm_agent_command cmd)
 {
 	int ret;
 	uint32_t reply_ret_code;
@@ -708,7 +708,7 @@ void destroy_app_ctx(struct agent_app_ctx *ctx)
 }
 
 static
-struct agent_app_ctx *create_app_ctx(struct lttng_event_context *ctx)
+struct agent_app_ctx *create_app_ctx(const struct lttng_event_context *ctx)
 {
 	struct agent_app_ctx *agent_ctx = NULL;
 
@@ -738,7 +738,7 @@ end:
  *
  * Return LTTNG_OK on success or else a LTTNG_ERR* code.
  */
-int agent_enable_context(struct lttng_event_context *ctx,
+int agent_enable_context(const struct lttng_event_context *ctx,
 		enum lttng_domain_type domain)
 {
 	int ret;
@@ -955,7 +955,7 @@ struct agent_app *agent_create_app(pid_t pid, enum lttng_domain_type domain,
 
 	app = zmalloc(sizeof(*app));
 	if (!app) {
-		PERROR("zmalloc agent create");
+		PERROR("Failed to allocate agent application instance");
 		goto error;
 	}
 
@@ -1166,7 +1166,7 @@ void agent_add_event(struct agent_event *event, struct agent *agt)
 /*
  * Unique add of a agent context to an agent object.
  */
-int agent_add_context(struct lttng_event_context *ctx, struct agent *agt)
+int agent_add_context(const struct lttng_event_context *ctx, struct agent *agt)
 {
 	int ret = LTTNG_OK;
 	struct agent_app_ctx *agent_ctx = NULL;
@@ -1411,26 +1411,24 @@ void agent_app_ht_clean(void)
  * Note that this function is most likely to be used with a tracing session
  * thus the caller should make sure to hold the appropriate lock(s).
  */
-void agent_update(struct agent *agt, int sock)
+void agent_update(const struct agent *agt, const struct agent_app *app)
 {
 	int ret;
-	struct agent_app *app;
 	struct agent_event *event;
 	struct lttng_ht_iter iter;
 	struct agent_app_ctx *ctx;
 
 	assert(agt);
-	assert(sock >= 0);
+	assert(app);
 
-	DBG("Agent updating app socket %d", sock);
+	DBG("Agent updating app: pid = %ld", (long) app->pid);
 
 	rcu_read_lock();
-	app = agent_find_app_by_sock(sock);
 	/*
 	 * We are in the registration path thus if the application is gone,
 	 * there is a serious code flow error.
 	 */
-	assert(app);
+
 	cds_lfht_for_each_entry(agt->events->ht, &iter.iter, event, node.node) {
 		/* Skip event if disabled. */
 		if (!event->enabled) {