From: Julien Desfossez <julien.desfossez@POLYMTL.CA>
Date: Wed, 25 May 2011 16:41:04 +0000 (+0200)
Subject: Fix memory allocation of local fd view
X-Git-Tag: v2.0-pre1~120
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=4abc07809e757e7f88351cb778d94e1ca2a55c41

Fix memory allocation of local fd view

Signed-off-by: Julien Desfossez <julien.desfossez@polymtl.ca>
---

diff --git a/kconsumerd/kconsumerd.c b/kconsumerd/kconsumerd.c
index fcd4101a6..f0ccb8c9e 100644
--- a/kconsumerd/kconsumerd.c
+++ b/kconsumerd/kconsumerd.c
@@ -519,7 +519,7 @@ static void *thread_receive_fds(void *data)
 	/* Blocking call, waiting for transmission */
 	sock = lttcomm_accept_unix_sock(client_socket);
 	if (sock <= 0) {
-		WARN("On accept, retrying");
+		WARN("On accept");
 		goto error;
 	}
 	while (1) {
@@ -555,29 +555,6 @@ static int update_poll_array(struct pollfd **pollfd,
 	struct ltt_kconsumerd_fd *iter;
 	int i = 0;
 
-	if (*pollfd != NULL) {
-		free(*pollfd);
-		*pollfd = NULL;
-	}
-
-	if (*local_kconsumerd_fd != NULL) {
-		free(*local_kconsumerd_fd);
-		*local_kconsumerd_fd = NULL;
-	}
-
-	/* allocate for all fds + 1 for the poll_pipe */
-	*pollfd = malloc((fds_count + 1) * sizeof(struct pollfd));
-	if (*pollfd == NULL) {
-		perror("pollfd malloc");
-		goto error_mem;
-	}
-
-	/* allocate for all fds + 1 for the poll_pipe */
-	*local_kconsumerd_fd = malloc((fds_count + 1) * sizeof(struct ltt_kconsumerd_fd));
-	if (*local_kconsumerd_fd == NULL) {
-		perror("local_kconsumerd_fd malloc");
-		goto error_mem;
-	}
 
 	DBG("Updating poll fd array");
 	pthread_mutex_lock(&kconsumerd_lock_fds);
@@ -605,8 +582,6 @@ static int update_poll_array(struct pollfd **pollfd,
 	pthread_mutex_unlock(&kconsumerd_lock_fds);
 	return i;
 
-error_mem:
-	return -ENOMEM;
 }
 
 /*
@@ -643,6 +618,27 @@ static void *thread_poll_fds(void *data)
 		 * local array as well
 		 */
 		if (update_fd_array) {
+			if (pollfd != NULL) {
+				free(pollfd);
+				pollfd = NULL;
+			}
+			if (local_kconsumerd_fd != NULL) {
+				free(local_kconsumerd_fd);
+				local_kconsumerd_fd = NULL;
+			}
+			/* allocate for all fds + 1 for the poll_pipe */
+			pollfd = malloc((fds_count + 1) * sizeof(struct pollfd));
+			if (pollfd == NULL) {
+				perror("pollfd malloc");
+				goto end;
+			}
+			/* allocate for all fds + 1 for the poll_pipe */
+			local_kconsumerd_fd = malloc((fds_count + 1) * sizeof(struct ltt_kconsumerd_fd));
+			if (local_kconsumerd_fd == NULL) {
+				perror("local_kconsumerd_fd malloc");
+				goto end;
+			}
+
 			ret = update_poll_array(&pollfd, local_kconsumerd_fd);
 			if (ret < 0) {
 				ERR("Error in allocating pollfd or local_outfds");