X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fevent-rule%2Fsyscall.c;h=88cfde6b6a268d7c1a016af22fd71194b88e8548;hb=b2eeb0d5db1245d03f5bfc300a42ee3e9615237f;hp=8103eaa6131f64b97b125bc9b2ada4d619f77dac;hpb=67d38b9374a83948f81ae1544e0fc707f0829303;p=lttng-tools.git

diff --git a/src/common/event-rule/syscall.c b/src/common/event-rule/syscall.c
index 8103eaa61..88cfde6b6 100644
--- a/src/common/event-rule/syscall.c
+++ b/src/common/event-rule/syscall.c
@@ -14,6 +14,7 @@
 #include <common/runas.h>
 #include <common/hashtable/hashtable.h>
 #include <common/hashtable/utils.h>
+#include <common/string-utils/string-utils.h>
 #include <lttng/event-rule/event-rule-internal.h>
 #include <lttng/event-rule/syscall-internal.h>
 
@@ -87,6 +88,7 @@ static int lttng_event_rule_syscall_serialize(
 
 	syscall_comm.pattern_len = pattern_len;
 	syscall_comm.filter_expression_len = filter_expression_len;
+	syscall_comm.emission_site_type = syscall->emission_site_type;
 
 	ret = lttng_dynamic_buffer_append(
 			&payload->buffer, &syscall_comm, sizeof(syscall_comm));
@@ -245,12 +247,25 @@ lttng_event_rule_syscall_hash(
 	return hash;
 }
 
-struct lttng_event_rule *lttng_event_rule_syscall_create(void)
+struct lttng_event_rule *lttng_event_rule_syscall_create(
+		enum lttng_event_rule_syscall_emission_site_type
+				emission_site_type)
 {
 	struct lttng_event_rule *rule = NULL;
 	struct lttng_event_rule_syscall *syscall_rule;
 	enum lttng_event_rule_status status;
 
+	/* Validate the emission site type */
+	switch (emission_site_type) {
+	case LTTNG_EVENT_RULE_SYSCALL_EMISSION_SITE_ENTRY_EXIT:
+	case LTTNG_EVENT_RULE_SYSCALL_EMISSION_SITE_ENTRY:
+	case LTTNG_EVENT_RULE_SYSCALL_EMISSION_SITE_EXIT:
+		break;
+	default:
+		/* Invalid emission type */
+		goto end;
+	}
+
 	syscall_rule = zmalloc(sizeof(struct lttng_event_rule_syscall));
 	if (!syscall_rule) {
 		goto end;
@@ -274,12 +289,15 @@ struct lttng_event_rule *lttng_event_rule_syscall_create(void)
 	syscall_rule->parent.hash = lttng_event_rule_syscall_hash;
 
 	/* Default pattern is '*'. */
-	status = lttng_event_rule_syscall_set_pattern(rule, "*");
+	status = lttng_event_rule_syscall_set_name_pattern(rule, "*");
 	if (status != LTTNG_EVENT_RULE_STATUS_OK) {
 		lttng_event_rule_destroy(rule);
 		rule = NULL;
 	}
 
+	/* Emission site type */
+	syscall_rule->emission_site_type = emission_site_type;
+
 end:
 	return rule;
 }
@@ -316,7 +334,7 @@ ssize_t lttng_event_rule_syscall_create_from_payload(
 	}
 
 	syscall_comm = (typeof(syscall_comm)) current_buffer_view.data;
-	rule = lttng_event_rule_syscall_create();
+	rule = lttng_event_rule_syscall_create(syscall_comm->emission_site_type);
 	if (!rule) {
 		ERR("Failed to create event rule syscall");
 		ret = -1;
@@ -369,7 +387,7 @@ ssize_t lttng_event_rule_syscall_create_from_payload(
 
 skip_filter_expression:
 
-	status = lttng_event_rule_syscall_set_pattern(rule, pattern);
+	status = lttng_event_rule_syscall_set_name_pattern(rule, pattern);
 	if (status != LTTNG_EVENT_RULE_STATUS_OK) {
 		ERR("Failed to set event rule syscall pattern");
 		ret = -1;
@@ -394,7 +412,7 @@ end:
 	return ret;
 }
 
-enum lttng_event_rule_status lttng_event_rule_syscall_set_pattern(
+enum lttng_event_rule_status lttng_event_rule_syscall_set_name_pattern(
 		struct lttng_event_rule *rule, const char *pattern)
 {
 	char *pattern_copy = NULL;
@@ -414,9 +432,9 @@ enum lttng_event_rule_status lttng_event_rule_syscall_set_pattern(
 		goto end;
 	}
 
-	if (syscall->pattern) {
-		free(syscall->pattern);
-	}
+	strutils_normalize_star_glob_pattern(pattern_copy);
+
+	free(syscall->pattern);
 
 	syscall->pattern = pattern_copy;
 	pattern_copy = NULL;
@@ -424,7 +442,7 @@ end:
 	return status;
 }
 
-enum lttng_event_rule_status lttng_event_rule_syscall_get_pattern(
+enum lttng_event_rule_status lttng_event_rule_syscall_get_name_pattern(
 		const struct lttng_event_rule *rule, const char **pattern)
 {
 	struct lttng_event_rule_syscall *syscall;
@@ -499,3 +517,37 @@ enum lttng_event_rule_status lttng_event_rule_syscall_get_filter(
 end:
 	return status;
 }
+extern enum lttng_event_rule_syscall_emission_site_type
+lttng_event_rule_syscall_get_emission_site_type(
+		const struct lttng_event_rule *rule)
+{
+	enum lttng_event_rule_syscall_emission_site_type emission_site_type =
+		LTTNG_EVENT_RULE_SYSCALL_EMISSION_SITE_UNKNOWN;
+	struct lttng_event_rule_syscall *syscall;
+
+	if (!rule || !IS_SYSCALL_EVENT_RULE(rule)) {
+		goto end;
+	}
+
+	syscall = container_of(rule, struct lttng_event_rule_syscall, parent);
+	emission_site_type = syscall->emission_site_type;
+
+end:
+	return emission_site_type;
+}
+
+LTTNG_HIDDEN
+const char *lttng_event_rule_syscall_emission_site_str(
+		enum lttng_event_rule_syscall_emission_site_type type)
+{
+	switch (type) {
+	case LTTNG_EVENT_RULE_SYSCALL_EMISSION_SITE_ENTRY:
+		return "entry";
+	case LTTNG_EVENT_RULE_SYSCALL_EMISSION_SITE_ENTRY_EXIT:
+		return "entry+exit";
+	case LTTNG_EVENT_RULE_SYSCALL_EMISSION_SITE_EXIT:
+		return "exit";
+	default:
+		return "???";
+	}
+}