#include <ctype.h>
#include <stdio.h>
#include <string.h>
+#include <stdarg.h>
#include "../command.h"
#include "../loglevel.h"
#include "../uprobe.h"
#include "common/argpar/argpar.h"
+#include "common/argpar-utils/argpar-utils.h"
#include "common/dynamic-array.h"
+#include "common/mi-lttng.h"
#include "common/string-utils/string-utils.h"
#include "common/utils.h"
+#include <lttng/domain-internal.h>
/* For lttng_event_rule_type_str(). */
#include <lttng/event-rule/event-rule-internal.h>
#include <lttng/lttng.h>
OPT_EVENT_NAME,
OPT_LOG_LEVEL,
- OPT_DOMAIN,
OPT_TYPE,
OPT_LOCATION,
{ 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 },
};
static
-bool assign_domain_type(enum lttng_domain_type *dest, const char *arg)
+bool has_syscall_prefix(const char *arg)
{
- bool ret;
-
- 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;
+ bool matches = false;
+ const char kernel_syscall_type_opt_prefix[] = "kernel:syscall";
+ const size_t kernel_syscall_type_opt_prefix_len =
+ sizeof(kernel_syscall_type_opt_prefix) - 1;
+ const char syscall_type_opt_prefix[] = "syscall";
+ const size_t syscall_type_opt_prefix_len =
+ sizeof(syscall_type_opt_prefix) - 1;
+
+ if (strncmp(arg, syscall_type_opt_prefix,
+ syscall_type_opt_prefix_len) == 0) {
+ matches = true;
+ } else if (strncmp(arg, kernel_syscall_type_opt_prefix,
+ kernel_syscall_type_opt_prefix_len) == 0) {
+ matches = true;
} else {
- ERR("Invalid `--domain` value: %s", arg);
- goto error;
+ matches = false;
}
- ret = true;
- goto end;
-
-error:
- ret = false;
-
-end:
- return ret;
+ return matches;
}
static
goto error;
}
- if (strcmp(arg, "tracepoint") == 0 || strcmp(arg, "logging") == 0) {
- *dest = LTTNG_EVENT_RULE_TYPE_TRACEPOINT;
+ if (strcmp(arg, "user") == 0 || strcmp(arg, "user:tracepoint") == 0) {
+ *dest = LTTNG_EVENT_RULE_TYPE_USER_TRACEPOINT;
+ } else if (strcmp(arg, "kernel") == 0 ||
+ strcmp(arg, "kernel:tracepoint") == 0) {
+ *dest = LTTNG_EVENT_RULE_TYPE_KERNEL_TRACEPOINT;
+ } else if (strcmp(arg, "jul") == 0 || strcmp(arg, "jul:logging") == 0) {
+ *dest = LTTNG_EVENT_RULE_TYPE_JUL_LOGGING;
+ } else if (strcmp(arg, "log4j") == 0 ||
+ strcmp(arg, "log4j:logging") == 0) {
+ *dest = LTTNG_EVENT_RULE_TYPE_LOG4J_LOGGING;
+ } else if (strcmp(arg, "python") == 0 ||
+ strcmp(arg, "python:logging") == 0) {
+ *dest = LTTNG_EVENT_RULE_TYPE_PYTHON_LOGGING;
} 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) {
+ strcmp(arg, "kernel:kprobe") == 0) {
+ *dest = LTTNG_EVENT_RULE_TYPE_KERNEL_KPROBE;
+ } else if (strcmp(arg, "kernel:uprobe") == 0) {
+ *dest = LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE;
+ } else if (has_syscall_prefix(arg)) {
/*
* Matches the following:
* - syscall
* - syscall:exit
* - syscall:entry+exit
* - syscall:*
+ * - kernel:syscall
+ * - kernel:syscall:entry
+ * - kernel:syscall:exit
+ * - kernel:syscall:entry+exit
+ * - kernel:syscall:*
*
* Validation for the right side is left to further usage sites.
*/
- *dest = LTTNG_EVENT_RULE_TYPE_SYSCALL;
+ *dest = LTTNG_EVENT_RULE_TYPE_KERNEL_SYSCALL;
} else {
ERR("Invalid `--type` value: %s", arg);
goto error;
}
static bool parse_syscall_emission_site_from_type(const char *str,
- enum lttng_event_rule_syscall_emission_site_type *type)
+ enum lttng_event_rule_kernel_syscall_emission_site *type)
{
bool ret = false;
+ const char kernel_prefix[] = "kernel:";
+ const size_t kernel_prefix_len = sizeof(kernel_prefix) - 1;
+
+ /*
+ * If the passed string is of the form "kernel:syscall*", move the
+ * pointer passed "kernel:".
+ */
+ if (strncmp(str, kernel_prefix, kernel_prefix_len) == 0) {
+ str = &str[kernel_prefix_len];
+ }
+
if (strcmp(str, "syscall") == 0 ||
strcmp(str, "syscall:entry+exit") == 0) {
- *type = LTTNG_EVENT_RULE_SYSCALL_EMISSION_SITE_ENTRY_EXIT;
+ *type = LTTNG_EVENT_RULE_KERNEL_SYSCALL_EMISSION_SITE_ENTRY_EXIT;
} else if (strcmp(str, "syscall:entry") == 0) {
- *type = LTTNG_EVENT_RULE_SYSCALL_EMISSION_SITE_ENTRY;
+ *type = LTTNG_EVENT_RULE_KERNEL_SYSCALL_EMISSION_SITE_ENTRY;
} else if (strcmp(str, "syscall:exit") == 0) {
- *type = LTTNG_EVENT_RULE_SYSCALL_EMISSION_SITE_EXIT;
+ *type = LTTNG_EVENT_RULE_KERNEL_SYSCALL_EMISSION_SITE_EXIT;
} else {
goto error;
}
}
/*
- * Parse `str` as a log level in domain `domain_type`.
+ * Parse `str` as a log level against the passed event rule 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
* Return true if the string was successfully parsed as a log level string.
*/
static bool parse_log_level_string(const char *str,
- enum lttng_domain_type domain_type,
+ enum lttng_event_rule_type event_rule_type,
int *log_level,
bool *log_level_only)
{
bool ret;
- switch (domain_type) {
- case LTTNG_DOMAIN_UST:
+ switch (event_rule_type) {
+ case LTTNG_EVENT_RULE_TYPE_USER_TRACEPOINT:
{
enum lttng_loglevel log_level_min, log_level_max;
if (!loglevel_parse_range_string(
*log_level_only = log_level_min == log_level_max;
break;
}
- case LTTNG_DOMAIN_LOG4J:
+ case LTTNG_EVENT_RULE_TYPE_LOG4J_LOGGING:
{
enum lttng_loglevel_log4j log_level_min, log_level_max;
if (!loglevel_log4j_parse_range_string(
*log_level_only = log_level_min == log_level_max;
break;
}
- case LTTNG_DOMAIN_JUL:
+ case LTTNG_EVENT_RULE_TYPE_JUL_LOGGING:
{
enum lttng_loglevel_jul log_level_min, log_level_max;
if (!loglevel_jul_parse_range_string(
*log_level_only = log_level_min == log_level_max;
break;
}
- case LTTNG_DOMAIN_PYTHON:
+ case LTTNG_EVENT_RULE_TYPE_PYTHON_LOGGING:
{
enum lttng_loglevel_python log_level_min, log_level_max;
if (!loglevel_python_parse_range_string(
};
static
-struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
+struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv,
+ int argc_offset)
{
- enum lttng_domain_type domain_type = LTTNG_DOMAIN_NONE;
enum lttng_event_rule_type event_rule_type =
LTTNG_EVENT_RULE_TYPE_UNKNOWN;
- struct argpar_state *state;
- struct argpar_item *item = NULL;
- char *error = NULL;
+ struct argpar_iter *argpar_iter = NULL;
+ const struct argpar_item *argpar_item = NULL;
int consumed_args = -1;
struct lttng_kernel_probe_location *kernel_probe_location = NULL;
struct lttng_userspace_probe_location *userspace_probe_location = NULL;
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.");
+ argpar_iter = argpar_iter_create(*argc, *argv, event_rule_opt_descrs);
+ if (!argpar_iter) {
+ ERR("Failed to allocate an argpar iter.");
goto error;
}
while (true) {
- enum argpar_state_parse_next_status status;
+ enum parse_next_item_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);
+ status = parse_next_item(argpar_iter, &argpar_item,
+ argc_offset, *argv, false, NULL);
+ if (status == PARSE_NEXT_ITEM_STATUS_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) {
+ } else if (status == PARSE_NEXT_ITEM_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;
+ assert(status == PARSE_NEXT_ITEM_STATUS_OK);
- switch (item_opt->descr->id) {
- /* Domains. */
- case OPT_DOMAIN:
- if (!assign_domain_type(&domain_type,
- item_opt->arg)) {
- goto error;
- }
+ if (argpar_item_type(argpar_item) == ARGPAR_ITEM_TYPE_OPT) {
+ const struct argpar_opt_descr *descr =
+ argpar_item_opt_descr(argpar_item);
+ const char *arg = argpar_item_opt_arg(argpar_item);
- break;
+ switch (descr->id) {
case OPT_TYPE:
- if (!assign_event_rule_type(&event_rule_type,
- item_opt->arg)) {
+ if (!assign_event_rule_type(&event_rule_type, arg)) {
goto error;
}
/* Save the string for later use. */
- if (!assign_string(&event_rule_type_str,
- item_opt->arg,
- "--type/-t")) {
+ if (!assign_string(&event_rule_type_str, arg,
+ "--type/-t")) {
goto error;
}
break;
case OPT_LOCATION:
- if (!assign_string(&location,
- item_opt->arg,
+ if (!assign_string(&location, arg,
"--location/-L")) {
goto error;
}
break;
case OPT_EVENT_NAME:
- if (!assign_string(&event_name,
- item_opt->arg,
- "--event-name/-E")) {
+ if (!assign_string(&event_name, arg,
+ "--event-name/-E")) {
goto error;
}
break;
case OPT_FILTER:
- if (!assign_string(&filter, item_opt->arg,
- "--filter/-f")) {
+ if (!assign_string(&filter, arg,
+ "--filter/-f")) {
goto error;
}
break;
case OPT_NAME:
- if (!assign_string(&name, item_opt->arg,
- "--name/-n")) {
+ if (!assign_string(&name, arg,
+ "--name/-n")) {
goto error;
}
ret = lttng_dynamic_pointer_array_add_pointer(
&exclude_names,
- strdup(item_opt->arg));
+ strdup(arg));
if (ret != 0) {
ERR("Failed to add pointer to dynamic pointer array.");
goto error;
break;
}
case OPT_LOG_LEVEL:
- if (!assign_string(&log_level_str,
- item_opt->arg, "--log-level/-l")) {
+ if (!assign_string(&log_level_str, arg,
+ "--log-level/-l")) {
goto error;
}
case OPT_CAPTURE:
{
int ret;
- const char *capture_str = item_opt->arg;
ret = filter_parser_ctx_create_from_filter_expression(
- capture_str, &parser_ctx);
+ arg, &parser_ctx);
if (ret) {
- ERR("Failed to parse capture expression `%s`.",
- capture_str);
+ ERR("Failed to parse capture expression `%s`.", arg);
goto error;
}
event_expr = ir_op_root_to_event_expr(
- parser_ctx->ir_root,
- capture_str);
+ parser_ctx->ir_root, arg);
if (!event_expr) {
/*
* ir_op_root_to_event_expr has printed
abort();
}
} else {
- const struct argpar_item_non_opt *item_non_opt =
- (const struct argpar_item_non_opt *)
- item;
+ const char *arg = argpar_item_non_opt_arg(argpar_item);
/* Don't accept non-option arguments. */
- ERR("Unexpected argument '%s'", item_non_opt->arg);
+ ERR("Unexpected argument '%s'", arg);
goto error;
}
}
if (event_rule_type == LTTNG_EVENT_RULE_TYPE_UNKNOWN) {
- event_rule_type = LTTNG_EVENT_RULE_TYPE_TRACEPOINT;
+ ERR("Event rule requires a --type.");
+ goto error;
}
/*
- * Option --name is applicable to event rules of type tracepoint
- * and syscall. For tracepoint and syscall rules, if --name is
- * omitted, it is implicitly "*".
+ * Option --name is applicable to event rules of type kernel, user, jul,
+ * log4j,python and syscall. If --name is omitted, it is implicitly
+ * "*".
*/
switch (event_rule_type) {
- case LTTNG_EVENT_RULE_TYPE_TRACEPOINT:
- case LTTNG_EVENT_RULE_TYPE_SYSCALL:
+ case LTTNG_EVENT_RULE_TYPE_USER_TRACEPOINT:
+ case LTTNG_EVENT_RULE_TYPE_KERNEL_TRACEPOINT:
+ case LTTNG_EVENT_RULE_TYPE_JUL_LOGGING:
+ case LTTNG_EVENT_RULE_TYPE_LOG4J_LOGGING:
+ case LTTNG_EVENT_RULE_TYPE_PYTHON_LOGGING:
+ case LTTNG_EVENT_RULE_TYPE_KERNEL_SYSCALL:
if (!name) {
name = strdup("*");
}
* If omitted, it defaults to the location.
*/
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:
+ case LTTNG_EVENT_RULE_TYPE_KERNEL_KPROBE:
+ case LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE:
if (!location) {
ERR("Event rule of type %s requires a --location.",
lttng_event_rule_type_str(event_rule_type));
/*
* Update *argc and *argv so our caller can keep parsing what follows.
*/
- consumed_args = argpar_state_get_ingested_orig_args(state);
+ consumed_args = argpar_iter_ingested_orig_args(argpar_iter);
assert(consumed_args >= 0);
*argc -= consumed_args;
*argv += consumed_args;
- /* Need to specify a domain. */
- if (domain_type == LTTNG_DOMAIN_NONE) {
- ERR("Please specify a domain (--domain=(kernel,user,jul,log4j,python)).");
- goto error;
- }
-
- /* Validate event rule type against domain. */
- switch (event_rule_type) {
- case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE:
- case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION:
- case LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE:
- case LTTNG_EVENT_RULE_TYPE_SYSCALL:
- if (domain_type != LTTNG_DOMAIN_KERNEL) {
- ERR("Event type not available for user-space tracing.");
- goto error;
- }
- break;
-
- case LTTNG_EVENT_RULE_TYPE_TRACEPOINT:
- break;
-
- default:
- abort();
- }
-
/*
* Adding a filter to a probe, function or userspace-probe would be
* denied by the kernel tracer as it's not supported at the moment. We
* do an early check here to warn the user.
*/
- if (filter && domain_type == LTTNG_DOMAIN_KERNEL) {
+ if (filter) {
switch (event_rule_type) {
- case LTTNG_EVENT_RULE_TYPE_TRACEPOINT:
- case LTTNG_EVENT_RULE_TYPE_SYSCALL:
+ case LTTNG_EVENT_RULE_TYPE_USER_TRACEPOINT:
+ case LTTNG_EVENT_RULE_TYPE_KERNEL_TRACEPOINT:
+ case LTTNG_EVENT_RULE_TYPE_JUL_LOGGING:
+ case LTTNG_EVENT_RULE_TYPE_LOG4J_LOGGING:
+ case LTTNG_EVENT_RULE_TYPE_PYTHON_LOGGING:
+ case LTTNG_EVENT_RULE_TYPE_KERNEL_SYSCALL:
break;
default:
ERR("Filter expressions are not supported for %s event rules.",
}
}
- /* If --exclude-name/-x was passed, split it into an exclusion list. */
+ /*
+ * If --exclude-name/-x was passed, split it into an exclusion list.
+ * Exclusions are only supported by
+ * LTTNG_EVENT_RULE_TYPE_USER_TRACEPOINT for now.
+ */
if (lttng_dynamic_pointer_array_get_count(&exclude_names) > 0) {
- if (domain_type != LTTNG_DOMAIN_UST) {
+ if (event_rule_type != LTTNG_EVENT_RULE_TYPE_USER_TRACEPOINT) {
ERR("Event name exclusions are not yet implemented for %s event rules.",
- get_domain_str(domain_type));
+ lttng_event_rule_type_str(event_rule_type));
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;
- }
+ switch (event_rule_type) {
+ case LTTNG_EVENT_RULE_TYPE_USER_TRACEPOINT:
+ case LTTNG_EVENT_RULE_TYPE_JUL_LOGGING:
+ case LTTNG_EVENT_RULE_TYPE_LOG4J_LOGGING:
+ case LTTNG_EVENT_RULE_TYPE_PYTHON_LOGGING:
+ {
+ int log_level;
+ bool log_level_only;
- if (domain_type == LTTNG_DOMAIN_KERNEL) {
- ERR("Log levels are not supported by the kernel tracer.");
+ if (strcmp(log_level_str, "..") == 0) {
+ /*
+ * ".." is the same as passing no log level
+ * option and correspond to the "ANY" case.
+ */
+ break;
+ }
+
+ if (!parse_log_level_string(log_level_str, event_rule_type,
+ &log_level, &log_level_only)) {
+ ERR("Failed to parse log level string `%s`.",
+ log_level_str);
+ goto error;
+ }
+
+ 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(log_level);
+ }
+
+ if (log_level_rule == NULL) {
+ ERR("Failed to create log level rule object.");
+ goto error;
+ }
+ break;
+ }
+ default:
+ ERR("Log levels are not supported for %s event rules.",
+ lttng_event_rule_type_str(event_rule_type));
goto error;
}
}
/* Finally, create the event rule object. */
switch (event_rule_type) {
- case LTTNG_EVENT_RULE_TYPE_TRACEPOINT:
+ case LTTNG_EVENT_RULE_TYPE_USER_TRACEPOINT:
{
enum lttng_event_rule_status event_rule_status;
- res.er = lttng_event_rule_tracepoint_create(domain_type);
+ res.er = lttng_event_rule_user_tracepoint_create();
if (!res.er) {
- ERR("Failed to create tracepoint event rule.");
+ ERR("Failed to create user_tracepoint event rule.");
goto error;
}
/* Set pattern. */
- event_rule_status = lttng_event_rule_tracepoint_set_pattern(
+ event_rule_status = lttng_event_rule_user_tracepoint_set_name_pattern(
res.er, name);
if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
- ERR("Failed to set tracepoint event rule's pattern to '%s'.",
+ ERR("Failed to set user_tracepoint event rule's pattern to '%s'.",
name);
goto error;
}
/* Set filter. */
if (filter) {
- event_rule_status = lttng_event_rule_tracepoint_set_filter(
+ event_rule_status = lttng_event_rule_user_tracepoint_set_filter(
res.er, filter);
if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
- ERR("Failed to set tracepoint event rule's filter to '%s'.",
+ ERR("Failed to set user_tracepoint event rule's filter to '%s'.",
filter);
goto error;
}
n);
event_rule_status =
- lttng_event_rule_tracepoint_add_exclusion(
+ lttng_event_rule_user_tracepoint_add_name_pattern_exclusion(
res.er,
exclude_name);
if (event_rule_status !=
LTTNG_EVENT_RULE_STATUS_OK) {
- ERR("Failed to set tracepoint exclusion list element '%s'",
+ ERR("Failed to set user_tracepoint exclusion list element '%s'",
exclude_name);
goto error;
}
}
}
- /*
- * ".." 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 (log_level_rule) {
+ event_rule_status =
+ lttng_event_rule_user_tracepoint_set_log_level_rule(
+ res.er, log_level_rule);
- 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);
+ if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
+ ERR("Failed to set log level on event fule.");
goto error;
}
+ }
- 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(log_level);
+ break;
+ }
+ case LTTNG_EVENT_RULE_TYPE_KERNEL_TRACEPOINT:
+ {
+ enum lttng_event_rule_status event_rule_status;
+
+ res.er = lttng_event_rule_kernel_tracepoint_create();
+ if (!res.er) {
+ ERR("Failed to create kernel_tracepoint event rule.");
+ goto error;
+ }
+
+ /* Set pattern. */
+ event_rule_status = lttng_event_rule_kernel_tracepoint_set_name_pattern(
+ res.er, name);
+ if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
+ ERR("Failed to set kernel_tracepoint event rule's pattern to '%s'.",
+ name);
+ goto error;
+ }
+
+ /* Set filter. */
+ if (filter) {
+ event_rule_status = lttng_event_rule_kernel_tracepoint_set_filter(
+ res.er, filter);
+ if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
+ ERR("Failed to set kernel_tracepoint event rule's filter to '%s'.",
+ filter);
+ goto error;
}
+ }
+ break;
+ }
+ case LTTNG_EVENT_RULE_TYPE_JUL_LOGGING:
+ {
+ enum lttng_event_rule_status event_rule_status;
- if (log_level_rule == NULL) {
- ERR("Failed to create log level rule object.");
+ res.er = lttng_event_rule_jul_logging_create();
+ if (!res.er) {
+ ERR("Failed to create jul_logging event rule.");
+ goto error;
+ }
+
+ /* Set pattern. */
+ event_rule_status = lttng_event_rule_jul_logging_set_name_pattern(
+ res.er, name);
+ if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
+ ERR("Failed to set jul_logging event rule's pattern to '%s'.",
+ name);
+ goto error;
+ }
+
+ /* Set filter. */
+ if (filter) {
+ event_rule_status = lttng_event_rule_jul_logging_set_filter(
+ res.er, filter);
+ if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
+ ERR("Failed to set jul_logging event rule's filter to '%s'.",
+ filter);
goto error;
}
+ }
+ if (log_level_rule) {
event_rule_status =
- lttng_event_rule_tracepoint_set_log_level_rule(
+ lttng_event_rule_jul_logging_set_log_level_rule(
res.er, log_level_rule);
if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
goto error;
}
}
+ break;
+ }
+ case LTTNG_EVENT_RULE_TYPE_LOG4J_LOGGING:
+ {
+ enum lttng_event_rule_status event_rule_status;
+
+ res.er = lttng_event_rule_log4j_logging_create();
+ if (!res.er) {
+ ERR("Failed to create jul_logging event rule.");
+ goto error;
+ }
+
+ /* Set pattern. */
+ event_rule_status = lttng_event_rule_log4j_logging_set_name_pattern(
+ res.er, name);
+ if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
+ ERR("Failed to set jul_logging event rule's pattern to '%s'.",
+ name);
+ goto error;
+ }
+
+ /* Set filter. */
+ if (filter) {
+ event_rule_status = lttng_event_rule_log4j_logging_set_filter(
+ res.er, filter);
+ if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
+ ERR("Failed to set jul_logging event rule's filter to '%s'.",
+ filter);
+ goto error;
+ }
+ }
+
+ if (log_level_rule) {
+ event_rule_status =
+ lttng_event_rule_log4j_logging_set_log_level_rule(
+ res.er, log_level_rule);
+ if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
+ ERR("Failed to set log level on event fule.");
+ goto error;
+ }
+ }
break;
}
- case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE:
+ case LTTNG_EVENT_RULE_TYPE_PYTHON_LOGGING:
+ {
+ enum lttng_event_rule_status event_rule_status;
+
+ res.er = lttng_event_rule_python_logging_create();
+ if (!res.er) {
+ ERR("Failed to create jul_logging event rule.");
+ goto error;
+ }
+
+ /* Set pattern. */
+ event_rule_status = lttng_event_rule_python_logging_set_name_pattern(
+ res.er, name);
+ if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
+ ERR("Failed to set jul_logging event rule's pattern to '%s'.",
+ name);
+ goto error;
+ }
+
+ /* Set filter. */
+ if (filter) {
+ event_rule_status = lttng_event_rule_python_logging_set_filter(
+ res.er, filter);
+ if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
+ ERR("Failed to set jul_logging event rule's filter to '%s'.",
+ filter);
+ goto error;
+ }
+ }
+
+ if (log_level_rule) {
+ event_rule_status =
+ lttng_event_rule_python_logging_set_log_level_rule(
+ res.er, log_level_rule);
+
+ if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
+ ERR("Failed to set log level on event fule.");
+ goto error;
+ }
+ }
+ break;
+ }
+ case LTTNG_EVENT_RULE_TYPE_KERNEL_KPROBE:
{
int ret;
enum lttng_event_rule_status event_rule_status;
}
assert(kernel_probe_location);
- res.er = lttng_event_rule_kernel_probe_create(kernel_probe_location);
+ res.er = lttng_event_rule_kernel_kprobe_create(kernel_probe_location);
if (!res.er) {
ERR("Failed to create kprobe event rule.");
goto error;
}
event_rule_status =
- lttng_event_rule_kernel_probe_set_event_name(
+ lttng_event_rule_kernel_kprobe_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'.",
break;
}
- case LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE:
+ case LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE:
{
int ret;
enum lttng_event_rule_status event_rule_status;
goto error;
}
- res.er = lttng_event_rule_userspace_probe_create(userspace_probe_location);
+ res.er = lttng_event_rule_kernel_uprobe_create(userspace_probe_location);
if (!res.er) {
ERR("Failed to create userspace probe event rule.");
goto error;
}
event_rule_status =
- lttng_event_rule_userspace_probe_set_event_name(
+ lttng_event_rule_kernel_uprobe_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'.",
break;
}
- case LTTNG_EVENT_RULE_TYPE_SYSCALL:
+ case LTTNG_EVENT_RULE_TYPE_KERNEL_SYSCALL:
{
enum lttng_event_rule_status event_rule_status;
- enum lttng_event_rule_syscall_emission_site_type emission_site_type;
+ enum lttng_event_rule_kernel_syscall_emission_site emission_site;
if (!parse_syscall_emission_site_from_type(
- event_rule_type_str, &emission_site_type)) {
+ event_rule_type_str, &emission_site)) {
ERR("Failed to parse syscall type '%s'.", event_rule_type_str);
goto error;
}
- res.er = lttng_event_rule_syscall_create(emission_site_type);
+ res.er = lttng_event_rule_kernel_syscall_create(emission_site);
if (!res.er) {
ERR("Failed to create syscall event rule.");
goto error;
}
- event_rule_status = lttng_event_rule_syscall_set_pattern(
+ event_rule_status = lttng_event_rule_kernel_syscall_set_name_pattern(
res.er, name);
if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
ERR("Failed to set syscall event rule's pattern to '%s'.",
}
if (filter) {
- event_rule_status = lttng_event_rule_syscall_set_filter(
+ event_rule_status = lttng_event_rule_kernel_syscall_set_filter(
res.er, filter);
if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
ERR("Failed to set syscall event rule's filter to '%s'.",
}
lttng_event_expr_destroy(event_expr);
- argpar_item_destroy(item);
- free(error);
- argpar_state_destroy(state);
+ argpar_item_destroy(argpar_item);
+ argpar_iter_destroy(argpar_iter);
free(filter);
free(name);
lttng_dynamic_pointer_array_reset(&exclude_names);
}
static
-struct lttng_condition *handle_condition_event(int *argc, const char ***argv)
+struct lttng_condition *handle_condition_event(int *argc, const char ***argv,
+ int argc_offset)
{
struct parse_event_rule_res res;
struct lttng_condition *c;
size_t i;
- res = parse_event_rule(argc, argv);
+ res = parse_event_rule(argc, argv, argc_offset);
if (!res.er) {
c = NULL;
goto error;
struct condition_descr {
const char *name;
- struct lttng_condition *(*handler) (int *argc, const char ***argv);
+ struct lttng_condition *(*handler) (int *argc, const char ***argv,
+ int argc_offset);
};
static const
static
struct lttng_condition *parse_condition(const char *condition_name, int *argc,
- const char ***argv)
+ const char ***argv, int argc_offset, int orig_arg_index,
+ const char *orig_arg)
{
int i;
struct lttng_condition *cond;
}
if (!descr) {
- ERR("Unknown condition name '%s'", condition_name);
+ ERR(WHILE_PARSING_ARG_N_ARG_FMT "Unknown condition name '%s'",
+ orig_arg_index + 1, orig_arg, condition_name);
goto error;
}
- cond = descr->handler(argc, argv);
+ cond = descr->handler(argc, argv, argc_offset);
if (!cond) {
/* The handler has already printed an error message. */
goto error;
};
static
-struct lttng_action *handle_action_notify(int *argc, const char ***argv)
+struct lttng_action *handle_action_notify(int *argc, const char ***argv,
+ int argc_offset)
{
struct lttng_action *action = NULL;
- struct argpar_state *state = NULL;
- struct argpar_item *item = NULL;
- char *error = NULL;
+ struct argpar_iter *argpar_iter = NULL;
+ const struct argpar_item *argpar_item = NULL;
struct lttng_rate_policy *policy = NULL;
- state = argpar_state_create(*argc, *argv, notify_action_opt_descrs);
- if (!state) {
- ERR("Failed to allocate an argpar state.");
+ argpar_iter = argpar_iter_create(*argc, *argv, notify_action_opt_descrs);
+ if (!argpar_iter) {
+ ERR("Failed to allocate an argpar iter.");
goto error;
}
while (true) {
- enum argpar_state_parse_next_status status;
+ enum parse_next_item_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);
+ status = parse_next_item(argpar_iter, &argpar_item,
+ argc_offset, *argv, false,
+ "While parsing `notify` action:");
+ if (status == PARSE_NEXT_ITEM_STATUS_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) {
+ } else if (status == PARSE_NEXT_ITEM_STATUS_END) {
break;
}
- assert(status == ARGPAR_STATE_PARSE_NEXT_STATUS_OK);
+ assert(status == PARSE_NEXT_ITEM_STATUS_OK);
- if (item->type == ARGPAR_ITEM_TYPE_OPT) {
- const struct argpar_item_opt *item_opt =
- (const struct argpar_item_opt *) item;
+ if (argpar_item_type(argpar_item) == ARGPAR_ITEM_TYPE_OPT) {
+ const struct argpar_opt_descr *descr =
+ argpar_item_opt_descr(argpar_item);
+ const char *arg = argpar_item_opt_arg(argpar_item);
- switch (item_opt->descr->id) {
+ switch (descr->id) {
case OPT_RATE_POLICY:
{
- policy = parse_rate_policy(item_opt->arg);
+ policy = parse_rate_policy(arg);
if (!policy) {
goto error;
}
abort();
}
} else {
- const struct argpar_item_non_opt *item_non_opt;
+ const char *arg = argpar_item_non_opt_arg(argpar_item);
- 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) {
- default:
- ERR("Unexpected argument `%s`.",
- item_non_opt->arg);
- goto error;
- }
+ ERR("Unexpected argument `%s`.", arg);
+ goto error;
}
}
- *argc -= argpar_state_get_ingested_orig_args(state);
- *argv += argpar_state_get_ingested_orig_args(state);
+ *argc -= argpar_iter_ingested_orig_args(argpar_iter);
+ *argv += argpar_iter_ingested_orig_args(argpar_iter);
action = lttng_action_notify_create();
if (!action) {
lttng_action_destroy(action);
action = NULL;
end:
- free(error);
lttng_rate_policy_destroy(policy);
- argpar_state_destroy(state);
- argpar_item_destroy(item);
+ argpar_item_destroy(argpar_item);
+ argpar_iter_destroy(argpar_iter);
return action;
}
static struct lttng_action *handle_action_simple_session_with_policy(int *argc,
const char ***argv,
+ int argc_offset,
struct lttng_action *(*create_action_cb)(void),
enum lttng_action_status (*set_session_name_cb)(
struct lttng_action *, const char *),
const char *action_name)
{
struct lttng_action *action = NULL;
- struct argpar_state *state = NULL;
- struct argpar_item *item = NULL;
+ struct argpar_iter *argpar_iter = NULL;
+ const struct argpar_item *argpar_item = NULL;
const char *session_name_arg = NULL;
- char *error = NULL;
enum lttng_action_status action_status;
struct lttng_rate_policy *policy = NULL;
ARGPAR_OPT_DESCR_SENTINEL
};
- state = argpar_state_create(*argc, *argv, rate_policy_opt_descrs);
- if (!state) {
- ERR("Failed to allocate an argpar state.");
+ argpar_iter = argpar_iter_create(*argc, *argv, rate_policy_opt_descrs);
+ if (!argpar_iter) {
+ ERR("Failed to allocate an argpar iter.");
goto error;
}
while (true) {
- enum argpar_state_parse_next_status status;
+ enum parse_next_item_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);
+ status = parse_next_item(argpar_iter, &argpar_item, argc_offset,
+ *argv, false,
+ "While parsing `%s` action:", action_name);
+ if (status == PARSE_NEXT_ITEM_STATUS_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) {
+ } else if (status == PARSE_NEXT_ITEM_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;
+ assert(status == PARSE_NEXT_ITEM_STATUS_OK);
- switch (item_opt->descr->id) {
+ if (argpar_item_type(argpar_item) == ARGPAR_ITEM_TYPE_OPT) {
+ const struct argpar_opt_descr *descr =
+ argpar_item_opt_descr(argpar_item);
+ const char *arg = argpar_item_opt_arg(argpar_item);
+
+ switch (descr->id) {
case OPT_RATE_POLICY:
{
- policy = parse_rate_policy(item_opt->arg);
+ policy = parse_rate_policy(arg);
if (!policy) {
goto error;
}
abort();
}
} else {
- const struct argpar_item_non_opt *item_non_opt;
- item_non_opt = (const struct argpar_item_non_opt *) item;
+ const char *arg = argpar_item_non_opt_arg(argpar_item);
+ unsigned int idx = argpar_item_non_opt_non_opt_index(argpar_item);
- switch (item_non_opt->non_opt_index) {
+ switch (idx) {
case 0:
- session_name_arg = item_non_opt->arg;
+ session_name_arg = arg;
break;
default:
- ERR("Unexpected argument `%s`.",
- item_non_opt->arg);
+ ERR("Unexpected argument `%s`.", arg);
goto error;
}
}
}
- *argc -= argpar_state_get_ingested_orig_args(state);
- *argv += argpar_state_get_ingested_orig_args(state);
+ *argc -= argpar_iter_ingested_orig_args(argpar_iter);
+ *argv += argpar_iter_ingested_orig_args(argpar_iter);
if (!session_name_arg) {
ERR("Missing session name.");
error:
lttng_action_destroy(action);
action = NULL;
- argpar_item_destroy(item);
+
end:
lttng_rate_policy_destroy(policy);
- free(error);
- argpar_state_destroy(state);
+ argpar_item_destroy(argpar_item);
+ argpar_iter_destroy(argpar_iter);
return action;
}
static
struct lttng_action *handle_action_start_session(int *argc,
- const char ***argv)
+ const char ***argv, int argc_offset)
{
return handle_action_simple_session_with_policy(argc, argv,
+ argc_offset,
lttng_action_start_session_create,
lttng_action_start_session_set_session_name,
lttng_action_start_session_set_rate_policy, "start");
static
struct lttng_action *handle_action_stop_session(int *argc,
- const char ***argv)
+ const char ***argv, int argc_offset)
{
return handle_action_simple_session_with_policy(argc, argv,
+ argc_offset,
lttng_action_stop_session_create,
lttng_action_stop_session_set_session_name,
lttng_action_stop_session_set_rate_policy, "stop");
static
struct lttng_action *handle_action_rotate_session(int *argc,
- const char ***argv)
+ const char ***argv, int argc_offset)
{
return handle_action_simple_session_with_policy(argc, argv,
+ argc_offset,
lttng_action_rotate_session_create,
lttng_action_rotate_session_set_session_name,
lttng_action_rotate_session_set_rate_policy,
static
struct lttng_action *handle_action_snapshot_session(int *argc,
- const char ***argv)
+ const char ***argv, int argc_offset)
{
struct lttng_action *action = NULL;
- struct argpar_state *state = NULL;
- struct argpar_item *item = NULL;
+ struct argpar_iter *argpar_iter = NULL;
+ const struct argpar_item *argpar_item = NULL;
const char *session_name_arg = NULL;
char *snapshot_name_arg = NULL;
char *ctrl_url_arg = NULL;
int ret;
unsigned int locations_specified = 0;
- state = argpar_state_create(*argc, *argv, snapshot_action_opt_descrs);
- if (!state) {
- ERR("Failed to allocate an argpar state.");
+ argpar_iter = argpar_iter_create(*argc, *argv, snapshot_action_opt_descrs);
+ if (!argpar_iter) {
+ ERR("Failed to allocate an argpar iter.");
goto error;
}
while (true) {
- enum argpar_state_parse_next_status status;
+ enum parse_next_item_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);
+ status = parse_next_item(argpar_iter, &argpar_item, argc_offset,
+ *argv, false, "While parsing `snapshot` action:");
+ if (status == PARSE_NEXT_ITEM_STATUS_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) {
+ } else if (status == PARSE_NEXT_ITEM_STATUS_END) {
break;
}
- assert(status == ARGPAR_STATE_PARSE_NEXT_STATUS_OK);
+ assert(status == PARSE_NEXT_ITEM_STATUS_OK);
- if (item->type == ARGPAR_ITEM_TYPE_OPT) {
- const struct argpar_item_opt *item_opt =
- (const struct argpar_item_opt *) item;
+ if (argpar_item_type(argpar_item) == ARGPAR_ITEM_TYPE_OPT) {
+ const struct argpar_opt_descr *descr =
+ argpar_item_opt_descr(argpar_item);
+ const char *arg = argpar_item_opt_arg(argpar_item);
- switch (item_opt->descr->id) {
+ switch (descr->id) {
case OPT_NAME:
- if (!assign_string(&snapshot_name_arg, item_opt->arg, "--name/-n")) {
+ if (!assign_string(&snapshot_name_arg, arg, "--name/-n")) {
goto error;
}
break;
case OPT_MAX_SIZE:
- if (!assign_string(&max_size_arg, item_opt->arg, "--max-size/-m")) {
+ if (!assign_string(&max_size_arg, arg, "--max-size/-m")) {
goto error;
}
break;
case OPT_CTRL_URL:
- if (!assign_string(&ctrl_url_arg, item_opt->arg, "--ctrl-url")) {
+ if (!assign_string(&ctrl_url_arg, arg, "--ctrl-url")) {
goto error;
}
break;
case OPT_DATA_URL:
- if (!assign_string(&data_url_arg, item_opt->arg, "--data-url")) {
+ if (!assign_string(&data_url_arg, arg, "--data-url")) {
goto error;
}
break;
case OPT_URL:
- if (!assign_string(&url_arg, item_opt->arg, "--url")) {
+ if (!assign_string(&url_arg, arg, "--url")) {
goto error;
}
break;
case OPT_PATH:
- if (!assign_string(&path_arg, item_opt->arg, "--path")) {
+ if (!assign_string(&path_arg, arg, "--path")) {
goto error;
}
break;
case OPT_RATE_POLICY:
{
- policy = parse_rate_policy(item_opt->arg);
+ policy = parse_rate_policy(arg);
if (!policy) {
goto error;
}
abort();
}
} else {
- const struct argpar_item_non_opt *item_non_opt;
-
- assert(item->type == ARGPAR_ITEM_TYPE_NON_OPT);
+ const char *arg = argpar_item_non_opt_arg(argpar_item);
+ unsigned int idx = argpar_item_non_opt_non_opt_index(argpar_item);
- item_non_opt = (const struct argpar_item_non_opt *) item;
-
- switch (item_non_opt->non_opt_index) {
+ switch (idx) {
case 0:
- session_name_arg = item_non_opt->arg;
+ session_name_arg = arg;
break;
default:
- ERR("Unexpected argument `%s`.",
- item_non_opt->arg);
+ ERR("Unexpected argument `%s`.", arg);
goto error;
}
}
}
- *argc -= argpar_state_get_ingested_orig_args(state);
- *argv += argpar_state_get_ingested_orig_args(state);
+ *argc -= argpar_iter_ingested_orig_args(argpar_iter);
+ *argv += argpar_iter_ingested_orig_args(argpar_iter);
if (!session_name_arg) {
ERR("Missing session name.");
free(snapshot_output);
free(max_size_arg);
lttng_rate_policy_destroy(policy);
- argpar_state_destroy(state);
- argpar_item_destroy(item);
+ argpar_item_destroy(argpar_item);
+ argpar_iter_destroy(argpar_iter);
return action;
}
struct action_descr {
const char *name;
- struct lttng_action *(*handler) (int *argc, const char ***argv);
+ struct lttng_action *(*handler) (int *argc, const char ***argv,
+ int argc_offset);
};
static const
};
static
-struct lttng_action *parse_action(const char *action_name, int *argc, const char ***argv)
+struct lttng_action *parse_action(const char *action_name, int *argc,
+ const char ***argv, int argc_offset, int orig_arg_index,
+ const char *orig_arg)
{
int i;
struct lttng_action *action;
}
if (!descr) {
- ERR("Unknown action name: %s", action_name);
+ ERR(WHILE_PARSING_ARG_N_ARG_FMT "Unknown action name: %s",
+ orig_arg_index + 1, orig_arg, action_name);
goto error;
}
- action = descr->handler(argc, argv);
+ action = descr->handler(argc, argv, argc_offset);
if (!action) {
/* The handler has already printed an error message. */
goto error;
const char **my_argv = argv + 1;
struct lttng_condition *condition = NULL;
struct lttng_dynamic_pointer_array actions;
- struct argpar_state *argpar_state = NULL;
- struct argpar_item *argpar_item = NULL;
+ struct argpar_iter *argpar_iter = NULL;
+ const struct argpar_item *argpar_item = NULL;
struct lttng_action *action_list = NULL;
struct lttng_action *action = NULL;
struct lttng_trigger *trigger = NULL;
- char *error = NULL;
char *name = NULL;
int i;
char *owner_uid = NULL;
enum lttng_error_code ret_code;
+ struct mi_writer *mi_writer = NULL;
lttng_dynamic_pointer_array_init(&actions, lttng_actions_destructor);
+ if (lttng_opt_mi) {
+ mi_writer = mi_lttng_writer_create(
+ fileno(stdout), lttng_opt_mi);
+ if (!mi_writer) {
+ ret = CMD_ERROR;
+ goto error;
+ }
+
+ /* Open command element. */
+ ret = mi_lttng_writer_command_open(mi_writer,
+ mi_lttng_element_command_add_trigger);
+ if (ret) {
+ ret = CMD_ERROR;
+ goto error;
+ }
+
+ /* Open output element. */
+ ret = mi_lttng_writer_open_element(
+ mi_writer, mi_lttng_element_command_output);
+ if (ret) {
+ ret = CMD_ERROR;
+ goto error;
+ }
+ }
+
while (true) {
- enum argpar_state_parse_next_status status;
- const struct argpar_item_opt *item_opt;
+ enum parse_next_item_status status;
int ingested_args;
+ const struct argpar_opt_descr *descr;
+ const char *arg;
- argpar_state_destroy(argpar_state);
- argpar_state = argpar_state_create(my_argc, my_argv,
+ argpar_iter_destroy(argpar_iter);
+ argpar_iter = argpar_iter_create(my_argc, my_argv,
add_trigger_options);
- if (!argpar_state) {
- ERR("Failed to create argpar state.");
+ if (!argpar_iter) {
+ ERR("Failed to create argpar iter.");
goto error;
}
- ARGPAR_ITEM_DESTROY_AND_RESET(argpar_item);
- status = argpar_state_parse_next(argpar_state, &argpar_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) {
- ERR("%s", error);
+ status = parse_next_item(argpar_iter, &argpar_item,
+ argc - my_argc, my_argv, true, NULL);
+ if (status == PARSE_NEXT_ITEM_STATUS_ERROR) {
goto error;
- } else if (status == ARGPAR_STATE_PARSE_NEXT_STATUS_END) {
+ } else if (status == PARSE_NEXT_ITEM_STATUS_END) {
break;
}
- assert(status == ARGPAR_STATE_PARSE_NEXT_STATUS_OK);
+ assert(status == PARSE_NEXT_ITEM_STATUS_OK);
- if (argpar_item->type == ARGPAR_ITEM_TYPE_NON_OPT) {
- const struct argpar_item_non_opt *item_non_opt =
- (const struct argpar_item_non_opt *)
- argpar_item;
-
- ERR("Unexpected argument `%s`.", item_non_opt->arg);
+ if (argpar_item_type(argpar_item) == ARGPAR_ITEM_TYPE_NON_OPT) {
+ ERR("Unexpected argument `%s`.",
+ argpar_item_non_opt_arg(argpar_item));
goto error;
}
- item_opt = (const struct argpar_item_opt *) argpar_item;
-
- ingested_args = argpar_state_get_ingested_orig_args(
- argpar_state);
+ ingested_args = argpar_iter_ingested_orig_args(argpar_iter);
my_argc -= ingested_args;
my_argv += ingested_args;
- switch (item_opt->descr->id) {
+ descr = argpar_item_opt_descr(argpar_item);
+ arg = argpar_item_opt_arg(argpar_item);
+
+ switch (descr->id) {
case OPT_HELP:
SHOW_HELP();
ret = 0;
goto error;
}
- condition = parse_condition(item_opt->arg, &my_argc, &my_argv);
+ condition = parse_condition(arg, &my_argc, &my_argv,
+ argc - my_argc, argc - my_argc - ingested_args,
+ my_argv[-ingested_args]);
if (!condition) {
/*
* An error message was already printed by
}
case OPT_ACTION:
{
- action = parse_action(item_opt->arg, &my_argc, &my_argv);
+ action = parse_action(arg, &my_argc, &my_argv,
+ argc - my_argc, argc - my_argc - ingested_args,
+ my_argv[-ingested_args]);
if (!action) {
/*
* An error message was already printed by
goto error;
}
- /* Ownership of the action was transferred to the group. */
+ /* Ownership of the action was transferred to the list. */
action = NULL;
break;
}
case OPT_NAME:
{
- if (!assign_string(&name, item_opt->arg, "--name")) {
+ if (!assign_string(&name, arg, "--name")) {
goto error;
}
}
case OPT_OWNER_UID:
{
- if (!assign_string(&owner_uid, item_opt->arg,
+ if (!assign_string(&owner_uid, arg,
"--owner-uid")) {
goto error;
}
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);
+ goto error;
}
trigger_status = lttng_trigger_set_owner_uid(trigger, uid);
goto error;
}
- MSG("Trigger registered successfully.");
+ if (lttng_opt_mi) {
+ ret_code = lttng_trigger_mi_serialize(trigger, mi_writer, NULL);
+ if (ret_code != LTTNG_OK) {
+ goto error;
+ }
+ } else {
+ const char *returned_trigger_name;
+ const enum lttng_trigger_status trigger_status =
+ lttng_trigger_get_name(trigger,
+ &returned_trigger_name);
+
+ if (trigger_status != LTTNG_TRIGGER_STATUS_OK) {
+ WARN("Failed to retrieve the added trigger's name.");
+ } else {
+ MSG("Added trigger `%s`.", returned_trigger_name);
+ }
+ }
+
ret = 0;
goto end;
ret = 1;
end:
- argpar_state_destroy(argpar_state);
+ /* Mi closing. */
+ if (lttng_opt_mi && mi_writer) {
+ int mi_ret;
+
+ /* Close output element. */
+ mi_ret = mi_lttng_writer_close_element(mi_writer);
+ if (mi_ret) {
+ ret = 1;
+ goto cleanup;
+ }
+
+ mi_ret = mi_lttng_writer_write_element_bool(mi_writer,
+ mi_lttng_element_command_success, ret ? 0 : 1);
+ if (mi_ret) {
+ ret = 1;
+ goto cleanup;
+ }
+
+ /* Command element close. */
+ mi_ret = mi_lttng_writer_command_close(mi_writer);
+ if (mi_ret) {
+ ret = 1;
+ goto cleanup;
+ }
+ }
+
+cleanup:
+ argpar_iter_destroy(argpar_iter);
argpar_item_destroy(argpar_item);
lttng_dynamic_pointer_array_reset(&actions);
lttng_condition_destroy(condition);
lttng_action_destroy(action_list);
lttng_action_destroy(action);
lttng_trigger_destroy(trigger);
- free(error);
free(name);
free(owner_uid);
+ if (mi_writer && mi_lttng_writer_destroy(mi_writer)) {
+ /* Preserve original error code. */
+ ret = ret ? ret : CMD_ERROR;
+ }
+
return ret;
}
projects / lttng-tools.git / blobdiff