New UST default buffers is now per UID

[lttng-tools.git] / src / bin / lttng / commands / enable_channels.c

diff --git a/src/bin/lttng/commands/enable_channels.c b/src/bin/lttng/commands/enable_channels.c
index caada7deb038efd75a6e953ab730dd1826e47566..4185b19a716cde04b47ba2c47209a54bfb3b0f69 100644 (file)
--- a/src/bin/lttng/commands/enable_channels.c
+++ b/src/bin/lttng/commands/enable_channels.c
@@ -202,15 +202,15 @@ static int enable_channel(char *session_name)
                }
        } else if (opt_userspace) {
                dom.type = LTTNG_DOMAIN_UST;
-               if (opt_buffer_uid) {
-                       dom.buf_type = LTTNG_BUFFER_PER_UID;
+               if (opt_buffer_pid) {
+                       dom.buf_type = LTTNG_BUFFER_PER_PID;
                } else {
                        if (opt_buffer_global) {
                                ERR("Buffer type not supported for domain -u");
                                ret = CMD_ERROR;
                                goto error;
                        }
-                       dom.buf_type = LTTNG_BUFFER_PER_PID;
+                       dom.buf_type = LTTNG_BUFFER_PER_UID;
                }
        } else {
                ERR("Please specify a tracer (-k/--kernel or -u/--userspace)");
@@ -220,6 +220,13 @@ static int enable_channel(char *session_name)
 
        set_default_attr(&dom);
 
+       if (chan.attr.tracefile_size == 0 && chan.attr.tracefile_count) {
+               ERR("Missing option --tracefile-size. "
+                               "A file count without a size won't do anything.");
+               ret = CMD_ERROR;
+               goto error;
+       }
+
        if ((chan.attr.tracefile_size > 0) &&
                        (chan.attr.tracefile_size < chan.attr.subbuf_size)) {
                WARN("Tracefile size rounded up from (%" PRIu64 ") to subbuffer size (%" PRIu64 ")",