From 8692d4e5805da0104c690972bb96b60b8cb52685 Mon Sep 17 00:00:00 2001 From: David Goulet Date: Thu, 11 Jul 2013 15:30:49 -0400 Subject: [PATCH] New UST default buffers is now per UID Acked-by: Mathieu Desnoyers Signed-off-by: David Goulet --- src/bin/lttng-sessiond/trace-ust.c | 2 +- src/bin/lttng/commands/enable_channels.c | 6 +++--- src/bin/lttng/commands/enable_events.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c index 77f5e2510..9eabf6225 100644 --- 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 49e16abf4..4185b19a7 100644 --- 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 18793ae09..b00324b29 100644 --- 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; -- 2.34.1