From: Mathieu Desnoyers Date: Fri, 19 Jul 2013 18:43:05 +0000 (-0400) Subject: Fix: sym name len (kernel) X-Git-Tag: v2.3.0-rc2~6 X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=bd722d76b035766511f0b329f9bbaa2f4180c4ed;hp=447e8ad9216e708f1698e05dabfdaacc7b3196cf Fix: sym name len (kernel) Use kernel and not UST sym name len for kernel tracing. Fixed build when UST is disabled. Fix bug introduced in 2.3-rc dev cycle by: commit 850767541647c102a299d7fbc39c97555ac70224 Author: Mathieu Desnoyers Date: Fri Jul 19 09:04:29 2013 -0400 Fix: (slight UI change) refuse missing -c if non-default channel exists Signed-off-by: Mathieu Desnoyers --- diff --git a/src/bin/lttng-sessiond/trace-kernel.c b/src/bin/lttng-sessiond/trace-kernel.c index 0c14052e1..a5c215fae 100644 --- a/src/bin/lttng-sessiond/trace-kernel.c +++ b/src/bin/lttng-sessiond/trace-kernel.c @@ -159,7 +159,7 @@ struct ltt_kernel_channel *trace_kernel_create_channel( strncpy(lkc->channel->name, DEFAULT_CHANNEL_NAME, sizeof(lkc->channel->name)); } - lkc->channel->name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0'; + lkc->channel->name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0'; lkc->fd = -1; lkc->stream_count = 0;