New UST default buffers is now per UID

Acked-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: David Goulet <dgoulet@efficios.com>

diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c
index 77f5e2510552f36b784e38816d5539671e66d26f..9eabf6225376360d2eef8e9d83d33b668e84c35e 100644 (file)
--- a/src/bin/lttng-sessiond/trace-ust.c
+++ b/src/bin/lttng-sessiond/trace-ust.c
@@ -203,7 +203,7 @@ struct ltt_ust_session *trace_ust_create_session(uint64_t session_id)
         * during the session lifetime which is at the first enable channel and
         * only before start. The flag buffer_type_changed indicates the status.
         */
-       lus->buffer_type = LTTNG_BUFFER_PER_PID;
+       lus->buffer_type = LTTNG_BUFFER_PER_UID;
        /* Once set to 1, the buffer_type is immutable for the session. */
        lus->buffer_type_changed = 0;
        /* Init it in case it get used after allocation. */

diff --git a/src/bin/lttng/commands/enable_channels.c b/src/bin/lttng/commands/enable_channels.c
index 49e16abf43f5184c35ad0274e9641096c3853192..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)");

diff --git a/src/bin/lttng/commands/enable_events.c b/src/bin/lttng/commands/enable_events.c
index 18793ae095a77cbe8365f09ac0576a06011ea407..b00324b2947be0f61e193a55bb2ca0eb27695c7a 100644 (file)
--- a/src/bin/lttng/commands/enable_events.c
+++ b/src/bin/lttng/commands/enable_events.c
@@ -340,7 +340,7 @@ static int enable_events(char *session_name)
        } else if (opt_userspace) {
                dom.type = LTTNG_DOMAIN_UST;
                /* Default. */
-               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)");
                ret = CMD_ERROR;