X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fenable_channels.c;h=9b5f8d64d302b276f3faee598c30e43dfcde28a2;hb=4222434939b65c3abf144866564732d7fd14ed13;hp=f094e12feb84f51f5e2130bfaf3d5b494a9e1e7e;hpb=2722170124d7942f34b991237874a6d6c17fc421;p=lttng-tools.git diff --git a/src/bin/lttng/commands/enable_channels.c b/src/bin/lttng/commands/enable_channels.c index f094e12fe..9b5f8d64d 100644 --- a/src/bin/lttng/commands/enable_channels.c +++ b/src/bin/lttng/commands/enable_channels.c @@ -1,19 +1,18 @@ /* * Copyright (C) 2011 - David Goulet * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; only version 2 - * of the License. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2 only, + * as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #define _GNU_SOURCE @@ -28,6 +27,8 @@ #include "../command.h" +#include + static char *opt_channels; static int opt_kernel; static char *opt_session_name; @@ -104,10 +105,13 @@ static void usage(FILE *ofp) fprintf(ofp, " (default: %u, kernel default: %u)\n", DEFAULT_CHANNEL_SUBBUF_SIZE, DEFAULT_KERNEL_CHANNEL_SUBBUF_SIZE); + fprintf(ofp, " Needs to be a power of 2 for\n"); + fprintf(ofp, " kernel and ust tracers\n"); fprintf(ofp, " --num-subbuf NUM Number of subbufers\n"); - fprintf(ofp, " (default: %u, kernel default: %u)\n", - DEFAULT_CHANNEL_SUBBUF_NUM, - DEFAULT_KERNEL_CHANNEL_SUBBUF_NUM); + fprintf(ofp, " (default: %u)\n", + DEFAULT_CHANNEL_SUBBUF_NUM); + fprintf(ofp, " Needs to be a power of 2 for\n"); + fprintf(ofp, " kernel and ust tracers\n"); fprintf(ofp, " --switch-timer USEC Switch timer interval in usec (default: %u)\n", DEFAULT_CHANNEL_SWITCH_TIMER); fprintf(ofp, " --read-timer USEC Read timer interval in usec (default: %u)\n", @@ -155,6 +159,8 @@ static int enable_channel(char *session_name) char *channel_name; struct lttng_domain dom; + memset(&dom, 0, sizeof(dom)); + /* Create lttng domain */ if (opt_kernel) { dom.type = LTTNG_DOMAIN_KERNEL; @@ -185,8 +191,17 @@ static int enable_channel(char *session_name) ret = lttng_enable_channel(handle, &chan); if (ret < 0) { - ERR("Channel %s: %s (session %s)", channel_name, - lttng_strerror(ret), session_name); + switch (-ret) { + case LTTCOMM_KERN_CHAN_EXIST: + case LTTCOMM_UST_CHAN_EXIST: + WARN("Channel %s: %s (session %s", channel_name, + lttng_strerror(ret), session_name); + goto error; + default: + ERR("Channel %s: %s (session %s)", channel_name, + lttng_strerror(ret), session_name); + break; + } warn = 1; } else { MSG("%s channel %s enabled for session %s", @@ -303,6 +318,9 @@ int cmd_enable_channels(int argc, const char **argv) ret = enable_channel(session_name); end: + if (!opt_session_name && session_name) { + free(session_name); + } poptFreeContext(pc); return ret; }