Clarify kernel version check error messages

[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 a9151f4d6ffae2a4b56f7ea652b4058b408a37b5..9d26b2bc9607dc2ded0f591395755cab8569c2dc 100644 (file)
--- a/src/bin/lttng-sessiond/kernel.c
+++ b/src/bin/lttng-sessiond/kernel.c
@@ -704,7 +704,7 @@ int kernel_validate_version(int tracer_fd)
 
        ret = kernctl_tracer_version(tracer_fd, &version);
        if (ret < 0) {
-               ERR("Failed at getting the lttng-modules version");
+               ERR("Failed to retrieve the lttng-modules version");
                goto error;
        }
 
@@ -716,11 +716,11 @@ int kernel_validate_version(int tracer_fd)
        }
        ret = kernctl_tracer_abi_version(tracer_fd, &abi_version);
        if (ret < 0) {
-               ERR("Failed at getting lttng-modules ABI version");
+               ERR("Failed to retrieve lttng-modules ABI version");
                goto error;
        }
        if (abi_version.major != LTTNG_MODULES_ABI_MAJOR_VERSION) {
-               ERR("Kernel tracer ABI version (%d.%d) is not compatible with expected ABI major version (%d.*)",
+               ERR("Kernel tracer ABI version (%d.%d) does not match the expected ABI major version (%d.*)",
                        abi_version.major, abi_version.minor,
                        LTTNG_MODULES_ABI_MAJOR_VERSION);
                goto error;
@@ -734,6 +734,7 @@ error_version:
        ret = -1;
 
 error:
+       ERR("Kernel tracer version check failed; kernel tracing will not be available");
        return ret;
 }
 
@@ -793,6 +794,7 @@ void kernel_destroy_session(struct ltt_kernel_session *ksess)
                struct lttng_ht_iter iter;
 
                /* For each consumer socket. */
+               rcu_read_lock();
                cds_lfht_for_each_entry(ksess->consumer->socks->ht, &iter.iter,
                                socket, node.node) {
                        struct ltt_kernel_channel *chan;
@@ -806,6 +808,7 @@ void kernel_destroy_session(struct ltt_kernel_session *ksess)
                                }
                        }
                }
+               rcu_read_unlock();
        }
 
        /* Close any relayd session */
@@ -850,7 +853,8 @@ void kernel_destroy_channel(struct ltt_kernel_channel *kchan)
  * Return 0 on success or else return a LTTNG_ERR code.
  */
 int kernel_snapshot_record(struct ltt_kernel_session *ksess,
-               struct snapshot_output *output, int wait, uint64_t max_size_per_stream)
+               struct snapshot_output *output, int wait,
+               uint64_t nb_packets_per_stream)
 {
        int err, ret, saved_metadata_fd;
        struct consumer_socket *socket;
@@ -911,7 +915,7 @@ int kernel_snapshot_record(struct ltt_kernel_session *ksess,
                        ret = consumer_snapshot_channel(socket, chan->fd, output, 0,
                                        ksess->uid, ksess->gid,
                                        DEFAULT_KERNEL_TRACE_DIR, wait,
-                                       max_size_per_stream);
+                                       nb_packets_per_stream);
                        pthread_mutex_unlock(socket->lock);
                        if (ret < 0) {
                                ret = LTTNG_ERR_KERN_CONSUMER_FAIL;
@@ -925,7 +929,7 @@ int kernel_snapshot_record(struct ltt_kernel_session *ksess,
                pthread_mutex_lock(socket->lock);
                ret = consumer_snapshot_channel(socket, ksess->metadata->fd, output,
                                1, ksess->uid, ksess->gid,
-                               DEFAULT_KERNEL_TRACE_DIR, wait, max_size_per_stream);
+                               DEFAULT_KERNEL_TRACE_DIR, wait, 0);
                pthread_mutex_unlock(socket->lock);
                if (ret < 0) {
                        ret = LTTNG_ERR_KERN_CONSUMER_FAIL;