projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean-up: remove empty line in lttng create command
[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 48c21109527cb6c28c9c242f817e5d4865fb4dcd..3a7f9fd06b937141f7493c595ddc16f399233cec 100644
(file)
--- a/
src/bin/lttng/commands/enable_channels.c
+++ b/
src/bin/lttng/commands/enable_channels.c
@@
-244,7
+244,7
@@
static int enable_channel(char *session_name)
void *extended_ptr;
/* Validate channel name's length */
void *extended_ptr;
/* Validate channel name's length */
- if (strlen(channel_name) >=
NAME_MAX
) {
+ if (strlen(channel_name) >=
sizeof(chan_opts.name)
) {
ERR("Channel name is too long (max. %zu characters)",
sizeof(chan_opts.name) - 1);
error = 1;
ERR("Channel name is too long (max. %zu characters)",
sizeof(chan_opts.name) - 1);
error = 1;
@@
-400,6
+400,7
@@
int cmd_enable_channels(int argc, const char **argv)
static poptContext pc;
char *session_name = NULL;
char *opt_arg = NULL;
static poptContext pc;
char *session_name = NULL;
char *opt_arg = NULL;
+ const char *leftover = NULL;
init_channel_config();
init_channel_config();
@@
-492,66
+493,74
@@
int cmd_enable_channels(int argc, const char **argv)
}
case OPT_SWITCH_TIMER:
{
}
case OPT_SWITCH_TIMER:
{
- u
nsigned long
v;
+ u
int64_t
v;
errno = 0;
opt_arg = poptGetOptArg(pc);
errno = 0;
opt_arg = poptGetOptArg(pc);
- v = strtoul(opt_arg, NULL, 0);
- if (
errno != 0 || !isdigit(opt_arg[0])
) {
- ERR("Wrong value
in
--switch-timer parameter: %s", opt_arg);
+
+ if (
utils_parse_time_suffix(opt_arg, &v) < 0
) {
+ ERR("Wrong value
for
--switch-timer parameter: %s", opt_arg);
ret = CMD_ERROR;
goto end;
}
ret = CMD_ERROR;
goto end;
}
+
if (v != (uint32_t) v) {
ERR("32-bit overflow in --switch-timer parameter: %s", opt_arg);
ret = CMD_ERROR;
goto end;
}
chan_opts.attr.switch_timer_interval = (uint32_t) v;
if (v != (uint32_t) v) {
ERR("32-bit overflow in --switch-timer parameter: %s", opt_arg);
ret = CMD_ERROR;
goto end;
}
chan_opts.attr.switch_timer_interval = (uint32_t) v;
- DBG("Channel switch timer interval set to %d", chan_opts.attr.switch_timer_interval);
+ DBG("Channel switch timer interval set to %d %s",
+ chan_opts.attr.switch_timer_interval,
+ USEC_UNIT);
break;
}
case OPT_READ_TIMER:
{
break;
}
case OPT_READ_TIMER:
{
- u
nsigned long
v;
+ u
int64_t
v;
errno = 0;
opt_arg = poptGetOptArg(pc);
errno = 0;
opt_arg = poptGetOptArg(pc);
- v = strtoul(opt_arg, NULL, 0);
- if (
errno != 0 || !isdigit(opt_arg[0])
) {
- ERR("Wrong value
in
--read-timer parameter: %s", opt_arg);
+
+ if (
utils_parse_time_suffix(opt_arg, &v) < 0
) {
+ ERR("Wrong value
for
--read-timer parameter: %s", opt_arg);
ret = CMD_ERROR;
goto end;
}
ret = CMD_ERROR;
goto end;
}
+
if (v != (uint32_t) v) {
ERR("32-bit overflow in --read-timer parameter: %s", opt_arg);
ret = CMD_ERROR;
goto end;
}
chan_opts.attr.read_timer_interval = (uint32_t) v;
if (v != (uint32_t) v) {
ERR("32-bit overflow in --read-timer parameter: %s", opt_arg);
ret = CMD_ERROR;
goto end;
}
chan_opts.attr.read_timer_interval = (uint32_t) v;
- DBG("Channel read timer interval set to %d", chan_opts.attr.read_timer_interval);
+ DBG("Channel read timer interval set to %d %s",
+ chan_opts.attr.read_timer_interval,
+ USEC_UNIT);
break;
}
case OPT_MONITOR_TIMER:
{
break;
}
case OPT_MONITOR_TIMER:
{
- u
nsigned long long
v;
+ u
int64_t
v;
errno = 0;
opt_arg = poptGetOptArg(pc);
errno = 0;
opt_arg = poptGetOptArg(pc);
- v = strtoull(opt_arg, NULL, 0);
- if (
errno != 0 || !isdigit(opt_arg[0])
) {
- ERR("Wrong value
in
--monitor-timer parameter: %s", opt_arg);
+
+ if (
utils_parse_time_suffix(opt_arg, &v) < 0
) {
+ ERR("Wrong value
for
--monitor-timer parameter: %s", opt_arg);
ret = CMD_ERROR;
goto end;
}
opt_monitor_timer.interval = (uint64_t) v;
opt_monitor_timer.set = true;
ret = CMD_ERROR;
goto end;
}
opt_monitor_timer.interval = (uint64_t) v;
opt_monitor_timer.set = true;
- DBG("Channel monitor timer interval set to %" PRIu64" (µs)", opt_monitor_timer.interval);
+ DBG("Channel monitor timer interval set to %" PRIu64 " %s",
+ opt_monitor_timer.interval,
+ USEC_UNIT);
break;
}
case OPT_BLOCKING_TIMEOUT:
{
break;
}
case OPT_BLOCKING_TIMEOUT:
{
- long long v; /* in usec */
+ uint64_t v;
long long v_msec;
errno = 0;
long long v_msec;
errno = 0;
@@
-564,10
+573,8
@@
int cmd_enable_channels(int argc, const char **argv)
break;
}
break;
}
- v = strtoll(opt_arg, NULL, 0);
- if (errno != 0 || (!isdigit(opt_arg[0]) && opt_arg[0] != '-')
- || v < 0) {
- ERR("Wrong value in --blocking-timeout parameter: %s", opt_arg);
+ if (utils_parse_time_suffix(opt_arg, &v) < 0) {
+ ERR("Wrong value for --blocking-timeout parameter: %s", opt_arg);
ret = CMD_ERROR;
goto end;
}
ret = CMD_ERROR;
goto end;
}
@@
-596,8
+603,9
@@
int cmd_enable_channels(int argc, const char **argv)
opt_blocking_timeout.value = (int64_t) v;
opt_blocking_timeout.set = true;
opt_blocking_timeout.value = (int64_t) v;
opt_blocking_timeout.set = true;
- DBG("Channel blocking timeout set to %" PRId64 "
µ
s%s",
+ DBG("Channel blocking timeout set to %" PRId64 "
%
s%s",
opt_blocking_timeout.value,
opt_blocking_timeout.value,
+ USEC_UNIT,
opt_blocking_timeout.value == 0 ?
" (non-blocking)" : "");
break;
opt_blocking_timeout.value == 0 ?
" (non-blocking)" : "");
break;
@@
-652,6
+660,14
@@
int cmd_enable_channels(int argc, const char **argv)
goto end;
}
goto end;
}
+ if (chan_opts.attr.overwrite == 1 && opt_blocking_timeout.set &&
+ opt_blocking_timeout.value != 0) {
+ ERR("You cannot specify --overwrite and --blocking-timeout=N, "
+ "where N is different than 0");
+ ret = CMD_ERROR;
+ goto end;
+ }
+
/* Mi check */
if (lttng_opt_mi) {
writer = mi_lttng_writer_create(fileno(stdout), lttng_opt_mi);
/* Mi check */
if (lttng_opt_mi) {
writer = mi_lttng_writer_create(fileno(stdout), lttng_opt_mi);
@@
-685,6
+701,14
@@
int cmd_enable_channels(int argc, const char **argv)
goto mi_closing;
}
goto mi_closing;
}
+ leftover = poptGetArg(pc);
+ if (leftover) {
+ ERR("Unknown argument: %s", leftover);
+ ret = CMD_ERROR;
+ success = 0;
+ goto mi_closing;
+ }
+
if (!opt_session_name) {
session_name = get_session_name();
if (session_name == NULL) {
if (!opt_session_name) {
session_name = get_session_name();
if (session_name == NULL) {
This page took
0.026064 seconds
and
4
git commands to generate.