OPT_CONDITION,
OPT_ACTION,
OPT_ID,
- OPT_FIRE_ONCE_AFTER,
- OPT_FIRE_EVERY,
OPT_USER_ID,
+ OPT_RATE_POLICY,
- OPT_ALL,
+ OPT_NAME,
OPT_FILTER,
- OPT_EXCLUDE,
+ OPT_EXCLUDE_NAMES,
+ OPT_EVENT_NAME,
OPT_LOGLEVEL,
OPT_LOGLEVEL_ONLY,
- OPT_USERSPACE,
- OPT_KERNEL,
- OPT_LOG4J,
- OPT_JUL,
- OPT_PYTHON,
-
- OPT_FUNCTION,
- OPT_PROBE,
- OPT_USERSPACE_PROBE,
- OPT_SYSCALL,
- OPT_TRACEPOINT,
+ OPT_DOMAIN,
+ OPT_TYPE,
+ OPT_LOCATION,
- OPT_NAME,
OPT_MAX_SIZE,
OPT_DATA_URL,
OPT_CTRL_URL,
};
static const struct argpar_opt_descr event_rule_opt_descrs[] = {
- { OPT_ALL, 'a', "all", false },
{ OPT_FILTER, 'f', "filter", true },
- { OPT_EXCLUDE, 'x', "exclude", true },
+ { OPT_NAME, 'n', "name", true },
+ { OPT_EXCLUDE_NAMES, 'x', "exclude-names", true },
{ OPT_LOGLEVEL, '\0', "loglevel", true },
{ OPT_LOGLEVEL_ONLY, '\0', "loglevel-only", true },
+ { OPT_EVENT_NAME, 'E', "event-name", true },
- /* Domains */
- { OPT_USERSPACE, 'u', "userspace", false },
- { OPT_KERNEL, 'k', "kernel", false },
- { OPT_LOG4J, 'l', "log4j", false },
- { OPT_JUL, 'j', "jul", false },
- { OPT_PYTHON, 'p', "python", false },
-
- /* Event rule types */
- { OPT_FUNCTION, '\0', "function", true },
- { OPT_PROBE, '\0', "probe", true },
- { OPT_USERSPACE_PROBE, '\0', "userspace-probe", true },
- { OPT_SYSCALL, '\0', "syscall" },
- { OPT_TRACEPOINT, '\0', "tracepoint" },
+ { OPT_DOMAIN, 'd', "domain", true },
+ { OPT_TYPE, 't', "type", true },
+ { OPT_LOCATION, 'L', "location", true },
/* Capture descriptor */
{ OPT_CAPTURE, '\0', "capture", true },
};
static
-bool assign_domain_type(enum lttng_domain_type *dest,
- enum lttng_domain_type src)
+bool assign_domain_type(enum lttng_domain_type *dest, const char *arg)
{
bool ret;
- if (*dest == LTTNG_DOMAIN_NONE || *dest == src) {
- *dest = src;
- ret = true;
+ if (*dest != LTTNG_DOMAIN_NONE) {
+ ERR("More than one `--domain` was specified.");
+ goto error;
+ }
+
+ if (strcmp(arg, "kernel") == 0) {
+ *dest = LTTNG_DOMAIN_KERNEL;
+ } else if (strcmp(arg, "user") == 0 || strcmp(arg, "userspace") == 0) {
+ *dest = LTTNG_DOMAIN_UST;
+ } else if (strcmp(arg, "jul") == 0) {
+ *dest = LTTNG_DOMAIN_JUL;
+ } else if (strcmp(arg, "log4j") == 0) {
+ *dest = LTTNG_DOMAIN_LOG4J;
+ } else if (strcmp(arg, "python") == 0) {
+ *dest = LTTNG_DOMAIN_PYTHON;
} else {
- ERR("Multiple domains specified.");
- ret = false;
+ ERR("Invalid `--domain` value: %s", arg);
+ goto error;
}
+ ret = true;
+ goto end;
+
+error:
+ ret = false;
+
+end:
return ret;
}
static
-bool assign_event_rule_type(enum lttng_event_rule_type *dest,
- enum lttng_event_rule_type src)
+bool assign_event_rule_type(enum lttng_event_rule_type *dest, const char *arg)
{
bool ret;
- if (*dest == LTTNG_EVENT_RULE_TYPE_UNKNOWN || *dest == src) {
- *dest = src;
- ret = true;
+ if (*dest != LTTNG_EVENT_RULE_TYPE_UNKNOWN) {
+ ERR("More than one `--type` was specified.");
+ goto error;
+ }
+
+ if (strcmp(arg, "tracepoint") == 0 || strcmp(arg, "logging") == 0) {
+ *dest = LTTNG_EVENT_RULE_TYPE_TRACEPOINT;
+ } else if (strcmp (arg, "kprobe") == 0 || strcmp(arg, "kernel-probe") == 0) {
+ *dest = LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE;
+ } else if (strcmp (arg, "uprobe") == 0 || strcmp(arg, "userspace-probe") == 0) {
+ *dest = LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE;
+ } else if (strcmp (arg, "function") == 0) {
+ *dest = LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION;
+ } else if (strcmp (arg, "syscall") == 0) {
+ *dest = LTTNG_EVENT_RULE_TYPE_SYSCALL;
} else {
- ERR("Multiple event types specified.");
- ret = false;
+ ERR("Invalid `--type` value: %s", arg);
+ goto error;
}
+ ret = true;
+ goto end;
+
+error:
+ ret = false;
+
+end:
return ret;
}
struct filter_parser_ctx *parser_ctx = NULL;
struct lttng_log_level_rule *log_level_rule = NULL;
- /* Was the -a/--all flag provided? */
- bool all_events = false;
-
- /* Tracepoint name (non-option argument). */
- const char *tracepoint_name = NULL;
+ /* Tracepoint and syscall options. */
+ char *name = NULL;
+ char *exclude_names = NULL;
+ char **exclusion_list = NULL;
- /* Holds the argument of --probe / --userspace-probe. */
- char *source = NULL;
+ /* For userspace / kernel probe and function. */
+ char *location = NULL;
+ char *event_name = NULL;
/* Filter. */
char *filter = NULL;
- /* Exclude. */
- char *exclude = NULL;
- char **exclusion_list = NULL;
-
/* Log level. */
char *loglevel_str = NULL;
bool loglevel_only = false;
switch (item_opt->descr->id) {
/* Domains. */
- case OPT_USERSPACE:
- if (!assign_domain_type(&domain_type, LTTNG_DOMAIN_UST)) {
- goto error;
- }
-
- break;
- case OPT_KERNEL:
- if (!assign_domain_type(&domain_type, LTTNG_DOMAIN_KERNEL)) {
+ case OPT_DOMAIN:
+ if (!assign_domain_type(&domain_type,
+ item_opt->arg)) {
goto error;
}
break;
- case OPT_LOG4J:
- if (!assign_domain_type(&domain_type, LTTNG_DOMAIN_LOG4J)) {
- goto error;
- }
-
- break;
- case OPT_JUL:
- if (!assign_domain_type(&domain_type, LTTNG_DOMAIN_JUL)) {
- goto error;
- }
-
- break;
- case OPT_PYTHON:
- if (!assign_domain_type(&domain_type, LTTNG_DOMAIN_PYTHON)) {
- goto error;
- }
-
- break;
-
- /* Event rule types */
- case OPT_FUNCTION:
+ case OPT_TYPE:
if (!assign_event_rule_type(&event_rule_type,
- LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION)) {
+ item_opt->arg)) {
goto error;
}
break;
- case OPT_PROBE:
- if (!assign_event_rule_type(&event_rule_type,
- LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE)) {
+ case OPT_LOCATION:
+ if (!assign_string(&location,
+ item_opt->arg,
+ "--location/-L")) {
goto error;
}
- if (!assign_string(&source, item_opt->arg, "source")) {
- goto error;
- }
-
- break;
- case OPT_USERSPACE_PROBE:
- if (!assign_event_rule_type(&event_rule_type,
- LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE)) {
- goto error;
- }
-
- if (!assign_string(&source, item_opt->arg, "source")) {
- goto error;
- }
-
break;
- case OPT_SYSCALL:
- if (!assign_event_rule_type(&event_rule_type,
- LTTNG_EVENT_RULE_TYPE_SYSCALL)) {
+ case OPT_EVENT_NAME:
+ if (!assign_string(&event_name,
+ item_opt->arg,
+ "--event-name/-E")) {
goto error;
}
break;
- case OPT_TRACEPOINT:
- if (!assign_event_rule_type(&event_rule_type,
- LTTNG_EVENT_RULE_TYPE_TRACEPOINT)) {
+ case OPT_FILTER:
+ if (!assign_string(&filter, item_opt->arg,
+ "--filter/-f")) {
goto error;
}
break;
- case OPT_ALL:
- all_events = true;
- break;
- case OPT_FILTER:
- if (!assign_string(&filter, item_opt->arg,
- "--filter/-f")) {
+ case OPT_NAME:
+ if (!assign_string(&name, item_opt->arg,
+ "--name/-n")) {
goto error;
}
break;
- case OPT_EXCLUDE:
- if (!assign_string(&exclude, item_opt->arg,
- "--exclude/-x")) {
+ case OPT_EXCLUDE_NAMES:
+ if (!assign_string(&exclude_names,
+ item_opt->arg,
+ "--exclude-names/-x")) {
goto error;
}
(const struct argpar_item_non_opt *)
item;
- /*
- * Don't accept two non-option arguments/tracepoint
- * names.
- */
- if (tracepoint_name) {
- ERR("Unexpected argument '%s'",
- item_non_opt->arg);
- goto error;
- }
-
- tracepoint_name = item_non_opt->arg;
+ /* Don't accept non-option arguments. */
+ ERR("Unexpected argument '%s'", item_non_opt->arg);
+ goto error;
}
}
}
/*
- * Option -a is applicable to event rules of type tracepoint and
- * syscall, and it is equivalent to using "*" as the tracepoint name.
+ * Option --name is applicable to event rules of type tracepoint
+ * and syscall. For tracepoint and syscall rules, if --name is
+ * omitted, it is implicitly "*".
*/
- if (all_events) {
- switch (event_rule_type) {
- case LTTNG_EVENT_RULE_TYPE_TRACEPOINT:
- case LTTNG_EVENT_RULE_TYPE_SYSCALL:
- break;
- default:
- ERR("Can't use -a/--all with %s event rules.",
- lttng_event_rule_type_str(event_rule_type));
- goto error;
+ switch (event_rule_type) {
+ case LTTNG_EVENT_RULE_TYPE_TRACEPOINT:
+ case LTTNG_EVENT_RULE_TYPE_SYSCALL:
+ if (!name) {
+ name = strdup("*");
}
+ break;
- if (tracepoint_name) {
- ERR("Can't provide a tracepoint name with -a/--all.");
+ default:
+ if (name) {
+ ERR("Can't use --name with %s event rules.",
+ lttng_event_rule_type_str(
+ event_rule_type));
goto error;
}
- /* In which case, it's equivalent to tracepoint name "*". */
- tracepoint_name = "*";
+ if (exclude_names) {
+ ERR("Can't use --exclude-names/-x with %s event rules.",
+ lttng_event_rule_type_str(
+ event_rule_type));
+ goto error;
+ }
}
/*
- * A tracepoint name (or -a, for the event rule types that accept it)
- * is required.
+ * Option --location is only applicable to (and mandatory for) event
+ * rules of type {k,u}probe and function.
+ *
+ * Option --event-name is only applicable to event rules of type probe.
+ * If omitted, it defaults to the location.
*/
- if (!tracepoint_name) {
- ERR("Need to provide either a tracepoint name or -a/--all.");
- goto error;
- }
+ switch (event_rule_type) {
+ case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE:
+ case LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE:
+ case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION:
+ if (!location) {
+ ERR("Event rule of type %s requires a --location.",
+ lttng_event_rule_type_str(event_rule_type));
+ goto error;
+ }
- /*
- * We don't support multiple tracepoint names for now.
- */
- if (strchr(tracepoint_name, ',')) {
- ERR("Comma separated tracepoint names are not supported.");
- goto error;
+ if (!event_name) {
+ event_name = strdup(location);
+ }
+
+ break;
+
+ default:
+ if (location) {
+ ERR("Can't use --location with %s event rules.",
+ lttng_event_rule_type_str(event_rule_type));
+ goto error;
+ }
+
+ if (event_name) {
+ ERR("Can't use --event-name with %s event rules.",
+ lttng_event_rule_type_str(
+ event_rule_type));
+ goto error;
+ }
}
/*
/* Need to specify a domain. */
if (domain_type == LTTNG_DOMAIN_NONE) {
- ERR("Please specify a domain (--kernel/--userspace/--jul/--log4j/--python).");
+ ERR("Please specify a domain (--domain=(kernel,user,jul,log4j,python)).");
goto error;
}
}
/* If --exclude/-x was passed, split it into an exclusion list. */
- if (exclude) {
+ if (exclude_names) {
if (domain_type != LTTNG_DOMAIN_UST) {
ERR("Event name exclusions are not yet implemented for %s event rules.",
get_domain_str(domain_type));
goto error;
}
-
- if (create_exclusion_list_and_validate(tracepoint_name, exclude,
- &exclusion_list) != 0) {
+ if (create_exclusion_list_and_validate(name,
+ exclude_names, &exclusion_list) != 0) {
ERR("Failed to create exclusion list.");
goto error;
}
/* Set pattern. */
event_rule_status = lttng_event_rule_tracepoint_set_pattern(
- res.er, tracepoint_name);
+ res.er, name);
if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
ERR("Failed to set tracepoint event rule's pattern to '%s'.",
- tracepoint_name);
+ name);
goto error;
}
int ret;
enum lttng_event_rule_status event_rule_status;
-
- ret = parse_kernel_probe_opts(source, &kernel_probe_location);
+ ret = parse_kernel_probe_opts(
+ location, &kernel_probe_location);
if (ret) {
ERR("Failed to parse kernel probe location.");
goto error;
goto error;
}
- event_rule_status = lttng_event_rule_kernel_probe_set_event_name(res.er, tracepoint_name);
+ event_rule_status =
+ lttng_event_rule_kernel_probe_set_event_name(
+ res.er, event_name);
if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
- ERR("Failed to set kprobe event rule's name to '%s'.", tracepoint_name);
+ ERR("Failed to set kprobe event rule's name to '%s'.",
+ event_name);
goto error;
}
enum lttng_event_rule_status event_rule_status;
ret = parse_userspace_probe_opts(
- source, &userspace_probe_location);
+ location, &userspace_probe_location);
if (ret) {
ERR("Failed to parse user space probe location.");
goto error;
goto error;
}
- event_rule_status = lttng_event_rule_userspace_probe_set_event_name(
- res.er, tracepoint_name);
+ event_rule_status =
+ lttng_event_rule_userspace_probe_set_event_name(
+ res.er, event_name);
if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
ERR("Failed to set user space probe event rule's name to '%s'.",
- tracepoint_name);
+ event_name);
goto error;
}
}
event_rule_status = lttng_event_rule_syscall_set_pattern(
- res.er, tracepoint_name);
+ res.er, name);
if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
ERR("Failed to set syscall event rule's pattern to '%s'.",
- tracepoint_name);
+ name);
goto error;
}
free(error);
argpar_state_destroy(state);
free(filter);
- free(exclude);
+ free(name);
+ free(exclude_names);
free(loglevel_str);
- free(source);
+ free(location);
+ free(event_name);
+
strutils_free_null_terminated_array_of_strings(exclusion_list);
lttng_kernel_probe_location_destroy(kernel_probe_location);
lttng_userspace_probe_location_destroy(userspace_probe_location);
static const
struct condition_descr condition_descrs[] = {
- { "on-event", handle_condition_event },
+ { "event-rule-matches", handle_condition_event },
{ "on-session-consumed-size", handle_condition_session_consumed_size },
{ "on-buffer-usage-high", handle_condition_buffer_usage_high },
{ "on-buffer-usage-low", handle_condition_buffer_usage_low },
};
static
-struct lttng_condition *parse_condition(int *argc, const char ***argv)
+struct lttng_condition *parse_condition(const char *condition_name, int *argc,
+ const char ***argv)
{
int i;
struct lttng_condition *cond;
- const char *condition_name;
const struct condition_descr *descr = NULL;
- if (*argc == 0) {
- ERR("Missing condition name.");
- goto error;
- }
-
- condition_name = (*argv)[0];
-
- (*argc)--;
- (*argv)++;
-
for (i = 0; i < ARRAY_SIZE(condition_descrs); i++) {
if (strcmp(condition_name, condition_descrs[i].name) == 0) {
descr = &condition_descrs[i];
end:
return cond;
}
+
+static struct lttng_rate_policy *parse_rate_policy(const char *policy_str)
+{
+ int num_token;
+ char **tokens = NULL;
+ struct lttng_rate_policy *policy = NULL;
+ enum lttng_rate_policy_type policy_type;
+ unsigned long long value;
+ char *policy_type_str;
+ char *policy_value_str;
+
+ assert(policy_str);
+
+ /*
+ * rate policy fields are separated by ':'.
+ */
+ tokens = strutils_split(policy_str, ':', 1);
+ num_token = strutils_array_of_strings_len(tokens);
+
+ /*
+ * Early sanity check that the number of parameter is exactly 2.
+ * i.e : type:value
+ */
+ if (num_token != 2) {
+ ERR("Rate policy format is invalid.");
+ goto end;
+ }
+
+ policy_type_str = tokens[0];
+ policy_value_str = tokens[1];
+
+ /* Parse the type. */
+ if (strcmp(policy_type_str, "once-after") == 0) {
+ policy_type = LTTNG_RATE_POLICY_TYPE_ONCE_AFTER_N;
+ } else if (strcmp(policy_type_str, "every") == 0) {
+ policy_type = LTTNG_RATE_POLICY_TYPE_EVERY_N;
+ } else {
+ ERR("Rate policy type `%s` unknown.", policy_type_str);
+ goto end;
+ }
+
+ /* Parse the value. */
+ if (utils_parse_unsigned_long_long(policy_value_str, &value) != 0) {
+ ERR("Failed to parse rate policy value `%s` as an integer.",
+ policy_value_str);
+ goto end;
+ }
+
+ if (value == 0) {
+ ERR("Rate policy value `%s` must be > 0.", policy_value_str);
+ goto end;
+ }
+
+ switch (policy_type) {
+ case LTTNG_RATE_POLICY_TYPE_EVERY_N:
+ policy = lttng_rate_policy_every_n_create(value);
+ break;
+ case LTTNG_RATE_POLICY_TYPE_ONCE_AFTER_N:
+ policy = lttng_rate_policy_once_after_n_create(value);
+ break;
+ default:
+ abort();
+ }
+
+ if (policy == NULL) {
+ ERR("Failed to create rate policy `%s`.", policy_str);
+ }
+
+end:
+ strutils_free_null_terminated_array_of_strings(tokens);
+ return policy;
+}
+
static const struct argpar_opt_descr notify_action_opt_descrs[] = {
- { OPT_FIRE_ONCE_AFTER, '\0', "fire-once-after", true },
- { OPT_FIRE_EVERY, '\0', "fire-every", true },
+ { OPT_RATE_POLICY, '\0', "rate-policy", true },
ARGPAR_OPT_DESCR_SENTINEL
};
-
static
struct lttng_action *handle_action_notify(int *argc, const char ***argv)
{
struct argpar_state *state = NULL;
struct argpar_item *item = NULL;
char *error = NULL;
- char *fire_once_after_str = NULL;
- char *fire_every_str = NULL;
struct lttng_rate_policy *policy = NULL;
state = argpar_state_create(*argc, *argv, notify_action_opt_descrs);
(const struct argpar_item_opt *) item;
switch (item_opt->descr->id) {
- case OPT_FIRE_ONCE_AFTER:
+ case OPT_RATE_POLICY:
{
- if (!assign_string(&fire_once_after_str,
- item_opt->arg,
- "--fire-once-after")) {
- goto error;
- }
-
- break;
- }
- case OPT_FIRE_EVERY:
- {
- if (!assign_string(&fire_every_str,
- item_opt->arg,
- "--fire-every")) {
+ policy = parse_rate_policy(item_opt->arg);
+ if (!policy) {
goto error;
}
-
break;
}
-
default:
abort();
}
*argc -= argpar_state_get_ingested_orig_args(state);
*argv += argpar_state_get_ingested_orig_args(state);
- if (fire_once_after_str && fire_every_str) {
- ERR("--fire-once and --fire-every are mutually exclusive.");
- goto error;
- }
-
- if (fire_once_after_str) {
- unsigned long long threshold;
-
- if (utils_parse_unsigned_long_long(
- fire_once_after_str, &threshold) != 0) {
- ERR("Failed to parse `%s` as an integer.",
- fire_once_after_str);
- goto error;
- }
-
- if (threshold == 0) {
- ERR("Once after N policy threshold cannot be `0`.");
- goto error;
- }
-
- policy = lttng_rate_policy_once_after_n_create(threshold);
- if (!policy) {
- ERR("Failed to create policy once after `%s`.",
- fire_once_after_str);
- goto error;
- }
- }
-
- if (fire_every_str) {
- unsigned long long interval;
- if (utils_parse_unsigned_long_long(fire_every_str, &interval) !=
- 0) {
- ERR("Failed to parse `%s` as an integer.",
- fire_every_str);
- goto error;
- }
- if (interval == 0) {
- ERR("Every N policy interval cannot be `0`.");
- goto error;
- }
-
- policy = lttng_rate_policy_every_n_create(interval);
- if (!policy) {
- ERR("Failed to create policy every `%s`.",
- fire_every_str);
- goto error;
- }
- }
-
action = lttng_action_notify_create();
if (!action) {
ERR("Failed to create notify action");
error:
lttng_action_destroy(action);
action = NULL;
- free(error);
end:
- free(fire_once_after_str);
- free(fire_every_str);
+ free(error);
lttng_rate_policy_destroy(policy);
argpar_state_destroy(state);
argpar_item_destroy(item);
struct argpar_state *state = NULL;
struct argpar_item *item = NULL;
const char *session_name_arg = NULL;
- char *fire_once_after_str = NULL;
- char *fire_every_str = NULL;
char *error = NULL;
enum lttng_action_status action_status;
struct lttng_rate_policy *policy = NULL;
assert(set_rate_policy_cb);
const struct argpar_opt_descr rate_policy_opt_descrs[] = {
- { OPT_FIRE_ONCE_AFTER, '\0', "fire-once-after", true },
- { OPT_FIRE_EVERY, '\0', "fire-every", true },
+ { OPT_RATE_POLICY, '\0', "rate-policy", true },
ARGPAR_OPT_DESCR_SENTINEL
};
(const struct argpar_item_opt *) item;
switch (item_opt->descr->id) {
- case OPT_FIRE_ONCE_AFTER:
+ case OPT_RATE_POLICY:
{
- if (!assign_string(&fire_once_after_str,
- item_opt->arg,
- "--fire-once-after")) {
+ policy = parse_rate_policy(item_opt->arg);
+ if (!policy) {
goto error;
}
-
break;
}
- case OPT_FIRE_EVERY:
- {
- if (!assign_string(&fire_every_str,
- item_opt->arg,
- "--fire-every")) {
- goto error;
- }
-
- break;
- }
-
default:
abort();
}
goto error;
}
- if (fire_once_after_str && fire_every_str) {
- ERR("--fire-once and --fire-every are mutually exclusive.");
- goto error;
- }
-
- if (fire_once_after_str) {
- unsigned long long threshold;
-
- if (utils_parse_unsigned_long_long(
- fire_once_after_str, &threshold) != 0) {
- ERR("Failed to parse `%s` as an integer.",
- fire_once_after_str);
- goto error;
- }
-
- if (threshold == 0) {
- ERR("Once after N policy threshold cannot be `0`.");
- goto error;
- }
-
- policy = lttng_rate_policy_once_after_n_create(threshold);
- if (!policy) {
- ERR("Failed to create policy once after `%s`.",
- fire_once_after_str);
- goto error;
- }
- }
-
- if (fire_every_str) {
- unsigned long long interval;
- if (utils_parse_unsigned_long_long(fire_every_str, &interval) !=
- 0) {
- ERR("Failed to parse `%s` as an integer.",
- fire_every_str);
- goto error;
- }
- if (interval == 0) {
- ERR("Every N policy interval cannot be `0`.");
- goto error;
- }
-
- policy = lttng_rate_policy_every_n_create(interval);
- if (!policy) {
- ERR("Failed to create policy every `%s`.",
- fire_every_str);
- goto error;
- }
- }
-
action = create_action_cb();
if (!action) {
ERR("Failed to allocate %s session action.", action_name);
{ OPT_DATA_URL, '\0', "data-url", true },
{ OPT_URL, '\0', "url", true },
{ OPT_PATH, '\0', "path", true },
- { OPT_FIRE_ONCE_AFTER, '\0', "fire-once-after", true },
- { OPT_FIRE_EVERY, '\0', "fire-every", true },
+ { OPT_RATE_POLICY, '\0', "rate-policy", true },
ARGPAR_OPT_DESCR_SENTINEL
};
char *url_arg = NULL;
char *path_arg = NULL;
char *error = NULL;
- char *fire_once_after_str = NULL;
- char *fire_every_str = NULL;
enum lttng_action_status action_status;
struct lttng_snapshot_output *snapshot_output = NULL;
struct lttng_rate_policy *policy = NULL;
}
break;
- case OPT_FIRE_ONCE_AFTER:
+ case OPT_RATE_POLICY:
{
- if (!assign_string(&fire_once_after_str,
- item_opt->arg,
- "--fire-once-after")) {
+ policy = parse_rate_policy(item_opt->arg);
+ if (!policy) {
goto error;
}
-
break;
}
- case OPT_FIRE_EVERY:
- {
- if (!assign_string(&fire_every_str,
- item_opt->arg,
- "--fire-every")) {
- goto error;
- }
-
- break;
- }
-
default:
abort();
}
}
}
- /* Any rate policy ? */
- if (fire_once_after_str && fire_every_str) {
- ERR("--fire-once and --fire-every are mutually exclusive.");
- goto error;
- }
-
- if (fire_once_after_str) {
- unsigned long long threshold;
-
- if (utils_parse_unsigned_long_long(
- fire_once_after_str, &threshold) != 0) {
- ERR("Failed to parse `%s` as an integer.",
- fire_once_after_str);
- goto error;
- }
-
- if (threshold == 0) {
- ERR("Once after N policy threshold cannot be `0`.");
- goto error;
- }
-
- policy = lttng_rate_policy_once_after_n_create(threshold);
- if (!policy) {
- ERR("Failed to create policy once after `%s`.",
- fire_once_after_str);
- goto error;
- }
- }
-
- if (fire_every_str) {
- unsigned long long interval;
- if (utils_parse_unsigned_long_long(fire_every_str, &interval) !=
- 0) {
- ERR("Failed to parse `%s` as an integer.",
- fire_every_str);
- goto error;
- }
- if (interval == 0) {
- ERR("Every N policy interval cannot be `0`.");
- goto error;
- }
-
- policy = lttng_rate_policy_every_n_create(interval);
- if (!policy) {
- ERR("Failed to create policy every `%s`.",
- fire_every_str);
- goto error;
- }
- }
-
action = lttng_action_snapshot_session_create();
if (!action) {
ERR("Failed to allocate snapshot session action.");
};
static
-struct lttng_action *parse_action(int *argc, const char ***argv)
+struct lttng_action *parse_action(const char *action_name, int *argc, const char ***argv)
{
int i;
struct lttng_action *action;
- const char *action_name;
const struct action_descr *descr = NULL;
- if (*argc == 0) {
- ERR("Missing action name.");
- goto error;
- }
-
- action_name = (*argv)[0];
-
- (*argc)--;
- (*argv)++;
-
for (i = 0; i < ARRAY_SIZE(action_descrs); i++) {
if (strcmp(action_name, action_descrs[i].name) == 0) {
descr = &action_descrs[i];
struct argpar_opt_descr add_trigger_options[] = {
{ OPT_HELP, 'h', "help", false },
{ OPT_LIST_OPTIONS, '\0', "list-options", false },
- { OPT_CONDITION, '\0', "condition", false },
- { OPT_ACTION, '\0', "action", false },
- { OPT_ID, '\0', "id", true },
+ { OPT_CONDITION, '\0', "condition", true },
+ { OPT_ACTION, '\0', "action", true },
+ { OPT_NAME, '\0', "name", true },
{ OPT_USER_ID, '\0', "user-id", true },
ARGPAR_OPT_DESCR_SENTINEL,
};
struct lttng_action *action = NULL;
struct lttng_trigger *trigger = NULL;
char *error = NULL;
- char *id = NULL;
+ char *name = NULL;
int i;
char *user_id = NULL;
goto error;
}
- condition = parse_condition(&my_argc, &my_argv);
+ condition = parse_condition(item_opt->arg, &my_argc, &my_argv);
if (!condition) {
/*
* An error message was already printed by
}
case OPT_ACTION:
{
- action = parse_action(&my_argc, &my_argv);
+ action = parse_action(item_opt->arg, &my_argc, &my_argv);
if (!action) {
/*
* An error message was already printed by
break;
}
- case OPT_ID:
+ case OPT_NAME:
{
- if (!assign_string(&id, item_opt->arg, "--id")) {
+ if (!assign_string(&name, item_opt->arg, "--name")) {
goto error;
}
goto error;
}
- if (id) {
+ if (name) {
enum lttng_trigger_status trigger_status =
- lttng_trigger_set_name(trigger, id);
+ lttng_trigger_set_name(trigger, name);
if (trigger_status != LTTNG_TRIGGER_STATUS_OK) {
- ERR("Failed to set trigger id.");
+ ERR("Failed to set trigger name.");
goto error;
}
}
lttng_action_destroy(action);
lttng_trigger_destroy(trigger);
free(error);
- free(id);
+ free(name);
free(user_id);
return ret;
}
projects / lttng-tools.git / blobdiff