X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fadd_trigger.c;h=9e70df107dccd97defadd720881f4b386f3d7796;hb=57739a6b3247c7ded74522906e214eff0d6dc14c;hp=570ba4cf6de2da4e478c7aa49201558cc0da59b2;hpb=19904669a9eb25cd4a0ccd3de82d3ac803dfe877;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/add_trigger.c b/src/bin/lttng/commands/add_trigger.c
index 570ba4cf6..9e70df107 100644
--- a/src/bin/lttng/commands/add_trigger.c
+++ b/src/bin/lttng/commands/add_trigger.c
@@ -7,6 +7,7 @@
 
 #include <ctype.h>
 #include <stdio.h>
+#include <string.h>
 
 #include "../command.h"
 #include "../loglevel.h"
@@ -126,13 +127,25 @@ bool assign_event_rule_type(enum lttng_event_rule_type *dest, const char *arg)
 
 	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) {
+	} 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) {
+	} else if (strcmp(arg, "uprobe") == 0 ||
+			strcmp(arg, "userspace-probe") == 0) {
 		*dest = LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE;
-	} else if (strcmp (arg, "function") == 0) {
+	} else if (strcmp(arg, "function") == 0) {
 		*dest = LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION;
-	} else if (strcmp (arg, "syscall") == 0) {
+	} 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("Invalid `--type` value: %s", arg);
@@ -175,6 +188,27 @@ end:
 	return ret;
 }
 
+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;
+}
+
 /* This is defined in enable_events.c. */
 LTTNG_HIDDEN
 int create_exclusion_list_and_validate(const char *event_name,
@@ -622,6 +656,9 @@ 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;
 
+	/* Event rule type option */
+	char *event_rule_type_str = NULL;
+
 	/* Tracepoint and syscall options. */
 	char *name = NULL;
 	char *exclude_names = NULL;
@@ -681,6 +718,13 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
 					goto error;
 				}
 
+				/* Save the string for later use. */
+				if (!assign_string(&event_rule_type_str,
+						    item_opt->arg,
+						    "--type/-t")) {
+					goto error;
+				}
+
 				break;
 			case OPT_LOCATION:
 				if (!assign_string(&location,
@@ -1077,8 +1121,15 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
 	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;
+
+		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();
+		res.er = lttng_event_rule_syscall_create(emission_site_type);
 		if (!res.er) {
 			ERR("Failed to create syscall event rule.");
 			goto error;
@@ -1131,6 +1182,7 @@ end:
 	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);