Add default ust channel attributes

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

diff --git a/lttng/commands/enable_channels.c b/lttng/commands/enable_channels.c
index d8ad2a77b67a548df98ac10c6077e5f46481642e..c5887d07bf17ac10688e3dbb3b74bc6d57564ddc 100644 (file)
--- a/lttng/commands/enable_channels.c
+++ b/lttng/commands/enable_channels.c
@@ -119,6 +119,7 @@ static int enable_channel(char *session_name)
                dom.attr.pid = opt_pid;
                DBG("PID %d set to lttng handle", opt_pid);
        } else {
+               ERR("Please specify a tracer (--kernel or --userspace)");
                ret = CMD_NOT_IMPLEMENTED;
                goto error;
        }
@@ -127,9 +128,6 @@ static int enable_channel(char *session_name)
        if (handle == NULL) {
                ret = -1;
                goto error;
-       } else {
-               ERR("Please specify a tracer (--kernel or --userspace)");
-               goto error;
        }
 
        /* Strip channel list (format: chan1,chan2,...) */
@@ -179,8 +177,8 @@ static void init_channel_config(void)
                chan.attr.switch_timer_interval = DEFAULT_CHANNEL_SWITCH_TIMER;
                chan.attr.read_timer_interval = DEFAULT_CHANNEL_READ_TIMER;
 
-               chan.attr.subbuf_size = DEFAULT_CHANNEL_SUBBUF_SIZE;
-               chan.attr.num_subbuf = DEFAULT_CHANNEL_SUBBUF_NUM;
+               chan.attr.subbuf_size = DEFAULT_UST_CHANNEL_SUBBUF_SIZE;
+               chan.attr.num_subbuf = DEFAULT_UST_CHANNEL_SUBBUF_NUM;
                chan.attr.output = DEFAULT_CHANNEL_OUTPUT;
        }
 }