Introduce utils_parse_time_suffix

[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 27d4618a9d0fd5b2f40f7c0dd7b05055bbd90d79..214c8a3621660c8cf83cbd31edf26e7b7c06aebc 100644 (file)
--- a/src/bin/lttng/commands/enable_channels.c
+++ b/src/bin/lttng/commands/enable_channels.c
@@ -46,7 +46,7 @@ static int opt_buffer_pid;
 static int opt_buffer_global;
 static struct {
        bool set;
-       uint32_t interval;
+       uint64_t interval;
 } opt_monitor_timer;
 static struct {
        bool set;
@@ -400,6 +400,7 @@ int cmd_enable_channels(int argc, const char **argv)
        static poptContext pc;
        char *session_name = NULL;
        char *opt_arg = NULL;
+       const char *leftover = NULL;
 
        init_channel_config();
 
@@ -534,69 +535,70 @@ int cmd_enable_channels(int argc, const char **argv)
                }
                case OPT_MONITOR_TIMER:
                {
-                       unsigned long v;
+                       uint64_t v;
 
                        errno = 0;
                        opt_arg = poptGetOptArg(pc);
-                       v = strtoul(opt_arg, NULL, 0);
-                       if (errno != 0 || !isdigit(opt_arg[0])) {
-                               ERR("Wrong value in --monitor-timer parameter: %s", opt_arg);
-                               ret = CMD_ERROR;
-                               goto end;
-                       }
-                       if (v != (uint32_t) v) {
-                               ERR("32-bit overflow 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 = (uint32_t) v;
+                       opt_monitor_timer.interval = (uint64_t) v;
                        opt_monitor_timer.set = true;
-                       DBG("Channel monitor timer interval set to %d", opt_monitor_timer.interval);
+                       DBG("Channel monitor timer interval set to %" PRIu64" (µs)", opt_monitor_timer.interval);
                        break;
                }
                case OPT_BLOCKING_TIMEOUT:
                {
-                       long long v;    /* in usec */
+                       uint64_t v;
                        long long v_msec;
 
                        errno = 0;
                        opt_arg = poptGetOptArg(pc);
-                       v = strtoll(opt_arg, NULL, 0);
-                       if (errno != 0 || (!isdigit(opt_arg[0]) && opt_arg[0] != '-')
-                                       || v < -1) {
-                               ERR("Wrong value in --blocking-timeout parameter: %s", opt_arg);
+
+                       if (strcmp(opt_arg, "inf") == 0) {
+                               opt_blocking_timeout.value = (int64_t) -1;
+                               opt_blocking_timeout.set = true;
+                               DBG("Channel blocking timeout set to infinity");
+                               break;
+                       }
+
+                       if (utils_parse_time_suffix(opt_arg, &v) < 0) {
+                               ERR("Wrong value for --blocking-timeout parameter: %s", opt_arg);
                                ret = CMD_ERROR;
                                goto end;
                        }
-                       if (v >= 0) {
-                               /*
-                                * While LTTng-UST and LTTng-tools will accept
-                                * a blocking timeout expressed in µs, the
-                                * current tracer implementation relies on
-                                * poll() which takes an "int timeout" parameter
-                                * expressed in msec.
-                                *
-                                * Since the error reporting from the tracer
-                                * is not precise, we perform this check here
-                                * to provide a helpful error message in case of
-                                * overflow.
-                                *
-                                * The setter (liblttng-ctl) also performs an
-                                * equivalent check.
-                                */
-                               v_msec = v / 1000;
-                               if (v_msec != (int32_t) v_msec) {
-                                       ERR("32-bit milliseconds overflow in --blocking-timeout parameter: %s", opt_arg);
-                                       ret = CMD_ERROR;
-                                       goto end;
-                               }
-                       } else if (v != -1) {
-                               ERR("Invalid negative value passed as --blocking-timeout parameter; -1 (block forever) is the only valid negative value");
+
+                       /*
+                        * While LTTng-UST and LTTng-tools will accept a
+                        * blocking timeout expressed in µs, the current
+                        * tracer implementation relies on poll() which
+                        * takes an "int timeout" parameter expressed in
+                        * msec.
+                        *
+                        * Since the error reporting from the tracer is
+                        * not precise, we perform this check here to
+                        * provide a helpful error message in case of
+                        * overflow.
+                        *
+                        * The setter (liblttng-ctl) also performs an
+                        * equivalent check.
+                        */
+                       v_msec = v / 1000;
+                       if (v_msec != (int32_t) v_msec) {
+                               ERR("32-bit milliseconds overflow in --blocking-timeout parameter: %s", opt_arg);
+                               ret = CMD_ERROR;
+                               goto end;
                        }
+
                        opt_blocking_timeout.value = (int64_t) v;
                        opt_blocking_timeout.set = true;
-                       DBG("Channel blocking timeout set to %" PRId64 " (µs)",
-                                       opt_blocking_timeout.value);
+                       DBG("Channel blocking timeout set to %" PRId64 " µs%s",
+                                       opt_blocking_timeout.value,
+                                       opt_blocking_timeout.value == 0 ?
+                                               " (non-blocking)" : "");
                        break;
                }
                case OPT_USERSPACE:
@@ -649,6 +651,14 @@ int cmd_enable_channels(int argc, const char **argv)
                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);
@@ -682,6 +692,14 @@ int cmd_enable_channels(int argc, const char **argv)
                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) {