[lttng-dev] [LTTNG-TOOLS PATCH] Fix: close wait_fd on kernel tracing

[Mathieu Desnoyers]

* Julien Desfossez (jdesfossez at efficios.com) wrote:
> The wait_fd in the kernel consumer streams was not closed causing a leak
> of FDs in the consumer and never triggering the teardown mechanism in
> the kernel tracer.

Just for traceability on the ML: this patch had indeed been merged into
master and stable-2.2 of lttng-tools.

Mathieu

> 
> Signed-off-by: Julien Desfossez <jdesfossez at efficios.com>
> ---
>  src/common/consumer.c |    4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/src/common/consumer.c b/src/common/consumer.c
> index 044a504..84865d3 100644
> --- a/src/common/consumer.c
> +++ b/src/common/consumer.c
> @@ -463,6 +463,10 @@ void consumer_del_stream(struct lttng_consumer_stream *stream,
>  				PERROR("munmap");
>  			}
>  		}
> +		ret = close(stream->wait_fd);
> +		if (ret) {
> +			PERROR("close");
> +		}
>  		break;
>  	case LTTNG_CONSUMER32_UST:
>  	case LTTNG_CONSUMER64_UST:
> -- 
> 1.7.10.4
> 
> 
> _______________________________________________
> lttng-dev mailing list
> lttng-dev at lists.lttng.org
> http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

-- 
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com