Use case-scope error labels handling LTTNG_CONSUMER_DESTROY_CHANNEL

This cleans-up the error handling of the case handling the
LTTNG_CONSUMER_DESTROY_CHANNEL command. This is done in order to allow
a follow-up commit to perform some common clean-up operations on error
while introducing as few changes as possible.

No behaviour change is intended.

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c
index 95c92ba9b961d99821a80d21c339dc466af2924d..196da6633353a44ea6f73821494642e0cd7539a3 100644 (file)
--- a/src/common/kernel-consumer/kernel-consumer.c
+++ b/src/common/kernel-consumer/kernel-consumer.c
@@ -979,14 +979,14 @@ error_streams_sent_nosignal:
                ret = consumer_send_status_msg(sock, ret_code);
                if (ret < 0) {
                        /* Somehow, the session daemon is not responding anymore. */
                ret = consumer_send_status_msg(sock, ret_code);
                if (ret < 0) {
                        /* Somehow, the session daemon is not responding anymore. */

-                       goto end_nosignal;
+                       goto end_destroy_channel;

                }
 
                health_code_update();
 
                /* Stop right now if no channel was found. */
                if (!channel) {
                }
 
                health_code_update();
 
                /* Stop right now if no channel was found. */
                if (!channel) {

-                       goto end_nosignal;
+                       goto end_destroy_channel;

                }
 
                /*
                }
 
                /*


@@ -1002,7 +1002,7 @@ error_streams_sent_nosignal:
                assert(!uatomic_sub_return(&channel->refcount, 1));
 
                consumer_del_channel(channel);
                assert(!uatomic_sub_return(&channel->refcount, 1));
 
                consumer_del_channel(channel);

-
+end_destroy_channel:

                goto end_nosignal;
        }
        case LTTNG_CONSUMER_DISCARDED_EVENTS:
                goto end_nosignal;
        }
        case LTTNG_CONSUMER_DISCARDED_EVENTS: