X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-comm.c;h=0765c9b538a6a9370570647fea6780fe49070705;hb=071f1d0be5fb8e07972f59f4c1cde9cf874718b3;hp=e19fa949cbf69fd8cf70006898e8ddaa1796ca97;hpb=4158a15a59fc6efbbbc99d66107fb4e1f27f9664;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c
index e19fa949..0765c9b5 100644
--- a/liblttng-ust/lttng-ust-comm.c
+++ b/liblttng-ust/lttng-ust-comm.c
@@ -22,7 +22,6 @@
 #define _LGPL_SOURCE
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/prctl.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -46,6 +45,7 @@
 #include <usterr-signal-safe.h>
 #include "tracepoint-internal.h"
 #include "ltt-tracer-core.h"
+#include "compat.h"
 #include "../libringbuffer/tlsfixup.h"
 
 /*
@@ -160,7 +160,6 @@ static
 int register_app_to_sessiond(int socket)
 {
 	ssize_t ret;
-	int prctl_ret;
 	struct {
 		uint32_t major;
 		uint32_t minor;
@@ -179,11 +178,7 @@ int register_app_to_sessiond(int socket)
 	reg_msg.uid = getuid();
 	reg_msg.gid = getgid();
 	reg_msg.bits_per_long = CAA_BITS_PER_LONG;
-	prctl_ret = prctl(PR_GET_NAME, (unsigned long) reg_msg.name, 0, 0, 0);
-	if (prctl_ret) {
-		ERR("Error executing prctl");
-		return -errno;
-	}
+	lttng_ust_getprocname(reg_msg.name);
 
 	ret = ustcomm_send_unix_sock(socket, &reg_msg, sizeof(reg_msg));
 	if (ret >= 0 && ret != sizeof(reg_msg))
@@ -325,14 +320,20 @@ end:
 	     || lum->cmd == LTTNG_UST_CHANNEL
 	     || lum->cmd == LTTNG_UST_METADATA)
 			&& lur.ret_code == USTCOMM_OK) {
+		int sendret = 0;
+
 		/* we also need to send the file descriptors. */
 		ret = ustcomm_send_fds_unix_sock(sock,
 			&shm_fd, &shm_fd,
 			1, sizeof(int));
 		if (ret < 0) {
 			perror("send shm_fd");
-			goto error;
+			sendret = ret;
 		}
+		/*
+		 * The sessiond expects 2 file descriptors, even upon
+		 * error.
+		 */
 		ret = ustcomm_send_fds_unix_sock(sock,
 			&wait_fd, &wait_fd,
 			1, sizeof(int));
@@ -340,6 +341,10 @@ end:
 			perror("send wait_fd");
 			goto error;
 		}
+		if (sendret) {
+			ret = sendret;
+			goto error;
+		}
 	}
 	/*
 	 * We still have the memory map reference, and the fds have been
@@ -396,7 +401,7 @@ void cleanup_sock_info(struct sock_info *sock_info, int exiting)
 	int ret;
 
 	if (sock_info->socket != -1) {
-		ret = close(sock_info->socket);
+		ret = ustcomm_close_unix_sock(sock_info->socket);
 		if (ret) {
 			ERR("Error closing apps socket");
 		}
@@ -676,7 +681,7 @@ restart:
 	}
 
 	if (sock_info->socket != -1) {
-		ret = close(sock_info->socket);
+		ret = ustcomm_close_unix_sock(sock_info->socket);
 		if (ret) {
 			ERR("Error closing %s apps socket", sock_info->name);
 		}