OPT_CONDITION,
OPT_ACTION,
OPT_ID,
- OPT_FIRE_ONCE_AFTER,
- OPT_FIRE_EVERY,
OPT_USER_ID,
+ OPT_RATE_POLICY,
OPT_ALL,
OPT_FILTER,
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:
- {
- if (!assign_string(&fire_once_after_str,
- item_opt->arg,
- "--fire-once-after")) {
- goto error;
- }
-
- break;
- }
- case OPT_FIRE_EVERY:
+ case OPT_RATE_POLICY:
{
- 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");
action = NULL;
free(error);
end:
- free(fire_once_after_str);
- free(fire_every_str);
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:
- {
- if (!assign_string(&fire_once_after_str,
- item_opt->arg,
- "--fire-once-after")) {
- goto error;
- }
-
- break;
- }
- case OPT_FIRE_EVERY:
+ case OPT_RATE_POLICY:
{
- 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();
}
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:
- {
- if (!assign_string(&fire_once_after_str,
- item_opt->arg,
- "--fire-once-after")) {
- goto error;
- }
-
- break;
- }
- case OPT_FIRE_EVERY:
+ case OPT_RATE_POLICY:
{
- 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();
}
}
}
- /* 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.");
# shellcheck source=../../../utils/utils.sh
source "$TESTDIR/utils/utils.sh"
-plan_tests 231
+plan_tests 234
FULL_LTTNG_BIN="${TESTDIR}/../src/bin/lttng/${LTTNG_BIN}"
--action notify
test_success "notify action polices" \
- --condition on-event -u test-fire-once-after \
+ --condition on-event -u test-rate-policy=once-after \
--action notify \
- --fire-every=55 \
+ --rate-policy=every:55 \
--action notify \
- --fire-once-after=55
+ --rate-policy=once-after:55
test_success "start session action polices" \
- --condition on-event -u test-fire-once-after \
+ --condition on-event -u test-rate-policy=once-after \
--action start-session my_session \
- --fire-every=55 \
+ --rate-policy=every:55 \
--action start-session my_session \
- --fire-once-after=55
+ --rate-policy=once-after:55
test_success "stop session action polices" \
- --condition on-event -u test-fire-once-after \
+ --condition on-event -u test-rate-policy=once-after \
--action stop-session my_session \
- --fire-every=55 \
+ --rate-policy=every:55 \
--action stop-session my_session \
- --fire-once-after=55
+ --rate-policy=once-after:55
test_success "snapshot session action polices" \
- --condition on-event -u test-fire-once-after \
+ --condition on-event -u test-rate-policy=once-after \
--action snapshot-session my_session \
- --fire-every=55 \
+ --rate-policy=every:55 \
--action snapshot-session my_session \
- --fire-once-after=55
+ --rate-policy=once-after:55
test_success "rotate session action polices" \
- --condition on-event -u test-fire-once-after \
+ --condition on-event -u test-rate-policy=once-after \
--action rotate-session my_session \
- --fire-every=55 \
+ --rate-policy=every:55 \
--action rotate-session my_session \
- --fire-once-after=55
+ --rate-policy=once-after:55
skip $ist_root "non-root user: skipping kprobe tests" 9 || {
test_success "--condition on-event probe by symbol" \
"Error: While parsing argument #1 (\`--id\`): Missing required argument for option \`--id\`" \
--id
-for cmd in fire-once-after fire-every; do
+for cmd in rate-policy=once-after rate-policy=every; do
test_failure "missing argument to --${cmd}" \
- "Error: While parsing argument #1 (\`--${cmd}\`): Missing required argument for option \`--${cmd}\`" \
+ "Error: Rate policy format is invalid." \
--condition on-event -u -a --action notify \
--${cmd}
test_failure "invalid argument to --${cmd}: non-digit character" \
- "Error: Failed to parse \`123bob\` as an integer." \
+ "Error: Failed to parse rate policy value \`123bob\` as an integer." \
--condition on-event -u -a --action notify \
- --${cmd} 123bob
+ --${cmd}:123bob
test_failure "invalid argument to --${cmd}: empty string" \
- "Error: Failed to parse \`\` as an integer." \
+ "Error: Failed to parse rate policy value \`\` as an integer." \
--condition on-event -u -a --action notify \
- --${cmd} ""
+ --${cmd}":"
done
+test_failure "invalid argument to --rate-policy: unknown policy type" \
+ "Error: Rate policy type \`bob\` unknown." \
+ --condition on-event -u -a --action notify \
+ --rate-policy=bob:123
+
# `--condition` failures
test_failure "missing args after --condition" \
"Error: Missing condition name." \
projects / lttng-tools.git / commitdiff
