Fix: cmd_rotate_session() returns unexpected error codes

[lttng-tools.git] / src / bin / lttng-sessiond / kernel.c

diff --git a/src/bin/lttng-sessiond/kernel.c b/src/bin/lttng-sessiond/kernel.c
index f5979c9b4f2cf26028c8d4f6f120349b9a0eed9c..4327db24bdb3291f575da0d90c143e280c7bdbfa 100644 (file)
--- a/src/bin/lttng-sessiond/kernel.c
+++ b/src/bin/lttng-sessiond/kernel.c
@@ -203,16 +203,15 @@ error:
  */
 static
 int extract_userspace_probe_offset_function_elf(
-               struct lttng_userspace_probe_location *probe_location,
+               const struct lttng_userspace_probe_location *probe_location,
                struct ltt_kernel_session *session, uint64_t *offset)
 {
        int fd;
        int ret = 0;
        const char *symbol = NULL;
-       struct lttng_userspace_probe_location_lookup_method *lookup = NULL;
+       const struct lttng_userspace_probe_location_lookup_method *lookup = NULL;
        enum lttng_userspace_probe_location_lookup_method_type lookup_method_type;
 
-
        assert(lttng_userspace_probe_location_get_type(probe_location) ==
                        LTTNG_USERSPACE_PROBE_LOCATION_TYPE_FUNCTION);
 
@@ -266,12 +265,12 @@ end:
  */
 static
 int extract_userspace_probe_offset_tracepoint_sdt(
-               struct lttng_userspace_probe_location *probe_location,
+               const struct lttng_userspace_probe_location *probe_location,
                struct ltt_kernel_session *session, uint64_t **offsets,
                uint32_t *offsets_count)
 {
        enum lttng_userspace_probe_location_lookup_method_type lookup_method_type;
-       struct lttng_userspace_probe_location_lookup_method *lookup = NULL;
+       const struct lttng_userspace_probe_location_lookup_method *lookup = NULL;
        const char *probe_name = NULL, *provider_name = NULL;
        int ret = 0;
        int fd, i;
@@ -342,9 +341,9 @@ static
 int userspace_probe_add_callsites(struct lttng_event *ev,
                        struct ltt_kernel_session *session, int fd)
 {
-       struct lttng_userspace_probe_location_lookup_method *lookup_method = NULL;
+       const struct lttng_userspace_probe_location_lookup_method *lookup_method = NULL;
        enum lttng_userspace_probe_location_lookup_method_type type;
-       struct lttng_userspace_probe_location *location = NULL;
+       const struct lttng_userspace_probe_location *location = NULL;
        int ret;
 
        assert(ev);
@@ -1402,11 +1401,12 @@ error:
 /*
  * Rotate a kernel session.
  *
- * Return 0 on success or else return a LTTNG_ERR code.
+ * Return LTTNG_OK on success or else an LTTng error code.
  */
-int kernel_rotate_session(struct ltt_session *session)
+enum lttng_error_code kernel_rotate_session(struct ltt_session *session)
 {
        int ret;
+       enum lttng_error_code status = LTTNG_OK;
        struct consumer_socket *socket;
        struct lttng_ht_iter iter;
        struct ltt_kernel_session *ksess = session->kernel_session;
@@ -1427,37 +1427,17 @@ int kernel_rotate_session(struct ltt_session *session)
                        socket, node.node) {
                struct ltt_kernel_channel *chan;
 
-               /*
-                * Account the metadata channel first to make sure the
-                * number of channels waiting for a rotation cannot
-                * reach 0 before we complete the iteration over all
-                * the channels.
-                */
-               ret = rotate_add_channel_pending(ksess->metadata->key,
-                               LTTNG_DOMAIN_KERNEL, session);
-               if (ret < 0) {
-                       ret = LTTNG_ERR_KERN_CONSUMER_FAIL;
-                       goto error;
-               }
-
                /* For each channel, ask the consumer to rotate it. */
                cds_list_for_each_entry(chan, &ksess->channel_list.head, list) {
-                       ret = rotate_add_channel_pending(chan->key,
-                                       LTTNG_DOMAIN_KERNEL, session);
-                       if (ret < 0) {
-                               ret = LTTNG_ERR_KERN_CONSUMER_FAIL;
-                               goto error;
-                       }
-
-                       DBG("Rotate channel %" PRIu64 ", session %s", chan->key, session->name);
+                       DBG("Rotate kernel channel %" PRIu64 ", session %s",
+                                       chan->key, session->name);
                        ret = consumer_rotate_channel(socket, chan->key,
                                        ksess->uid, ksess->gid, ksess->consumer,
                                        ksess->consumer->subdir,
                                        /* is_metadata_channel */ false,
-                                       session->current_archive_id,
-                                       &session->rotate_pending_relay);
+                                       session->current_archive_id);
                        if (ret < 0) {
-                               ret = LTTNG_ERR_KERN_CONSUMER_FAIL;
+                               status = LTTNG_ERR_KERN_CONSUMER_FAIL;
                                goto error;
                        }
                }
@@ -1469,17 +1449,14 @@ int kernel_rotate_session(struct ltt_session *session)
                                ksess->uid, ksess->gid, ksess->consumer,
                                ksess->consumer->subdir,
                                /* is_metadata_channel */ true,
-                               session->current_archive_id,
-                               &session->rotate_pending_relay);
+                               session->current_archive_id);
                if (ret < 0) {
-                       ret = LTTNG_ERR_KERN_CONSUMER_FAIL;
+                       status = LTTNG_ERR_KERN_CONSUMER_FAIL;
                        goto error;
                }
        }
 
-       ret = LTTNG_OK;
-
 error:
        rcu_read_unlock();
-       return ret;
+       return status;
 }