X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-abi.c;h=7490f8b72d22f28435a63475e3900953892d74b8;hb=f52e590232f939bd6b5c88a483765c03e37fc733;hp=ff3aab5313cbc7c0f7bb68a189794b7208cbcb8a;hpb=04a351cb408ea9e5b60f5f97ed841d87421529b2;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-abi.c b/liblttng-ust/lttng-ust-abi.c
index ff3aab53..7490f8b7 100644
--- a/liblttng-ust/lttng-ust-abi.c
+++ b/liblttng-ust/lttng-ust-abi.c
@@ -346,10 +346,10 @@ long lttng_abi_tracer_version(int objd,
 }
 
 static
-int lttng_abi_event_notifier_send_fd(void *owner, int event_notifier_notif_fd)
+int lttng_abi_event_notifier_send_fd(void *owner, int *event_notifier_notif_fd)
 {
 	struct lttng_event_notifier_group *event_notifier_group;
-	int event_notifier_group_objd, ret, fd_flag, close_ret;
+	int event_notifier_group_objd, ret, fd_flag;
 
 	event_notifier_group = lttng_event_notifier_group_create();
 	if (!event_notifier_group)
@@ -358,11 +358,11 @@ int lttng_abi_event_notifier_send_fd(void *owner, int event_notifier_notif_fd)
 	/*
 	 * Set this file descriptor as NON-BLOCKING.
 	 */
-	fd_flag = fcntl(event_notifier_notif_fd, F_GETFL);
+	fd_flag = fcntl(*event_notifier_notif_fd, F_GETFL);
 
 	fd_flag |= O_NONBLOCK;
 
-	ret = fcntl(event_notifier_notif_fd, F_SETFL, fd_flag);
+	ret = fcntl(*event_notifier_notif_fd, F_SETFL, fd_flag);
 	if (ret) {
 		ret = -errno;
 		goto fd_error;
@@ -377,18 +377,15 @@ int lttng_abi_event_notifier_send_fd(void *owner, int event_notifier_notif_fd)
 
 	event_notifier_group->objd = event_notifier_group_objd;
 	event_notifier_group->owner = owner;
-	event_notifier_group->notification_fd = event_notifier_notif_fd;
+	event_notifier_group->notification_fd = *event_notifier_notif_fd;
+	/* Object descriptor takes ownership of notification fd. */
+	*event_notifier_notif_fd = -1;
 
 	return event_notifier_group_objd;
 
 objd_error:
 	lttng_event_notifier_group_destroy(event_notifier_group);
 fd_error:
-	close_ret = close(event_notifier_notif_fd);
-	if (close_ret) {
-		PERROR("close");
-	}
-
 	return ret;
 }
 
@@ -443,7 +440,7 @@ long lttng_cmd(int objd, unsigned int cmd, unsigned long arg,
 		return 0;
 	case LTTNG_UST_EVENT_NOTIFIER_GROUP_CREATE:
 		return lttng_abi_event_notifier_send_fd(owner,
-			uargs->event_notifier_handle.event_notifier_notif_fd);
+			&uargs->event_notifier_handle.event_notifier_notif_fd);
 	default:
 		return -EINVAL;
 	}
@@ -498,6 +495,10 @@ int lttng_abi_map_channel(int session_objd,
 		goto handle_error;
 	}
 
+	/* Ownership of chan_data and wakeup_fd taken by channel handle. */
+	uargs->channel.chan_data = NULL;
+	uargs->channel.wakeup_fd = -1;
+
 	chan = shmp(channel_handle, channel_handle->chan);
 	assert(chan);
 	chan->handle = channel_handle;
@@ -581,24 +582,9 @@ alloc_error:
 	channel_destroy(chan, channel_handle, 0);
 	return ret;
 
-	/*
-	 * error path before channel creation (owning chan_data and
-	 * wakeup_fd).
-	 */
 handle_error:
 active:
 invalid:
-	{
-		int close_ret;
-
-		lttng_ust_lock_fd_tracker();
-		close_ret = close(wakeup_fd);
-		lttng_ust_unlock_fd_tracker();
-		if (close_ret) {
-			PERROR("close");
-		}
-	}
-	free(chan_data);
 	return ret;
 }
 
@@ -1118,6 +1104,9 @@ int lttng_abi_map_stream(int channel_objd, struct lttng_ust_stream *info,
 		info->stream_nr, info->len);
 	if (ret)
 		goto error_add_stream;
+	/* Take ownership of shm_fd and wakeup_fd. */
+	uargs->stream.shm_fd = -1;
+	uargs->stream.wakeup_fd = -1;
 
 	return 0;