X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust-ctl%2Fustctl.c;fp=liblttng-ust-ctl%2Fustctl.c;h=18bf614babdd9db292243f4aee0d48761699b5f4;hb=cb7378b3cf177d007917a82a5fe2514e2015bb26;hp=e00caf15ec3ed57b187d56fd915a538daf720aca;hpb=3bf32af0f4694b44142f503d09e47654630fa8ff;p=lttng-ust.git

diff --git a/liblttng-ust-ctl/ustctl.c b/liblttng-ust-ctl/ustctl.c
index e00caf15..18bf614b 100644
--- a/liblttng-ust-ctl/ustctl.c
+++ b/liblttng-ust-ctl/ustctl.c
@@ -953,6 +953,8 @@ struct ustctl_consumer_channel *
 	}
 	chan->chan->ops = &transport->ops;
 	memcpy(&chan->attr, attr, sizeof(chan->attr));
+	chan->wait_fd = ustctl_channel_get_wait_fd(chan);
+	chan->wakeup_fd = ustctl_channel_get_wakeup_fd(chan);
 	return chan;
 
 chan_error:
@@ -1042,19 +1044,27 @@ end:
 int ustctl_channel_close_wait_fd(struct ustctl_consumer_channel *consumer_chan)
 {
 	struct channel *chan;
+	int ret;
 
 	chan = consumer_chan->chan->chan;
-	return ring_buffer_channel_close_wait_fd(&chan->backend.config,
+	ret = ring_buffer_channel_close_wait_fd(&chan->backend.config,
 			chan, chan->handle);
+	if (!ret)
+		consumer_chan->wait_fd = -1;
+	return ret;
 }
 
 int ustctl_channel_close_wakeup_fd(struct ustctl_consumer_channel *consumer_chan)
 {
 	struct channel *chan;
+	int ret;
 
 	chan = consumer_chan->chan->chan;
-	return ring_buffer_channel_close_wakeup_fd(&chan->backend.config,
+	ret = ring_buffer_channel_close_wakeup_fd(&chan->backend.config,
 			chan, chan->handle);
+	if (!ret)
+		consumer_chan->wakeup_fd = -1;
+	return ret;
 }
 
 int ustctl_stream_close_wait_fd(struct ustctl_consumer_stream *stream)