projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix enable channel usage and add enable event error msg
[lttng-tools.git]
/
src
/
bin
/
lttng
/
commands
/
enable_channels.c
diff --git
a/src/bin/lttng/commands/enable_channels.c
b/src/bin/lttng/commands/enable_channels.c
index 19b6b260bd7065e0b6490d8e247036483ecb14c6..912e3b0413d64297a8a87638518b8a51d9322606 100644
(file)
--- a/
src/bin/lttng/commands/enable_channels.c
+++ b/
src/bin/lttng/commands/enable_channels.c
@@
-100,17
+100,17
@@
static void usage(FILE *ofp)
DEFAULT_CHANNEL_OVERWRITE ? "" : " (default)");
fprintf(ofp, " --overwrite Flight recorder mode%s\n",
DEFAULT_CHANNEL_OVERWRITE ? " (default)" : "");
DEFAULT_CHANNEL_OVERWRITE ? "" : " (default)");
fprintf(ofp, " --overwrite Flight recorder mode%s\n",
DEFAULT_CHANNEL_OVERWRITE ? " (default)" : "");
- fprintf(ofp, " --subbuf-size
Subbuffer size in bytes\n");
+ fprintf(ofp, " --subbuf-size
SIZE
Subbuffer size in bytes\n");
fprintf(ofp, " (default: %u, kernel default: %u)\n",
DEFAULT_CHANNEL_SUBBUF_SIZE,
DEFAULT_KERNEL_CHANNEL_SUBBUF_SIZE);
fprintf(ofp, " (default: %u, kernel default: %u)\n",
DEFAULT_CHANNEL_SUBBUF_SIZE,
DEFAULT_KERNEL_CHANNEL_SUBBUF_SIZE);
- fprintf(ofp, " --num-subbuf
Number of subbufers\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, kernel default: %u)\n",
DEFAULT_CHANNEL_SUBBUF_NUM,
DEFAULT_KERNEL_CHANNEL_SUBBUF_NUM);
- fprintf(ofp, " --switch-timer
Switch timer interval in usec (default: %u)\n",
+ fprintf(ofp, " --switch-timer
USEC
Switch timer interval in usec (default: %u)\n",
DEFAULT_CHANNEL_SWITCH_TIMER);
DEFAULT_CHANNEL_SWITCH_TIMER);
- fprintf(ofp, " --read-timer
Read timer interval in usec (default: %u)\n",
+ fprintf(ofp, " --read-timer
USEC
Read timer interval in usec (default: %u)\n",
DEFAULT_CHANNEL_READ_TIMER);
fprintf(ofp, "\n");
}
DEFAULT_CHANNEL_READ_TIMER);
fprintf(ofp, "\n");
}
@@
-151,7
+151,7
@@
static void set_default_attr(struct lttng_domain *dom)
*/
static int enable_channel(char *session_name)
{
*/
static int enable_channel(char *session_name)
{
- int ret = CMD_SUCCESS;
+ int ret = CMD_SUCCESS
, warn = 0
;
char *channel_name;
struct lttng_domain dom;
char *channel_name;
struct lttng_domain dom;
@@
-185,7
+185,9
@@
static int enable_channel(char *session_name)
ret = lttng_enable_channel(handle, &chan);
if (ret < 0) {
ret = lttng_enable_channel(handle, &chan);
if (ret < 0) {
- goto error;
+ ERR("Channel %s: %s (session %s)", channel_name,
+ lttng_strerror(ret), session_name);
+ warn = 1;
} else {
MSG("%s channel %s enabled for session %s",
opt_kernel ? "Kernel" : "UST", channel_name,
} else {
MSG("%s channel %s enabled for session %s",
opt_kernel ? "Kernel" : "UST", channel_name,
@@
-196,7
+198,13
@@
static int enable_channel(char *session_name)
channel_name = strtok(NULL, ",");
}
channel_name = strtok(NULL, ",");
}
+ ret = CMD_SUCCESS;
+
error:
error:
+ if (warn) {
+ ret = CMD_WARNING;
+ }
+
lttng_destroy_handle(handle);
return ret;
lttng_destroy_handle(handle);
return ret;
This page took
0.024652 seconds
and
4
git commands to generate.