/*
* Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
*
- * 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
#include "../command.h"
+#include <src/common/sessiond-comm/sessiond-comm.h>
+
static char *opt_channels;
static int opt_kernel;
static char *opt_session_name;
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",
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",