X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=kconsumerd%2Fkconsumerd.c;h=d14f68b4c2d87e5f2c166efed49ac41667f68ba8;hp=69aa47a6e5f0b175113b407eb91429c451b9af5b;hb=b9f1dd6997ea64db8c140c617d2a74cf90767e3b;hpb=5dc1855009c9b215a108bc56e7df64d9862c8144

diff --git a/kconsumerd/kconsumerd.c b/kconsumerd/kconsumerd.c
index 69aa47a6e..d14f68b4c 100644
--- a/kconsumerd/kconsumerd.c
+++ b/kconsumerd/kconsumerd.c
@@ -70,6 +70,9 @@ static int error_socket = -1;
 /* to count the number of time the user pressed ctrl+c */
 static int sigintcount = 0;
 
+/* flag to inform the polling thread to quit when all fd hung up */
+static int quit = 0;
+
 /* Argument variables */
 int opt_quiet;
 int opt_verbose;
@@ -415,81 +418,78 @@ static int consumerd_recv_fd(int sfd, int size,
 {
 	struct msghdr msg;
 	struct iovec iov[1];
-	int ret, i, tmp2;
+	int ret = 0, i, tmp2;
 	struct cmsghdr *cmsg;
 	int nb_fd;
-	char tmp[CMSG_SPACE(size)];
-	struct lttcomm_kconsumerd_msg *buf;
+	char recv_fd[CMSG_SPACE(sizeof(int))];
+	struct lttcomm_kconsumerd_msg lkm;
+
 	/* the number of fds we are about to receive */
-	nb_fd = size/sizeof(struct lttcomm_kconsumerd_msg);
+	nb_fd = size / sizeof(struct lttcomm_kconsumerd_msg);
 
-	buf = malloc(size);
+	for (i = 0; i < nb_fd; i++) {
+		memset(&msg, 0, sizeof(msg));
 
-	memset(&msg, 0, sizeof(msg));
+		/* Prepare to receive the structures */
+		iov[0].iov_base = &lkm;
+		iov[0].iov_len = sizeof(lkm);
+		msg.msg_iov = iov;
+		msg.msg_iovlen = 1;
 
-	/* Prepare to receive the structures */
-	iov[0].iov_base = buf;
-	iov[0].iov_len = size;
-	msg.msg_iov = iov;
-	msg.msg_iovlen = 1;
+		msg.msg_control = recv_fd;
+		msg.msg_controllen = sizeof(recv_fd);
 
-	msg.msg_control = tmp;
-	msg.msg_controllen = sizeof(tmp);
+		DBG("Waiting to receive fd");
+		if ((ret = recvmsg(sfd, &msg, 0)) < 0) {
+			perror("recvmsg");
+			continue;
+		}
 
-	DBG("Waiting to receive fds");
-	if ((ret = recvmsg(sfd, &msg, 0)) < 0) {
-		perror("recvmsg");
-	}
-	if (ret != size) {
-		ERR("Received only %d, expected %d", ret, size);
-		send_error(KCONSUMERD_ERROR_RECV_FD);
-		goto end;
-	}
+		if (ret != (size / nb_fd)) {
+			ERR("Received only %d, expected %d", ret, size);
+			send_error(KCONSUMERD_ERROR_RECV_FD);
+			goto end;
+		}
 
-	cmsg = CMSG_FIRSTHDR(&msg);
-	if (!cmsg) {
-		ERR("Invalid control message header");
-		ret = -1;
-		send_error(KCONSUMERD_ERROR_RECV_FD);
-		goto end;
-	}
+		cmsg = CMSG_FIRSTHDR(&msg);
+		if (!cmsg) {
+			ERR("Invalid control message header");
+			ret = -1;
+			send_error(KCONSUMERD_ERROR_RECV_FD);
+			goto end;
+		}
 
-	/* if we received fds */
-	if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_RIGHTS) {
-		DBG("Receive : expecting %d fds", nb_fd);
-		for (i = 0; i < nb_fd; i++) {
+		/* if we received fds */
+		if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_RIGHTS) {
 			switch (cmd_type) {
 			case ADD_STREAM:
-				DBG("add_fd %s (%d)", buf[i].path_name, ((int *)CMSG_DATA(cmsg))[i]);
-				ret = add_fd(&buf[i], ((int *)CMSG_DATA(cmsg))[i]);
+				DBG("add_fd %s (%d)", lkm.path_name, (CMSG_DATA(cmsg)[0]));
+				ret = add_fd(&lkm, (CMSG_DATA(cmsg)[0]));
 				if (ret < 0) {
 					send_error(KCONSUMERD_OUTFD_ERROR);
 					goto end;
 				}
 				break;
 			case UPDATE_STREAM:
-				change_fd_state(buf[i].fd, buf[i].state);
+				change_fd_state(lkm.fd, lkm.state);
 				break;
 			default:
 				break;
 			}
+			/* flag to tell the polling thread to update its fd array */
+			update_fd_array = 1;
+			/* signal the poll thread */
+			tmp2 = write(poll_pipe[1], "4", 1);
+		} else {
+			ERR("Didn't received any fd");
+			send_error(KCONSUMERD_ERROR_RECV_FD);
+			ret = -1;
+			goto end;
 		}
-		/* flag to tell the polling thread to update its fd array */
-		update_fd_array = 1;
-		/* signal the poll thread */
-		tmp2 = write(poll_pipe[1], "4", 1);
-	} else {
-		ERR("Didn't received any fd");
-		send_error(KCONSUMERD_ERROR_RECV_FD);
-		ret = -1;
-		goto end;
 	}
 
 end:
-	if (buf != NULL) {
-		free(buf);
-		buf = NULL;
-	}
+	DBG("consumerd_recv_fd thread exiting");
 	return ret;
 }
 
@@ -509,43 +509,54 @@ static void *thread_receive_fds(void *data)
 	client_socket = lttcomm_create_unix_sock(command_sock_path);
 	if (client_socket < 0) {
 		ERR("Cannot create command socket");
-		goto error;
+		goto end;
 	}
 
 	ret = lttcomm_listen_unix_sock(client_socket);
 	if (ret < 0) {
-		goto error;
+		goto end;
 	}
 
 	DBG("Sending ready command to ltt-sessiond");
 	ret = send_error(KCONSUMERD_COMMAND_SOCK_READY);
 	if (ret < 0) {
 		ERR("Error sending ready command to ltt-sessiond");
-		goto error;
+		goto end;
 	}
 
 	/* Blocking call, waiting for transmission */
 	sock = lttcomm_accept_unix_sock(client_socket);
 	if (sock <= 0) {
 		WARN("On accept");
-		goto error;
+		goto end;
 	}
 	while (1) {
 		/* We first get the number of fd we are about to receive */
 		ret = lttcomm_recv_unix_sock(sock, &tmp,
 				sizeof(struct lttcomm_kconsumerd_header));
 		if (ret <= 0) {
-			ERR("Receiving the lttcomm_kconsumerd_header, exiting");
-			goto error;
+			ERR("Communication interrupted on command socket");
+			goto end;
 		}
+		if (tmp.cmd_type == STOP) {
+			DBG("Received STOP command");
+			goto end;
+		}
+		/* we received a command to add or update fds */
 		ret = consumerd_recv_fd(sock, tmp.payload_size, tmp.cmd_type);
 		if (ret <= 0) {
 			ERR("Receiving the FD, exiting");
-			goto error;
+			goto end;
 		}
 	}
 
-error:
+end:
+	DBG("thread_receive_fds exiting");
+	quit = 1;
+	ret = write(poll_pipe[1], "4", 1);
+	if (ret < 0) {
+		perror("poll pipe write");
+	}
 	return NULL;
 }
 
