#include <ctype.h>
#include <stdio.h>
+#include <string.h>
#include "../command.h"
#include "../loglevel.h"
OPT_CONDITION,
OPT_ACTION,
OPT_ID,
- OPT_USER_ID,
+ OPT_OWNER_UID,
OPT_RATE_POLICY,
- OPT_ALL,
+ OPT_NAME,
OPT_FILTER,
- OPT_EXCLUDE,
- 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_EXCLUDE_NAME,
+ OPT_EVENT_NAME,
+ OPT_LOG_LEVEL,
+
+ 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_LOGLEVEL, '\0', "loglevel", true },
- { OPT_LOGLEVEL_ONLY, '\0', "loglevel-only", 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_NAME, 'n', "name", true },
+ { OPT_EXCLUDE_NAME, 'x', "exclude-name", true },
+ { OPT_LOG_LEVEL, 'l', "log-level", true },
+ { OPT_EVENT_NAME, 'E', "event-name", true },
+
+ { 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 (strncmp(arg, "syscall", strlen("syscall")) == 0) {
+ /*
+ * Matches the following:
+ * - syscall
+ * - syscall:entry
+ * - syscall:exit
+ * - syscall:entry+exit
+ * - syscall:*
+ *
+ * Validation for the right side is left to further usage sites.
+ */
+ *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;
}
return ret;
}
-/* This is defined in enable_events.c. */
-LTTNG_HIDDEN
-int create_exclusion_list_and_validate(const char *event_name,
- const char *exclusions_arg,
- char ***exclusion_list);
+static bool parse_syscall_emission_site_from_type(const char *str,
+ enum lttng_event_rule_syscall_emission_site_type *type)
+{
+ bool ret = false;
+ if (strcmp(str, "syscall") == 0 ||
+ strcmp(str, "syscall:entry+exit") == 0) {
+ *type = LTTNG_EVENT_RULE_SYSCALL_EMISSION_SITE_ENTRY_EXIT;
+ } else if (strcmp(str, "syscall:entry") == 0) {
+ *type = LTTNG_EVENT_RULE_SYSCALL_EMISSION_SITE_ENTRY;
+ } else if (strcmp(str, "syscall:exit") == 0) {
+ *type = LTTNG_EVENT_RULE_SYSCALL_EMISSION_SITE_EXIT;
+ } else {
+ goto error;
+ }
+
+ ret = true;
+
+error:
+ return ret;
+}
/*
- * Parse `str` as a log level in domain `domain_type`. Return -1 if the string
- * is not recognized as a valid log level.
+ * Parse `str` as a log level in domain `domain_type`.
+ *
+ * Return the log level in `*log_level`. Return true in `*log_level_only` if
+ * the string specifies exactly this log level, false if it specifies at least
+ * this log level.
+ *
+ * Return true if the string was successfully parsed as a log level string.
*/
-static
-int parse_loglevel_string(const char *str, enum lttng_domain_type domain_type)
+static bool parse_log_level_string(const char *str,
+ enum lttng_domain_type domain_type,
+ int *log_level,
+ bool *log_level_only)
{
+ bool ret;
+
switch (domain_type) {
case LTTNG_DOMAIN_UST:
{
- enum lttng_loglevel loglevel;
- const int ret = loglevel_name_to_value(str, &loglevel);
+ enum lttng_loglevel log_level_min, log_level_max;
+ if (!loglevel_parse_range_string(
+ str, &log_level_min, &log_level_max)) {
+ goto error;
+ }
+
+ /* Only support VAL and VAL.. for now. */
+ if (log_level_min != log_level_max &&
+ log_level_max != LTTNG_LOGLEVEL_EMERG) {
+ goto error;
+ }
- return ret == -1 ? ret : (int) loglevel;
+ *log_level = (int) log_level_min;
+ *log_level_only = log_level_min == log_level_max;
+ break;
}
case LTTNG_DOMAIN_LOG4J:
{
- enum lttng_loglevel_log4j loglevel;
- const int ret = loglevel_log4j_name_to_value(str, &loglevel);
+ enum lttng_loglevel_log4j log_level_min, log_level_max;
+ if (!loglevel_log4j_parse_range_string(
+ str, &log_level_min, &log_level_max)) {
+ goto error;
+ }
- return ret == -1 ? ret : (int) loglevel;
+ /* Only support VAL and VAL.. for now. */
+ if (log_level_min != log_level_max &&
+ log_level_max != LTTNG_LOGLEVEL_LOG4J_FATAL) {
+ goto error;
+ }
+
+ *log_level = (int) log_level_min;
+ *log_level_only = log_level_min == log_level_max;
+ break;
}
case LTTNG_DOMAIN_JUL:
{
- enum lttng_loglevel_jul loglevel;
- const int ret = loglevel_jul_name_to_value(str, &loglevel);
+ enum lttng_loglevel_jul log_level_min, log_level_max;
+ if (!loglevel_jul_parse_range_string(
+ str, &log_level_min, &log_level_max)) {
+ goto error;
+ }
- return ret == -1 ? ret : (int) loglevel;
+ /* Only support VAL and VAL.. for now. */
+ if (log_level_min != log_level_max &&
+ log_level_max != LTTNG_LOGLEVEL_JUL_SEVERE) {
+ goto error;
+ }
+
+ *log_level = (int) log_level_min;
+ *log_level_only = log_level_min == log_level_max;
+ break;
}
case LTTNG_DOMAIN_PYTHON:
{
- enum lttng_loglevel_python loglevel;
- const int ret = loglevel_python_name_to_value(str, &loglevel);
+ enum lttng_loglevel_python log_level_min, log_level_max;
+ if (!loglevel_python_parse_range_string(
+ str, &log_level_min, &log_level_max)) {
+ goto error;
+ }
- return ret == -1 ? ret : (int) loglevel;
+ /* Only support VAL and VAL.. for now. */
+ if (log_level_min != log_level_max &&
+ log_level_max !=
+ LTTNG_LOGLEVEL_PYTHON_CRITICAL) {
+ goto error;
+ }
+
+ *log_level = (int) log_level_min;
+ *log_level_only = log_level_min == log_level_max;
+ break;
}
default:
/* Invalid domain type. */
abort();
}
+
+ ret = true;
+ goto end;
+
+error:
+ ret = false;
+
+end:
+ return ret;
}
static int parse_kernel_probe_opts(const char *source,
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;
+ /* Event rule type option */
+ char *event_rule_type_str = NULL;
- /* Tracepoint name (non-option argument). */
- const char *tracepoint_name = NULL;
+ /* Tracepoint and syscall options. */
+ char *name = NULL;
+ /* Array of strings. */
+ struct lttng_dynamic_pointer_array exclude_names;
- /* 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;
+ char *log_level_str = NULL;
lttng_dynamic_pointer_array_init(&res.capture_descriptors,
destroy_event_expr);
+
+ lttng_dynamic_pointer_array_init(&exclude_names, free);
+
state = argpar_state_create(*argc, *argv, event_rule_opt_descrs);
if (!state) {
ERR("Failed to allocate an argpar state.");
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)) {
- 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)) {
+ case OPT_DOMAIN:
+ if (!assign_domain_type(&domain_type,
+ item_opt->arg)) {
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)) {
- goto error;
- }
-
- if (!assign_string(&source, item_opt->arg, "source")) {
+ /* Save the string for later use. */
+ if (!assign_string(&event_rule_type_str,
+ item_opt->arg,
+ "--type/-t")) {
goto error;
}
break;
- case OPT_USERSPACE_PROBE:
- if (!assign_event_rule_type(&event_rule_type,
- LTTNG_EVENT_RULE_TYPE_USERSPACE_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_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_NAME:
+ {
+ int ret;
+
+ ret = lttng_dynamic_pointer_array_add_pointer(
+ &exclude_names,
+ strdup(item_opt->arg));
+ if (ret != 0) {
+ ERR("Failed to add pointer to dynamic pointer array.");
goto error;
}
break;
- case OPT_LOGLEVEL:
- case OPT_LOGLEVEL_ONLY:
- if (!assign_string(&loglevel_str, item_opt->arg,
- "--loglevel/--loglevel-only")) {
+ }
+ case OPT_LOG_LEVEL:
+ if (!assign_string(&log_level_str,
+ item_opt->arg, "--log-level/-l")) {
goto error;
}
- loglevel_only = item_opt->descr->id ==
- OPT_LOGLEVEL_ONLY;
break;
case OPT_CAPTURE:
{
(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 (lttng_dynamic_pointer_array_get_count(&exclude_names) > 0) {
+ ERR("Can't use --exclude-name/-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-name/-x was passed, split it into an exclusion list. */
+ if (lttng_dynamic_pointer_array_get_count(&exclude_names) > 0) {
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) {
- ERR("Failed to create exclusion list.");
+ if (validate_exclusion_list(name, &exclude_names) != 0) {
+ /*
+ * Assume validate_exclusion_list already prints an
+ * error message.
+ */
goto error;
}
}
- if (loglevel_str && event_rule_type != LTTNG_EVENT_RULE_TYPE_TRACEPOINT) {
- ERR("Log levels are only applicable to tracepoint event rules.");
- goto error;
+ if (log_level_str) {
+ if (event_rule_type != LTTNG_EVENT_RULE_TYPE_TRACEPOINT) {
+ ERR("Log levels are only applicable to tracepoint event rules.");
+ goto error;
+ }
+
+ if (domain_type == LTTNG_DOMAIN_KERNEL) {
+ ERR("Log levels are not supported by the kernel tracer.");
+ goto error;
+ }
}
/* Finally, create the event rule object. */
/* 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;
}
}
/* Set exclusion list. */
- if (exclusion_list) {
+ if (lttng_dynamic_pointer_array_get_count(&exclude_names) > 0) {
int n;
-
- for (n = 0; exclusion_list[n]; n++) {
- event_rule_status = lttng_event_rule_tracepoint_add_exclusion(
- res.er,
- exclusion_list[n]);
+ int count = lttng_dynamic_pointer_array_get_count(
+ &exclude_names);
+
+ for (n = 0; n < count; n++) {
+ const char *exclude_name =
+ lttng_dynamic_pointer_array_get_pointer(
+ &exclude_names,
+ n);
+
+ event_rule_status =
+ lttng_event_rule_tracepoint_add_exclusion(
+ res.er,
+ exclude_name);
if (event_rule_status !=
LTTNG_EVENT_RULE_STATUS_OK) {
ERR("Failed to set tracepoint exclusion list element '%s'",
- exclusion_list[n]);
+ exclude_name);
goto error;
}
}
}
- if (loglevel_str) {
- int loglevel;
-
- if (domain_type == LTTNG_DOMAIN_KERNEL) {
- ERR("Log levels are not supported by the kernel tracer.");
- goto error;
- }
-
- loglevel = parse_loglevel_string(
- loglevel_str, domain_type);
- if (loglevel < 0) {
- ERR("Failed to parse `%s` as a log level.",
- loglevel_str);
+ /*
+ * ".." is the same as passing no log level option and
+ * correspond the the "ANY" case.
+ */
+ if (log_level_str && strcmp(log_level_str, "..") != 0) {
+ int log_level;
+ bool log_level_only;
+
+ if (!parse_log_level_string(log_level_str, domain_type,
+ &log_level, &log_level_only)) {
+ ERR("Failed to parse log level string `%s`.",
+ log_level_str);
goto error;
}
- if (loglevel_only) {
- log_level_rule = lttng_log_level_rule_exactly_create(loglevel);
+ if (log_level_only) {
+ log_level_rule = lttng_log_level_rule_exactly_create(log_level);
} else {
- log_level_rule = lttng_log_level_rule_at_least_as_severe_as_create(loglevel);
+ log_level_rule = lttng_log_level_rule_at_least_as_severe_as_create(log_level);
}
if (log_level_rule == NULL) {
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;
}
case LTTNG_EVENT_RULE_TYPE_SYSCALL:
{
enum lttng_event_rule_status event_rule_status;
+ enum lttng_event_rule_syscall_emission_site_type emission_site_type;
- res.er = lttng_event_rule_syscall_create();
+ if (!parse_syscall_emission_site_from_type(
+ event_rule_type_str, &emission_site_type)) {
+ ERR("Failed to parse syscall type '%s'.", event_rule_type_str);
+ goto error;
+ }
+
+ res.er = lttng_event_rule_syscall_create(emission_site_type);
if (!res.er) {
ERR("Failed to create syscall event rule.");
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(loglevel_str);
- free(source);
- strutils_free_null_terminated_array_of_strings(exclusion_list);
+ free(name);
+ lttng_dynamic_pointer_array_reset(&exclude_names);
+ free(log_level_str);
+ free(location);
+ free(event_name);
+ free(event_rule_type_str);
+
lttng_kernel_probe_location_destroy(kernel_probe_location);
lttng_userspace_probe_location_destroy(userspace_probe_location);
lttng_log_level_rule_destroy(log_level_rule);
goto error;
}
- c = lttng_condition_on_event_create(res.er);
+ c = lttng_condition_event_rule_matches_create(res.er);
lttng_event_rule_destroy(res.er);
res.er = NULL;
if (!c) {
assert(expr);
assert(*expr);
- status = lttng_condition_on_event_append_capture_descriptor(
+ status = lttng_condition_event_rule_matches_append_capture_descriptor(
c, *expr);
if (status != LTTNG_CONDITION_STATUS_OK) {
if (status == LTTNG_CONDITION_STATUS_UNSUPPORTED) {
return c;
}
-static
-struct lttng_condition *handle_condition_session_consumed_size(int *argc, const char ***argv)
-{
- struct lttng_condition *cond = NULL;
- struct argpar_state *state = NULL;
- struct argpar_item *item = NULL;
- const char *threshold_arg = NULL;
- const char *session_name_arg = NULL;
- uint64_t threshold;
- char *error = NULL;
- enum lttng_condition_status condition_status;
-
- state = argpar_state_create(*argc, *argv, event_rule_opt_descrs);
- if (!state) {
- ERR("Failed to allocate an argpar state.");
- goto error;
- }
-
- while (true) {
- enum argpar_state_parse_next_status status;
-
- ARGPAR_ITEM_DESTROY_AND_RESET(item);
- status = argpar_state_parse_next(state, &item, &error);
- if (status == ARGPAR_STATE_PARSE_NEXT_STATUS_ERROR) {
- ERR("%s", error);
- goto error;
- } else if (status == ARGPAR_STATE_PARSE_NEXT_STATUS_ERROR_UNKNOWN_OPT) {
- /* Just stop parsing here. */
- break;
- } else if (status == ARGPAR_STATE_PARSE_NEXT_STATUS_END) {
- break;
- }
-
- assert(status == ARGPAR_STATE_PARSE_NEXT_STATUS_OK);
-
- if (item->type == ARGPAR_ITEM_TYPE_OPT) {
- const struct argpar_item_opt *item_opt =
- (const struct argpar_item_opt *) item;
-
- switch (item_opt->descr->id) {
- default:
- abort();
- }
- } else {
- const struct argpar_item_non_opt *item_non_opt;
-
- assert(item->type == ARGPAR_ITEM_TYPE_NON_OPT);
-
- item_non_opt = (const struct argpar_item_non_opt *) item;
-
- switch (item_non_opt->non_opt_index) {
- case 0:
- session_name_arg = item_non_opt->arg;
- break;
- case 1:
- threshold_arg = item_non_opt->arg;
- break;
- default:
- ERR("Unexpected argument `%s`.",
- item_non_opt->arg);
- goto error;
- }
- }
- }
-
- *argc -= argpar_state_get_ingested_orig_args(state);
- *argv += argpar_state_get_ingested_orig_args(state);
-
- if (!session_name_arg) {
- ERR("Missing session name argument.");
- goto error;
- }
-
- if (!threshold_arg) {
- ERR("Missing threshold argument.");
- goto error;
- }
-
- if (utils_parse_size_suffix(threshold_arg, &threshold) != 0) {
- ERR("Failed to parse `%s` as a size.", threshold_arg);
- goto error;
- }
-
- cond = lttng_condition_session_consumed_size_create();
- if (!cond) {
- ERR("Failed to allocate a session consumed size condition.");
- goto error;
- }
-
- condition_status = lttng_condition_session_consumed_size_set_session_name(
- cond, session_name_arg);
- if (condition_status != LTTNG_CONDITION_STATUS_OK) {
- ERR("Failed to set session consumed size condition's session name to '%s'.",
- session_name_arg);
- goto error;
- }
-
- condition_status = lttng_condition_session_consumed_size_set_threshold(
- cond, threshold);
- if (condition_status != LTTNG_CONDITION_STATUS_OK) {
- ERR("Failed to set session consumed size condition threshold.");
- goto error;
- }
-
- goto end;
-
-error:
- lttng_condition_destroy(cond);
- cond = NULL;
-
-end:
- argpar_state_destroy(state);
- argpar_item_destroy(item);
- free(error);
- return cond;
-}
-
-static
-struct lttng_condition *handle_condition_buffer_usage_high(int *argc, const char ***argv)
-{
- ERR("High buffer usage threshold conditions are unsupported for the moment.");
- return NULL;
-}
-
-static
-struct lttng_condition *handle_condition_buffer_usage_low(int *argc, const char ***argv)
-{
- ERR("Low buffer usage threshold conditions are unsupported for the moment.");
- return NULL;
-}
-
-static
-struct lttng_condition *handle_condition_session_rotation_ongoing(int *argc, const char ***argv)
-{
- ERR("Session rotation ongoing conditions are unsupported for the moment.");
- return NULL;
-}
-
-static
-struct lttng_condition *handle_condition_session_rotation_completed(int *argc, const char ***argv)
-{
- ERR("Session rotation completed conditions are unsupported for the moment.");
- return NULL;
-}
-
struct condition_descr {
const char *name;
struct lttng_condition *(*handler) (int *argc, const char ***argv);
static const
struct condition_descr condition_descrs[] = {
- { "on-event", 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 },
- { "on-session-rotation-ongoing", handle_condition_session_rotation_ongoing },
- { "on-session-rotation-completed", handle_condition_session_rotation_completed },
+ { "event-rule-matches", handle_condition_event },
};
static
static struct lttng_rate_policy *parse_rate_policy(const char *policy_str)
{
- int num_token;
- char **tokens = NULL;
+ int ret;
+ size_t num_token = 0;
+ struct lttng_dynamic_pointer_array tokens;
struct lttng_rate_policy *policy = NULL;
enum lttng_rate_policy_type policy_type;
unsigned long long value;
char *policy_value_str;
assert(policy_str);
+ lttng_dynamic_pointer_array_init(&tokens, NULL);
- /*
- * rate policy fields are separated by ':'.
- */
- tokens = strutils_split(policy_str, ':', 1);
- num_token = strutils_array_of_strings_len(tokens);
+ /* Rate policy fields are separated by ':'. */
+ ret = strutils_split(policy_str, ':', 1, &tokens);
+ if (ret == 0) {
+ num_token = lttng_dynamic_pointer_array_get_count(&tokens);
+ }
/*
* Early sanity check that the number of parameter is exactly 2.
goto end;
}
- policy_type_str = tokens[0];
- policy_value_str = tokens[1];
+ policy_type_str = lttng_dynamic_pointer_array_get_pointer(&tokens, 0);
+ policy_value_str = lttng_dynamic_pointer_array_get_pointer(&tokens, 1);
/* Parse the type. */
if (strcmp(policy_type_str, "once-after") == 0) {
}
end:
- strutils_free_null_terminated_array_of_strings(tokens);
+ lttng_dynamic_pointer_array_reset(&tokens);
return policy;
}
{ OPT_RATE_POLICY, '\0', "rate-policy", true },
ARGPAR_OPT_DESCR_SENTINEL
};
-
+
state = argpar_state_create(*argc, *argv, rate_policy_opt_descrs);
if (!state) {
ERR("Failed to allocate an argpar state.");
{ OPT_LIST_OPTIONS, '\0', "list-options", false },
{ OPT_CONDITION, '\0', "condition", true },
{ OPT_ACTION, '\0', "action", true },
- { OPT_ID, '\0', "id", true },
- { OPT_USER_ID, '\0', "user-id", true },
+ { OPT_NAME, '\0', "name", true },
+ { OPT_OWNER_UID, '\0', "owner-uid", true },
ARGPAR_OPT_DESCR_SENTINEL,
};
struct lttng_dynamic_pointer_array actions;
struct argpar_state *argpar_state = NULL;
struct argpar_item *argpar_item = NULL;
- struct lttng_action *action_group = NULL;
+ struct lttng_action *action_list = NULL;
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;
+ char *owner_uid = NULL;
+ enum lttng_error_code ret_code;
lttng_dynamic_pointer_array_init(&actions, lttng_actions_destructor);
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;
}
break;
}
- case OPT_USER_ID:
+ case OPT_OWNER_UID:
{
- if (!assign_string(&user_id, item_opt->arg,
- "--user-id")) {
+ if (!assign_string(&owner_uid, item_opt->arg,
+ "--owner-uid")) {
goto error;
}
goto error;
}
- action_group = lttng_action_group_create();
- if (!action_group) {
+ action_list = lttng_action_list_create();
+ if (!action_list) {
goto error;
}
action = lttng_dynamic_pointer_array_steal_pointer(&actions, i);
- status = lttng_action_group_add_action(action_group, action);
+ status = lttng_action_list_add_action(action_list, action);
if (status != LTTNG_ACTION_STATUS_OK) {
goto error;
}
/*
- * The `lttng_action_group_add_action()` takes a reference to
+ * The `lttng_action_list_add_action()` takes a reference to
* the action. We can destroy ours.
*/
lttng_action_destroy(action);
action = NULL;
}
- trigger = lttng_trigger_create(condition, action_group);
+ trigger = lttng_trigger_create(condition, action_list);
if (!trigger) {
goto error;
}
- if (id) {
- enum lttng_trigger_status trigger_status =
- lttng_trigger_set_name(trigger, id);
-
- if (trigger_status != LTTNG_TRIGGER_STATUS_OK) {
- ERR("Failed to set trigger id.");
- goto error;
- }
- }
-
- if (user_id) {
+ if (owner_uid) {
enum lttng_trigger_status trigger_status;
char *end;
long long uid;
errno = 0;
- uid = strtol(user_id, &end, 10);
- if (end == user_id || *end != '\0' || errno != 0) {
- ERR("Failed to parse `%s` as a user id.", user_id);
+ uid = strtol(owner_uid, &end, 10);
+ if (end == owner_uid || *end != '\0' || errno != 0) {
+ ERR("Failed to parse `%s` as a user id.", owner_uid);
}
trigger_status = lttng_trigger_set_owner_uid(trigger, uid);
}
}
- ret = lttng_register_trigger(trigger);
- if (ret) {
- ERR("Failed to register trigger: %s.", lttng_strerror(ret));
+ if (name) {
+ ret_code = lttng_register_trigger_with_name(trigger, name);
+ } else {
+ ret_code = lttng_register_trigger_with_automatic_name(trigger);
+ }
+
+ if (ret_code != LTTNG_OK) {
+ ERR("Failed to register trigger: %s.",
+ lttng_strerror(-ret_code));
goto error;
}
MSG("Trigger registered successfully.");
+ ret = 0;
goto end;
argpar_item_destroy(argpar_item);
lttng_dynamic_pointer_array_reset(&actions);
lttng_condition_destroy(condition);
- lttng_action_destroy(action_group);
+ lttng_action_destroy(action_list);
lttng_action_destroy(action);
lttng_trigger_destroy(trigger);
free(error);
- free(id);
- free(user_id);
+ free(name);
+ free(owner_uid);
return ret;
}