X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-comm.c;h=6f3a58aaf57674226879f646299f71ab83a3261a;hb=1a3b8784434bb597b623100a591aeeb835fccf16;hp=3d60596a9896ef345a5e29b17bf91e051ba3c1cb;hpb=24e6ac9b18904de64d31dc79f53b1c8296541c8a;p=deliverable%2Flttng-ust.git

diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c
index 3d60596a..6f3a58aa 100644
--- a/liblttng-ust/lttng-ust-comm.c
+++ b/liblttng-ust/lttng-ust-comm.c
@@ -958,6 +958,8 @@ int handle_message(struct sock_info *sock_info,
 	}
 	case LTTNG_UST_STREAM:
 	{
+		int close_ret;
+
 		/* Receive shm_fd, wakeup_fd */
 		ret = ustcomm_recv_stream_from_sessiond(sock,
 			NULL,
@@ -973,6 +975,22 @@ int handle_message(struct sock_info *sock_info,
 					&args, sock_info);
 		else
 			ret = -ENOSYS;
+		if (args.stream.shm_fd >= 0) {
+			lttng_ust_lock_fd_tracker();
+			close_ret = close(args.stream.shm_fd);
+			lttng_ust_unlock_fd_tracker();
+			args.stream.shm_fd = -1;
+			if (close_ret)
+				PERROR("close");
+		}
+		if (args.stream.wakeup_fd >= 0) {
+			lttng_ust_lock_fd_tracker();
+			close_ret = close(args.stream.wakeup_fd);
+			lttng_ust_unlock_fd_tracker();
+			args.stream.wakeup_fd = -1;
+			if (close_ret)
+				PERROR("close");
+		}
 		break;
 	}
 	case LTTNG_UST_CONTEXT:
@@ -1152,8 +1170,7 @@ void cleanup_sock_info(struct sock_info *sock_info, int exiting)
 		}
 		sock_info->root_handle = -1;
 	}
-	sock_info->registration_done = 0;
-	sock_info->initial_statedump_done = 0;
+
 
 	/*
 	 * wait_shm_mmap, socket and notify socket are used by listener
@@ -1165,6 +1182,9 @@ void cleanup_sock_info(struct sock_info *sock_info, int exiting)
 	if (exiting)
 		return;
 
+	sock_info->registration_done = 0;
+	sock_info->initial_statedump_done = 0;
+
 	if (sock_info->socket != -1) {
 		ret = ustcomm_close_unix_sock(sock_info->socket);
 		if (ret) {