@@ -575,8 +586,6 @@ static int update_poll_array(struct pollfd **pollfd,
 			(*pollfd)[i].events = POLLIN | POLLPRI;
 			local_kconsumerd_fd[i] = iter;
 			i++;
-		} else if (iter->state == DELETE_FD) {
-			del_fd(iter);
 		}
 	}
 	/*
@@ -666,6 +675,11 @@ static void *thread_poll_fds(void *data)
 			goto end;
 		}
 
+		/* No FDs and quit, cleanup the thread */
+		if (nb_fd == 0 && quit == 1) {
+			goto end;
+		}
+
 		/*
 		 * if only the poll_pipe triggered poll to return just return to the
 		 * beginning of the loop to update the array
@@ -681,16 +695,20 @@ static void *thread_poll_fds(void *data)
 			switch(pollfd[i].revents) {
 			case POLLERR:
 				ERR("Error returned in polling fd %d.", pollfd[i].fd);
+				del_fd(local_kconsumerd_fd[i]);
+				update_fd_array = 1;
 				num_hup++;
-				send_error(KCONSUMERD_POLL_ERROR);
 				break;
 			case POLLHUP:
 				ERR("Polling fd %d tells it has hung up.", pollfd[i].fd);
+				del_fd(local_kconsumerd_fd[i]);
+				update_fd_array = 1;
 				num_hup++;
 				break;
 			case POLLNVAL:
 				ERR("Polling fd %d tells fd is not open.", pollfd[i].fd);
-				send_error(KCONSUMERD_POLL_NVAL);
+				del_fd(local_kconsumerd_fd[i]);
+				update_fd_array = 1;
 				num_hup++;
 				break;
 			case POLLPRI:
@@ -708,8 +726,10 @@ static void *thread_poll_fds(void *data)
 		/* If every buffer FD has hung up, we end the read loop here */
 		if (nb_fd > 0 && num_hup == nb_fd) {
 			DBG("every buffer FD has hung up\n");
-			send_error(KCONSUMERD_POLL_HUP);
-			goto end;
+			if (quit == 1) {
+				goto end;
+			}
+			continue;
 		}
 
 		/* Take care of low priority channels. */
@@ -727,6 +747,7 @@ static void *thread_poll_fds(void *data)
 		}
 	}
 end:
+	DBG("polling thread exiting");
 	if (pollfd != NULL) {
 		free(pollfd);
 		pollfd = NULL;