Allow channel mode override in snapshot sessions

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

diff --git a/src/bin/lttng-sessiond/channel.c b/src/bin/lttng-sessiond/channel.c
index 8ceb4e8930321ed947ea1216c782558811f0b753..88480c4b4e7b78fd63a2edc744618eadba0c36bc 100644 (file)
--- a/src/bin/lttng-sessiond/channel.c
+++ b/src/bin/lttng-sessiond/channel.c
@@ -179,6 +179,19 @@ error:
        return ret;
 }
 
        return ret;
 }
 

+static int channel_validate(struct lttng_channel *attr)
+{
+       /*
+        * The ringbuffer (both in user space and kernel) behaves badly
+        * in overwrite mode and with less than 2 subbuffers so block it
+        * right away and send back an invalid attribute error.
+        */
+       if (attr->attr.overwrite && attr->attr.num_subbuf < 2) {
+               return -1;
+       }
+       return 0;
+}
+

 /*
  * Create kernel channel of the kernel session and notify kernel thread.
  */
 /*
  * Create kernel channel of the kernel session and notify kernel thread.
  */


@@ -201,12 +214,25 @@ int channel_kernel_create(struct ltt_kernel_session *ksession,
                attr = defattr;
        }
 
                attr = defattr;
        }
 

+       /*
+        * Set the overwrite mode for this channel based on the session
+        * type unless the client explicitly overrides the channel mode.
+        */
+       if (attr->attr.overwrite == DEFAULT_CHANNEL_OVERWRITE) {
+               attr->attr.overwrite = !!ksession->snapshot_mode;
+       }
+
+       /* Enforce mmap output for snapshot sessions. */

        if (ksession->snapshot_mode) {
        if (ksession->snapshot_mode) {

-               /* Force channel attribute for snapshot mode. */
-               attr->attr.overwrite = 1;

                attr->attr.output = LTTNG_EVENT_MMAP;
        }
 
                attr->attr.output = LTTNG_EVENT_MMAP;
        }
 

+       /* Validate common channel properties. */
+       if (channel_validate(attr) < 0) {
+               ret = LTTNG_ERR_INVALID;
+               goto error;
+       }
+

        /* Channel not found, creating it */
        ret = kernel_create_channel(ksession, attr);
        if (ret < 0) {
        /* Channel not found, creating it */
        ret = kernel_create_channel(ksession, attr);
        if (ret < 0) {


@@ -299,12 +325,25 @@ int channel_ust_create(struct ltt_ust_session *usess,
                }
        }
 
                }
        }
 

+       /*
+        * Set the overwrite mode for this channel based on the session
+        * type unless the client explicitly overrides the channel mode.
+        */
+       if (attr->attr.overwrite == DEFAULT_CHANNEL_OVERWRITE) {
+               attr->attr.overwrite = !!usess->snapshot_mode;
+       }
+
+       /* Enforce mmap output for snapshot sessions. */

        if (usess->snapshot_mode) {
        if (usess->snapshot_mode) {

-               /* Force channel attribute for snapshot mode. */
-               attr->attr.overwrite = 1;

                attr->attr.output = LTTNG_EVENT_MMAP;
        }
 
                attr->attr.output = LTTNG_EVENT_MMAP;
        }
 

+       /* Validate common channel properties. */
+       if (channel_validate(attr) < 0) {
+               ret = LTTNG_ERR_INVALID;
+               goto error;
+       }
+

        /*
         * Validate UST buffer size and number of buffers: must both be power of 2
         * and nonzero. We validate right here for UST, because applications will
        /*
         * Validate UST buffer size and number of buffers: must both be power of 2
         * and nonzero. We validate right here for UST, because applications will