X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fagent-thread.c;h=f2ee4c0415b855f094d6704dc0cbfe18962bb0cd;hb=3a5f70173aa04d11ccb22694d5d31a702cad33ab;hp=720639efd0b50d0433992c22b113a6be8693b439;hpb=412d7227e69ec845e44c49082a417f9454d9b55d;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/agent-thread.c b/src/bin/lttng-sessiond/agent-thread.c
index 720639efd..f2ee4c041 100644
--- a/src/bin/lttng-sessiond/agent-thread.c
+++ b/src/bin/lttng-sessiond/agent-thread.c
@@ -6,7 +6,6 @@
  */
 
 #define _LGPL_SOURCE
-#include <assert.h>
 
 #include <common/common.h>
 #include <common/sessiond-comm/sessiond-comm.h>
@@ -63,7 +62,7 @@ static void update_agent_app(const struct agent_app *app)
 	struct lttng_ht_iter iter;
 
 	list = session_get_list();
-	assert(list);
+	LTTNG_ASSERT(list);
 
 	cds_list_for_each_entry_safe(session, stmp, &list->head, list) {
 		if (!session_get(session)) {
@@ -113,14 +112,14 @@ static struct lttcomm_sock *init_tcp_socket(void)
 	 * before this thread is launched.
 	 */
 	ret = uri_parse(default_reg_uri, &uri);
-	assert(ret);
-	assert(the_config.agent_tcp_port.begin > 0);
+	LTTNG_ASSERT(ret);
+	LTTNG_ASSERT(the_config.agent_tcp_port.begin > 0);
 	uri->port = the_config.agent_tcp_port.begin;
 
 	sock = lttcomm_alloc_sock_from_uri(uri);
 	uri_free(uri);
 	if (sock == NULL) {
-		ERR("[agent-thread] agent allocating TCP socket");
+		ERR("agent allocating TCP socket");
 		goto error;
 	}
 
@@ -133,11 +132,11 @@ static struct lttcomm_sock *init_tcp_socket(void)
 			port <= the_config.agent_tcp_port.end; port++) {
 		ret = lttcomm_sock_set_port(sock, (uint16_t) port);
 		if (ret) {
-			ERR("[agent-thread] Failed to set port %u on socket",
+			ERR("Failed to set port %u on socket",
 					port);
 			goto error;
 		}
-		DBG3("[agent-thread] Trying to bind on port %u", port);
+		DBG3("Trying to bind on port %u", port);
 		ret = sock->ops->bind(sock);
 		if (!ret) {
 			bind_succeeded = true;
@@ -174,7 +173,7 @@ static struct lttcomm_sock *init_tcp_socket(void)
 		goto error;
 	}
 
-	DBG("[agent-thread] Listening on TCP port %u and socket %d",
+	DBG("Listening on TCP port %u and socket %d",
 			port, sock->fd);
 
 	return sock;
@@ -194,15 +193,15 @@ static void destroy_tcp_socket(struct lttcomm_sock *sock)
 	int ret;
 	uint16_t port;
 
-	assert(sock);
+	LTTNG_ASSERT(sock);
 
 	ret = lttcomm_sock_get_port(sock, &port);
 	if (ret) {
-		ERR("[agent-thread] Failed to get port of agent TCP socket");
+		ERR("Failed to get port of agent TCP socket");
 		port = 0;
 	}
 
-	DBG3("[agent-thread] Destroy TCP socket on port %" PRIu16,
+	DBG3("Destroy TCP socket on port %" PRIu16,
 			port);
 
 	/* This will return gracefully if fd is invalid. */
@@ -263,7 +262,7 @@ static int accept_agent_connection(
 	struct agent_register_msg msg;
 	struct lttcomm_sock *new_sock;
 
-	assert(reg_sock);
+	LTTNG_ASSERT(reg_sock);
 
 	new_sock = reg_sock->ops->accept(reg_sock);
 	if (!new_sock) {
@@ -322,7 +321,7 @@ bool agent_tracing_is_enabled(void)
 	int enabled;
 
 	enabled = uatomic_read(&agent_tracing_enabled);
-	assert(enabled != -1);
+	LTTNG_ASSERT(enabled != -1);
 	return enabled == 1;
 }
 
@@ -363,13 +362,13 @@ static void *thread_agent_management(void *data)
 	const int quit_pipe_read_fd = lttng_pipe_get_readfd(
 			notifiers->quit_pipe);
 
-	DBG("[agent-thread] Manage agent application registration.");
+	DBG("Manage agent application registration.");
 
 	rcu_register_thread();
 	rcu_thread_online();
 
 	/* Agent initialization call MUST be called before starting the thread. */
-	assert(the_agent_apps_ht_by_sock);
+	LTTNG_ASSERT(the_agent_apps_ht_by_sock);
 
 	/* Create pollset with size 2, quit pipe and registration socket. */
 	ret = lttng_poll_create(&events, 2, LTTNG_CLOEXEC);
@@ -387,11 +386,12 @@ static void *thread_agent_management(void *data)
 	if (reg_sock) {
 		uint16_t port;
 
-		assert(lttcomm_sock_get_port(reg_sock, &port) == 0);
+		ret = lttcomm_sock_get_port(reg_sock, &port);
+		LTTNG_ASSERT(ret == 0);
 
 		ret = write_agent_port(port);
 		if (ret) {
-			ERR("[agent-thread] Failed to create agent port file: agent tracing will be unavailable");
+			ERR("Failed to create agent port file: agent tracing will be unavailable");
 			/* Don't prevent the launch of the sessiond on error. */
 			mark_thread_as_ready(notifiers);
 			goto error;
@@ -417,12 +417,12 @@ static void *thread_agent_management(void *data)
 	}
 
 	while (1) {
-		DBG3("[agent-thread] Manage agent polling");
+		DBG3("Manage agent polling");
 
 		/* Inifinite blocking call, waiting for transmission */
 restart:
 		ret = lttng_poll_wait(&events, -1);
-		DBG3("[agent-thread] Manage agent return from poll on %d fds",
+		DBG3("Manage agent return from poll on %d fds",
 				LTTNG_POLL_GETNB(&events));
 		if (ret < 0) {
 			/*
@@ -434,7 +434,7 @@ restart:
 			goto error;
 		}
 		nb_fd = ret;
-		DBG3("[agent-thread] %d fd ready", nb_fd);
+		DBG3("%d fd ready", nb_fd);
 
 		for (i = 0; i < nb_fd; i++) {
 			/* Fetch once the poll data */
@@ -453,7 +453,7 @@ restart:
 				struct lttcomm_sock *new_app_socket;
 				int new_app_socket_fd;
 
-				assert(pollfd == reg_sock->fd);
+				LTTNG_ASSERT(pollfd == reg_sock->fd);
 
 				ret = accept_agent_connection(
 					reg_sock, &new_app_id, &new_app_socket);
@@ -542,7 +542,7 @@ error_tcp_socket:
 	lttng_poll_clean(&events);
 error_poll_create:
 	uatomic_set(&agent_tracing_enabled, 0);
-	DBG("[agent-thread] Cleaning up and stopping.");
+	DBG("Cleaning up and stopping.");
 	rcu_thread_offline();
 	rcu_unregister_thread();
 	return NULL;