X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fadd_trigger.c;h=b976ffce92432eb269455aec266d13e67b246513;hp=af5c420e1fe769a708dcaf8e03da5efb93c53339;hb=64c34630769271a77e5eb8254452e466809ce4d9;hpb=1d4b59f247e2692bf1e9c3c0aac93a47389d20dd

diff --git a/src/bin/lttng/commands/add_trigger.c b/src/bin/lttng/commands/add_trigger.c
index af5c420e1..b976ffce9 100644
--- a/src/bin/lttng/commands/add_trigger.c
+++ b/src/bin/lttng/commands/add_trigger.c
@@ -43,17 +43,14 @@ enum {
 	OPT_USER_ID,
 	OPT_RATE_POLICY,
 
-	OPT_ALL,
+	OPT_NAME,
 	OPT_FILTER,
-	OPT_EXCLUDE,
+	OPT_EXCLUDE_NAMES,
+	OPT_EVENT_NAME,
 	OPT_LOGLEVEL,
 	OPT_LOGLEVEL_ONLY,
 
-	OPT_USERSPACE,
-	OPT_KERNEL,
-	OPT_LOG4J,
-	OPT_JUL,
-	OPT_PYTHON,
+	OPT_DOMAIN,
 
 	OPT_FUNCTION,
 	OPT_PROBE,
@@ -61,7 +58,6 @@ enum {
 	OPT_SYSCALL,
 	OPT_TRACEPOINT,
 
-	OPT_NAME,
 	OPT_MAX_SIZE,
 	OPT_DATA_URL,
 	OPT_CTRL_URL,
@@ -72,18 +68,14 @@ enum {
 };
 
 static const struct argpar_opt_descr event_rule_opt_descrs[] = {
-	{ OPT_ALL, 'a', "all", false },
 	{ OPT_FILTER, 'f', "filter", true },
-	{ OPT_EXCLUDE, 'x', "exclude", true },
+	{ OPT_NAME, 'n', "name", true },
+	{ OPT_EXCLUDE_NAMES, 'x', "exclude-names", true },
 	{ OPT_LOGLEVEL, '\0', "loglevel", true },
 	{ OPT_LOGLEVEL_ONLY, '\0', "loglevel-only", true },
+	{ OPT_EVENT_NAME, 'E', "event-name", true },
 
-	/* Domains */
-	{ OPT_USERSPACE, 'u', "userspace", false },
-	{ OPT_KERNEL, 'k', "kernel", false },
-	{ OPT_LOG4J, 'l', "log4j", false },
-	{ OPT_JUL, 'j', "jul", false },
-	{ OPT_PYTHON, 'p', "python", false },
+	{ OPT_DOMAIN, 'd', "domain", true },
 
 	/* Event rule types */
 	{ OPT_FUNCTION, '\0', "function", true },
@@ -99,19 +91,37 @@ static const struct argpar_opt_descr event_rule_opt_descrs[] = {
 };
 
 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;
 }
 
@@ -542,22 +552,18 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
 	struct filter_parser_ctx *parser_ctx = NULL;
 	struct lttng_log_level_rule *log_level_rule = NULL;
 
-	/* Was the -a/--all flag provided? */
-	bool all_events = false;
-
-	/* Tracepoint name (non-option argument). */
-	const char *tracepoint_name = NULL;
+	/* Tracepoint and syscall options. */
+	char *name = NULL;
+	char *exclude_names = NULL;
+	char **exclusion_list = NULL;
 
 	/* Holds the argument of --probe / --userspace-probe. */
-	char *source = NULL;
+	char *probe_source = NULL;
+	char *probe_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;
@@ -593,32 +599,8 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
 
 			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)) {
-					goto error;
-				}
-
-				break;
-			case OPT_PYTHON:
-				if (!assign_domain_type(&domain_type, LTTNG_DOMAIN_PYTHON)) {
+			case OPT_DOMAIN:
+				if (!assign_domain_type(&domain_type, item_opt->arg)) {
 					goto error;
 				}
 
@@ -638,7 +620,8 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
 					goto error;
 				}
 
-				if (!assign_string(&source, item_opt->arg, "source")) {
+				if (!assign_string(&probe_source, item_opt->arg,
+						    "--probe")) {
 					goto error;
 				}
 
@@ -649,8 +632,17 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
 					goto error;
 				}
 
-				if (!assign_string(&source, item_opt->arg, "source")) {
-						goto error;
+				if (!assign_string(&probe_source, item_opt->arg,
+						    "--userspace-probe")) {
+					goto error;
+				}
+
+				break;
+			case OPT_EVENT_NAME:
+				if (!assign_string(&probe_event_name,
+						    item_opt->arg,
+						    "--event-name/-E")) {
+					goto error;
 				}
 
 				break;
@@ -667,9 +659,6 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
 					goto error;
 				}
 
