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

diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c
index ba69f5ff..0765c9b5 100644
--- a/liblttng-ust/lttng-ust-comm.c
+++ b/liblttng-ust/lttng-ust-comm.c
@@ -46,6 +46,7 @@
 #include "tracepoint-internal.h"
 #include "ltt-tracer-core.h"
 #include "compat.h"
+#include "../libringbuffer/tlsfixup.h"
 
 /*
  * Has lttng ust comm constructor been called ?
@@ -319,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));
@@ -334,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
@@ -390,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");
 		}
@@ -670,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);
 		}
@@ -833,6 +844,8 @@ void __attribute__((constructor)) lttng_ust_init(void)
 	 * the ust lock.
 	 */
 	lttng_fixup_event_tls();
+	lttng_fixup_ringbuffer_tls();
+	lttng_fixup_vtid_tls();
 
 	/*
 	 * We want precise control over the order in which we construct