X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fagent.c;h=c0b8a218b5acb0ef3cc33d53e2df2a805b01d7fc;hb=b318c0ee9896652084d437b6c1584d7f2e49c911;hp=1bf490f5a139afd9d47343276111ff6cd1d6ae4f;hpb=022541e7a5ccb09a92e469d87d8e5fe9fc9d7512;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/agent.c b/src/bin/lttng-sessiond/agent.c
index 1bf490f5a..c0b8a218b 100644
--- a/src/bin/lttng-sessiond/agent.c
+++ b/src/bin/lttng-sessiond/agent.c
@@ -124,7 +124,7 @@ static void destroy_event_agent_rcu(struct rcu_head *head)
 	struct agent_event *event =
 		caa_container_of(node, struct agent_event, node);
 
-	free(event);
+	agent_destroy_event(event);
 }
 
 /*
@@ -443,7 +443,7 @@ int agent_send_registration_done(struct agent_app *app)
 
 	DBG("Agent sending registration done to app socket %d", app->sock->fd);
 
-	return send_header(app->sock, 0, AGENT_CMD_REG_DONE, 0);
+	return send_header(app->sock, 0, AGENT_CMD_REG_DONE, 1);
 }
 
 /*
@@ -493,11 +493,14 @@ error:
 int agent_disable_event(struct agent_event *event,
 		enum lttng_domain_type domain)
 {
-	int ret;
+	int ret = LTTNG_OK;
 	struct agent_app *app;
 	struct lttng_ht_iter iter;
 
 	assert(event);
+	if (!event->enabled) {
+		goto end;
+	}
 
 	rcu_read_lock();
 
@@ -515,10 +518,10 @@ int agent_disable_event(struct agent_event *event,
 	}
 
 	event->enabled = 0;
-	ret = LTTNG_OK;
 
 error:
 	rcu_read_unlock();
+end:
 	return ret;
 }
 
@@ -911,12 +914,12 @@ void agent_destroy_event(struct agent_event *event)
 	assert(event);
 
 	free(event->filter);
+	free(event->filter_expression);
 	free(event);
 }
 
 /*
- * Destroy an agent completely. Note that the given pointer is NOT freed
- * thus a reference to static or stack data can be passed to this function.
+ * Destroy an agent completely.
  */
 void agent_destroy(struct agent *agt)
 {
@@ -955,19 +958,71 @@ void agent_destroy(struct agent *agt)
 	rcu_read_unlock();
 
 	ht_cleanup_push(agt->events);
+	free(agt);
 }
 
 /*
- * Initialize agent subsystem.
+ * Allocate agent_apps_ht_by_sock.
  */
-int agent_setup(void)
+int agent_app_ht_alloc(void)
 {
+	int ret = 0;
+
 	agent_apps_ht_by_sock = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG);
 	if (!agent_apps_ht_by_sock) {
-		return -1;
+		ret = -1;
 	}
 
-	return 0;
+	return ret;
+}
+
+/*
+ * Destroy a agent application by socket.
+ */
+void agent_destroy_app_by_sock(int sock)
+{
+	struct agent_app *app;
+
+	assert(sock >= 0);
+
+	/*
+	 * Not finding an application is a very important error that should NEVER
+	 * happen. The hash table deletion is ONLY done through this call when the
+	 * main sessiond thread is torn down.
+	 */
+	rcu_read_lock();
+	app = agent_find_app_by_sock(sock);
+	assert(app);
+
+	/* RCU read side lock is assumed to be held by this function. */
+	agent_delete_app(app);
+
+	/* The application is freed in a RCU call but the socket is closed here. */
+	agent_destroy_app(app);
+	rcu_read_unlock();
+}
+
+/*
+ * Clean-up the agent app hash table and destroy it.
+ */
+void agent_app_ht_clean(void)
+{
+	struct lttng_ht_node_ulong *node;
+	struct lttng_ht_iter iter;
+
+	if (!agent_apps_ht_by_sock) {
+		return;
+	}
+	rcu_read_lock();
+	cds_lfht_for_each_entry(agent_apps_ht_by_sock->ht, &iter.iter, node, node) {
+		struct agent_app *app;
+
+		app = caa_container_of(node, struct agent_app, node);
+		agent_destroy_app_by_sock(app->sock->fd);
+	}
+	rcu_read_unlock();
+
+	lttng_ht_destroy(agent_apps_ht_by_sock);
 }
 
 /*