-				break;
-			case OPT_ALL:
-				all_events = true;
 				break;
 			case OPT_FILTER:
 				if (!assign_string(&filter, item_opt->arg,
@@ -678,9 +667,17 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
 				}
 
 				break;
-			case OPT_EXCLUDE:
-				if (!assign_string(&exclude, item_opt->arg,
-						    "--exclude/-x")) {
+			case OPT_NAME:
+				if (!assign_string(&name, item_opt->arg,
+						    "--name/-n")) {
+					goto error;
+				}
+
+				break;
+			case OPT_EXCLUDE_NAMES:
+				if (!assign_string(&exclude_names,
+						    item_opt->arg,
+						    "--exclude-names/-x")) {
 					goto error;
 				}
 
@@ -742,17 +739,9 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
 					(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;
 		}
 	}
 
@@ -761,44 +750,54 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
 	}
 
 	/*
-	 * Option -a is applicable to event rules of type tracepoint and
-	 * syscall, and it is equivalent to using "*" as the tracepoint name.
+	 * Option --name is applicable to event rules of type tracepoint
+	 * and syscall.  For tracepoint and syscall rules, if --name is
+	 * omitted, it is implicitly "*".
 	 */
-	if (all_events) {
-		switch (event_rule_type) {
-		case LTTNG_EVENT_RULE_TYPE_TRACEPOINT:
-		case LTTNG_EVENT_RULE_TYPE_SYSCALL:
-			break;
-		default:
-			ERR("Can't use -a/--all with %s event rules.",
-					lttng_event_rule_type_str(event_rule_type));
-			goto error;
+	switch (event_rule_type) {
+	case LTTNG_EVENT_RULE_TYPE_TRACEPOINT:
+	case LTTNG_EVENT_RULE_TYPE_SYSCALL:
+		if (!name) {
+			name = strdup("*");
 		}
+		break;
 
-		if (tracepoint_name) {
-			ERR("Can't provide a tracepoint name with -a/--all.");
+	default:
+		if (name) {
+			ERR("Can't use --name with %s event rules.",
+					lttng_event_rule_type_str(
+							event_rule_type));
 			goto error;
 		}
 
-		/* In which case, it's equivalent to tracepoint name "*". */
-		tracepoint_name = "*";
+		if (exclude_names) {
+			ERR("Can't use --exclude-names/-x with %s event rules.",
+					lttng_event_rule_type_str(
+							event_rule_type));
+			goto error;
+		}
 	}
 
 	/*
-	 * A tracepoint name (or -a, for the event rule types that accept it)
-	 * is required.
+	 * Option --event-name is only applicable to event rules of type probe.
+	 * If omitted, it defaults to the probe 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:
+		if (!probe_event_name) {
+			probe_event_name = strdup(probe_source);
+		}
 
-	/*
-	 * We don't support multiple tracepoint names for now.
-	 */
-	if (strchr(tracepoint_name, ',')) {
-		ERR("Comma separated tracepoint names are not supported.");
-		goto error;
+		break;
+
+	default:
+		if (probe_event_name) {
+			ERR("Can't use --event-name with %s event rules.",
+					lttng_event_rule_type_str(
+							event_rule_type));
+			goto error;
+		}
 	}
 
 	/*
@@ -811,7 +810,7 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
 
 	/* 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;
 	}
 
@@ -852,16 +851,15 @@ 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) {
+	if (exclude_names) {
 		if (domain_type != LTTNG_DOMAIN_UST) {
 			ERR("Event name exclusions are not yet implemented for %s event rules.",
 					get_domain_str(domain_type));
 			goto error;
 		}
 
-
-		if (create_exclusion_list_and_validate(tracepoint_name, exclude,
-				&exclusion_list) != 0) {
+		if (create_exclusion_list_and_validate(name,
+				    exclude_names, &exclusion_list) != 0) {
 			ERR("Failed to create exclusion list.");
 			goto error;
 		}
@@ -886,10 +884,10 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
 
 		/* 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;
 		}
 
@@ -965,8 +963,8 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
 		int ret;
 		enum lttng_event_rule_status event_rule_status;
 
-
-		ret = parse_kernel_probe_opts(source, &kernel_probe_location);
+		ret = parse_kernel_probe_opts(
+				probe_source, &kernel_probe_location);
 		if (ret) {
 			ERR("Failed to parse kernel probe location.");
 			goto error;
@@ -979,9 +977,12 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
 			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, probe_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'.",
+					probe_event_name);
 			goto error;
 		}
 
@@ -993,7 +994,7 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
 		enum lttng_event_rule_status event_rule_status;
 
 		ret = parse_userspace_probe_opts(
-				source, &userspace_probe_location);
+				probe_source, &userspace_probe_location);
 		if (ret) {
 			ERR("Failed to parse user space probe location.");
 			goto error;
@@ -1005,11 +1006,12 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
 			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, probe_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);
+					probe_event_name);
 			goto error;
 		}
 
@@ -1026,10 +1028,10 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
 		}
 
 		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;
 		}
 
@@ -1067,9 +1069,12 @@ end:
 	free(error);
 	argpar_state_destroy(state);
 	free(filter);
-	free(exclude);
+	free(name);
+	free(exclude_names);
 	free(loglevel_str);
-	free(source);
+	free(probe_source);
+	free(probe_event_name);
+
 	strutils_free_null_terminated_array_of_strings(exclusion_list);
 	lttng_kernel_probe_location_destroy(kernel_probe_location);
 	lttng_userspace_probe_location_destroy(userspace_probe_location);
@@ -1284,7 +1289,7 @@ struct condition_descr {
 
 static const
 struct condition_descr condition_descrs[] = {
-	{ "on-event", handle_condition_event },
+	{ "event-rule-matches", handle_condition_event },
 	{ "on-session-consumed-size", handle_condition_session_consumed_size },
 	{ "on-buffer-usage-high", handle_condition_buffer_usage_high },
 	{ "on-buffer-usage-low", handle_condition_buffer_usage_low },