X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-comm.c;h=e3afe6af562cb8a22207ca90210b3450b8d2453d;hb=e6973a8909554c1b1d812f4f07d8806b87cad394;hp=b90df8610edb6cee07e0bef8ac4ec82cb787b5a2;hpb=f645cfa794fc481dff6cb30ea56e93f825b3d423;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c
index b90df861..e3afe6af 100644
--- a/liblttng-ust/lttng-ust-comm.c
+++ b/liblttng-ust/lttng-ust-comm.c
@@ -396,7 +396,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 +676,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);
 		}
@@ -840,6 +840,7 @@ void __attribute__((constructor)) lttng_ust_init(void)
 	 */
 	lttng_fixup_event_tls();
 	lttng_fixup_ringbuffer_tls();
+	lttng_fixup_vtid_tls();
 
 	/*
 	 * We want precise control over the order in which we construct