X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.c;h=10ce291978227acf5d5e35eb5e623cbba80b82fb;hp=cbd9e9cc70bc8733e7f82dc59d21b29651524ae2;hb=f118099a14a45245993eedfe31cb36b3fd948d33;hpb=64e2c0ed5db412b9b3ecced98c7875bf3da0c08f

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index cbd9e9cc7..10ce29197 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -230,7 +230,7 @@ static int set_option(int opt, const char *arg, const char *optname)
 
 			errno = 0;
 			v = strtoul(arg, NULL, 0);
-			if (errno != 0 || !isdigit(arg[0])) {
+			if (errno != 0 || !isdigit((unsigned char) arg[0])) {
 				ERR("Wrong value in --fd-pool-size parameter: %s", arg);
 				ret = -1;
 				goto end;
@@ -507,7 +507,7 @@ static int set_fd_pool_size(void)
 		goto end;
 	}
 
-	DBG("File descriptor pool size argument (%u) adjusted to %u to accomodate transient fd uses",
+	DBG("File descriptor pool size argument (%u) adjusted to %u to accommodates transient fd uses",
 			lttng_opt_fd_pool_size,
 			lttng_opt_fd_pool_size - DEFAULT_RELAYD_FD_POOL_SIZE_RESERVE);
 	lttng_opt_fd_pool_size -= DEFAULT_RELAYD_FD_POOL_SIZE_RESERVE;
@@ -917,7 +917,7 @@ static int create_named_thread_poll_set(struct lttng_poll_event *events,
 	}
 
 	ret = fd_tracker_util_poll_create(the_fd_tracker,
-		        name, events, 1, LTTNG_CLOEXEC);
+			name, events, 1, LTTNG_CLOEXEC);
 	if (ret) {
 		PERROR("Failed to create \"%s\" poll file descriptor", name);
 		goto error;
@@ -978,7 +978,7 @@ static int accept_sock(void *data, int *out_fd)
 	struct lttcomm_sock **socks = data;
 	struct lttcomm_sock *in_sock = socks[0];
 
-        socks[1] = in_sock->ops->accept(in_sock);
+	socks[1] = in_sock->ops->accept(in_sock);
 	if (!socks[1]) {
 		ret = -1;
 		goto end;
@@ -1022,7 +1022,11 @@ static struct lttcomm_sock *relay_socket_create(struct lttng_uri *uri,
 	ret = fd_tracker_open_unsuspendable_fd(the_fd_tracker, &sock_fd,
 			(const char **) (formated_name ? &formated_name : NULL),
 			1, create_sock, sock);
-	free(formated_name);
+	if (ret) {
+		PERROR("Failed to open \"%s\" relay socket",
+				formated_name ?: "Unknown");
+		goto error;
+	}
 	DBG("Listening on %s socket %d", name, sock->fd);
 
 	ret = sock->ops->bind(sock);
@@ -1037,12 +1041,14 @@ static struct lttcomm_sock *relay_socket_create(struct lttng_uri *uri,
 
 	}
 
+	free(formated_name);
 	return sock;
 
 error:
 	if (sock) {
 		lttcomm_destroy_sock(sock);
 	}
+	free(formated_name);
 	return NULL;
 }
 
@@ -1054,7 +1060,7 @@ struct lttcomm_sock *accept_relayd_sock(struct lttcomm_sock *listening_sock,
 	struct lttcomm_sock *socks[2] = { listening_sock, NULL };
 	struct lttcomm_sock *new_sock = NULL;
 
-        ret = fd_tracker_open_unsuspendable_fd(
+	ret = fd_tracker_open_unsuspendable_fd(
 			the_fd_tracker, &out_fd,
 			(const char **) &name,
 			1, accept_sock, &socks);
@@ -1626,7 +1632,8 @@ static int relay_add_stream(const struct lttcomm_relayd_hdr *recv_hdr,
 			group_by_session_path_name =
 					backward_compat_group_by_session(
 							path_name,
-							session->session_name);
+							session->session_name,
+							session->creation_time.value);
 			if (!group_by_session_path_name) {
 				ERR("Failed to apply group by session to stream of session %" PRIu64,
 						session->id);