X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fadd_trigger.c;h=0f94ef1551d69348341e52d219296812a26e4820;hb=46fd07accf36998fca3e43e54513755a98f68f48;hp=ceaf3e807b71f07521bde5df95181e31f9b3f573;hpb=a5c2d2a71919b8d1542b62f6d32579125cc2c8f8;p=lttng-tools.git diff --git a/src/bin/lttng/commands/add_trigger.c b/src/bin/lttng/commands/add_trigger.c index ceaf3e807..0f94ef155 100644 --- a/src/bin/lttng/commands/add_trigger.c +++ b/src/bin/lttng/commands/add_trigger.c @@ -46,7 +46,7 @@ enum { OPT_NAME, OPT_FILTER, - OPT_EXCLUDE_NAMES, + OPT_EXCLUDE_NAME, OPT_EVENT_NAME, OPT_LOG_LEVEL, @@ -66,7 +66,7 @@ enum { static const struct argpar_opt_descr event_rule_opt_descrs[] = { { OPT_FILTER, 'f', "filter", true }, { OPT_NAME, 'n', "name", true }, - { OPT_EXCLUDE_NAMES, 'x', "exclude-names", true }, + { OPT_EXCLUDE_NAME, 'x', "exclude-name", true }, { OPT_LOG_LEVEL, 'l', "log-level", true }, { OPT_EVENT_NAME, 'E', "event-name", true }, @@ -130,12 +130,13 @@ bool assign_event_rule_type(enum lttng_event_rule_type *dest, const char *arg) } 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, "kernel:uprobe") == 0) { + *dest = LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE; } else if (strcmp(arg, "function") == 0) { *dest = LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION; - } else if (strncmp(arg, "syscall", strlen("syscall")) == 0) { + } else if (strncmp(arg, "syscall", strlen("syscall")) == 0 || + strncmp(arg, "kernel:syscall", + strlen("kernel:syscall")) == 0) { /* * Matches the following: * - syscall @@ -143,10 +144,15 @@ bool assign_event_rule_type(enum lttng_event_rule_type *dest, const char *arg) * - 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; @@ -189,16 +195,27 @@ end: } 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; } @@ -209,12 +226,6 @@ error: 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); - /* * Parse `str` as a log level in domain `domain_type`. * @@ -661,8 +672,8 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv) /* Tracepoint and syscall options. */ char *name = NULL; - char *exclude_names = NULL; - char **exclusion_list = NULL; + /* Array of strings. */ + struct lttng_dynamic_pointer_array exclude_names; /* For userspace / kernel probe and function. */ char *location = NULL; @@ -676,6 +687,9 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv) 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."); @@ -756,14 +770,20 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv) } break; - case OPT_EXCLUDE_NAMES: - if (!assign_string(&exclude_names, - item_opt->arg, - "--exclude-names/-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_LOG_LEVEL: if (!assign_string(&log_level_str, item_opt->arg, "--log-level/-l")) { @@ -835,7 +855,7 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv) */ switch (event_rule_type) { case LTTNG_EVENT_RULE_TYPE_TRACEPOINT: - case LTTNG_EVENT_RULE_TYPE_SYSCALL: + case LTTNG_EVENT_RULE_TYPE_KERNEL_SYSCALL: if (!name) { name = strdup("*"); } @@ -849,8 +869,8 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv) goto error; } - if (exclude_names) { - ERR("Can't use --exclude-names/-x with %s event rules.", + 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; @@ -866,7 +886,7 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv) */ switch (event_rule_type) { case LTTNG_EVENT_RULE_TYPE_KERNEL_PROBE: - case LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE: + case LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE: case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION: if (!location) { ERR("Event rule of type %s requires a --location.", @@ -913,8 +933,8 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv) 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: + case LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE: + case LTTNG_EVENT_RULE_TYPE_KERNEL_SYSCALL: if (domain_type != LTTNG_DOMAIN_KERNEL) { ERR("Event type not available for user-space tracing."); goto error; @@ -936,7 +956,7 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv) if (filter && domain_type == LTTNG_DOMAIN_KERNEL) { switch (event_rule_type) { case LTTNG_EVENT_RULE_TYPE_TRACEPOINT: - case LTTNG_EVENT_RULE_TYPE_SYSCALL: + case LTTNG_EVENT_RULE_TYPE_KERNEL_SYSCALL: break; default: ERR("Filter expressions are not supported for %s event rules.", @@ -945,17 +965,19 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv) } } - /* If --exclude/-x was passed, split it into an exclusion list. */ - if (exclude_names) { + /* 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(name, - exclude_names, &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; } } @@ -985,7 +1007,7 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv) } /* Set pattern. */ - event_rule_status = lttng_event_rule_tracepoint_set_pattern( + event_rule_status = lttng_event_rule_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'.", @@ -1005,17 +1027,25 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv) } /* 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_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'", - exclusion_list[n]); + exclude_name); goto error; } } @@ -1089,7 +1119,7 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv) 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; @@ -1101,14 +1131,14 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv) 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'.", @@ -1118,24 +1148,24 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv) 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'.", @@ -1144,7 +1174,7 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv) } 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'.", @@ -1178,13 +1208,12 @@ end: argpar_state_destroy(state); free(filter); free(name); - free(exclude_names); + lttng_dynamic_pointer_array_reset(&exclude_names); free(log_level_str); free(location); free(event_name); free(event_rule_type_str); - 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); lttng_log_level_rule_destroy(log_level_rule); @@ -1291,8 +1320,9 @@ end: 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; @@ -1300,12 +1330,13 @@ static struct lttng_rate_policy *parse_rate_policy(const char *policy_str) 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. @@ -1316,8 +1347,8 @@ static struct lttng_rate_policy *parse_rate_policy(const char *policy_str) 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) { @@ -1357,7 +1388,7 @@ static struct lttng_rate_policy *parse_rate_policy(const char *policy_str) } end: - strutils_free_null_terminated_array_of_strings(tokens); + lttng_dynamic_pointer_array_reset(&tokens); return policy; } @@ -1491,7 +1522,7 @@ static struct lttng_action *handle_action_simple_session_with_policy(int *argc, { 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."); @@ -2186,6 +2217,7 @@ int cmd_add_trigger(int argc, const char **argv) 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);