[lttng-dev] [PATCH 1/2] Fix: return error on ask_new_stream when should quit

[Mathieu Desnoyers]

this patch might not be needed... the second patch
of this series might be sufficient.

----- On Aug 18, 2015, at 4:36 PM, Mathieu Desnoyers mathieu.desnoyers at efficios.com wrote:

> Otherwise, the caller will try to continue adding partially set streams
> to the trace.
> 
> Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
> ---
> formats/lttng-live/lttng-live-comm.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/formats/lttng-live/lttng-live-comm.c
> b/formats/lttng-live/lttng-live-comm.c
> index 47ea589..8fa90cf 100644
> --- a/formats/lttng-live/lttng-live-comm.c
> +++ b/formats/lttng-live/lttng-live-comm.c
> @@ -560,10 +560,11 @@ restart:
> 		id = g_array_index(ctx->session_ids, uint64_t, i);
> 		ret = lttng_live_get_new_streams(ctx, id);
> 		printf_verbose("Asking for new streams returns %d\n", ret);
> +		if (lttng_live_should_quit()) {
> +			ret = -1;
> +			goto end;
> +		}
> 		if (ret < 0) {
> -			if (lttng_live_should_quit()) {
> -				goto end;
> -			}
> 			if (ret == -LTTNG_VIEWER_NEW_STREAMS_HUP) {
> 				printf_verbose("Session %" PRIu64 " closed\n",
> 						id);
> @@ -1699,6 +1700,7 @@ int lttng_live_read(struct lttng_live_ctx *ctx)
> 			}
> 			ret = ask_new_streams(ctx);
> 			if (ret < 0) {
> +				ret = 0;
> 				goto end_free;
> 			}
> 			if (!ctx->session->stream_count) {
> --
> 2.1.4

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