X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-comm.c;h=69bce955491db27da8b3c8818da605f9a50a6f5d;hb=e9fe6aad66010614f987e917866837706d19053b;hp=ead0d7fecbc6d15f03ab120ff9f3524b063bf454;hpb=867942fdcdf016a65df7165b4b8135801e2832c2;p=deliverable%2Flttng-ust.git

diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c
index ead0d7fe..69bce955 100644
--- a/liblttng-ust/lttng-ust-comm.c
+++ b/liblttng-ust/lttng-ust-comm.c
@@ -971,23 +971,18 @@ int handle_message(struct sock_info *sock_info,
 				goto error;
 			}
 		}
-		if (ops->cmd) {
+		if (ops->cmd)
 			ret = ops->cmd(lum->handle, lum->cmd,
-					(unsigned long) node,
+					(unsigned long) &node,
 					&args, sock_info);
-			if (ret) {
-				free(node);
-			}
-			/* Don't free exclusion data if everything went fine. */
-		} else {
+		else
 			ret = -ENOSYS;
-			free(node);
-		}
+		free(node);
 		break;
 	}
 	case LTTNG_UST_EVENT_NOTIFIER_GROUP_CREATE:
 	{
-		int event_notifier_notif_fd;
+		int event_notifier_notif_fd, close_ret;
 
 		len = ustcomm_recv_event_notifier_notif_fd_from_sessiond(sock,
 			&event_notifier_notif_fd);
@@ -1024,6 +1019,13 @@ int handle_message(struct sock_info *sock_info,
 					&args, sock_info);
 		else
 			ret = -ENOSYS;
+		if (args.event_notifier_handle.event_notifier_notif_fd >= 0) {
+			lttng_ust_lock_fd_tracker();
+			close_ret = close(args.event_notifier_handle.event_notifier_notif_fd);
+			lttng_ust_unlock_fd_tracker();
+			if (close_ret)
+				PERROR("close");
+		}
 		break;
 	}
 	case LTTNG_UST_CHANNEL:
@@ -1080,6 +1082,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,
@@ -1095,6 +1099,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: