Use case-scope error labels handling LTTNG_CONSUMER_ROTATE_CHANNEL
authorJérémie Galarneau <jeremie.galarneau@efficios.com>
Tue, 27 Aug 2019 21:03:45 +0000 (17:03 -0400)
committerJérémie Galarneau <jeremie.galarneau@efficios.com>
Wed, 28 Aug 2019 22:33:19 +0000 (18:33 -0400)
This cleans-up the error handling of the case handling the
LTTNG_CONSUMER_ROTATE_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>
src/common/ust-consumer/ust-consumer.c

index ee6f4f79b9147a9feb22e046b86402973382c19b..04d7efe5494443ab18dfea64d5e67561616fd66b 100644 (file)
@@ -1984,7 +1984,7 @@ error_push_metadata_fatal:
                ret = consumer_send_status_msg(sock, ret_code);
                if (ret < 0) {
                        /* Somehow, the session daemon is not responding anymore. */
-                       goto end_nosignal;
+                       goto end_rotate_channel_nosignal;
                }
 
                /*
@@ -2002,6 +2002,8 @@ error_push_metadata_fatal:
                        }
                }
                break;
+end_rotate_channel_nosignal:
+               goto end_nosignal;
        }
        case LTTNG_CONSUMER_INIT:
        {
This page took 0.035723 seconds and 4 git commands to generate.