Rename *emission_site_type to *emission_site

[lttng-tools.git] / src / common / event-rule / syscall.c

diff --git a/src/common/event-rule/syscall.c b/src/common/event-rule/syscall.c
index 12aeacfcff9a88fbe4f4904a14b9502c692123d1..4ac6a11af7ac777d0a128d414aa09025522fd1c9 100644 (file)
--- a/src/common/event-rule/syscall.c
+++ b/src/common/event-rule/syscall.c
@@ -88,7 +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;
+       syscall_comm.emission_site = syscall->emission_site;
 
        ret = lttng_dynamic_buffer_append(
                        &payload->buffer, &syscall_comm, sizeof(syscall_comm));
@@ -248,15 +248,15 @@ lttng_event_rule_syscall_hash(
 }
 
 struct lttng_event_rule *lttng_event_rule_syscall_create(
-               enum lttng_event_rule_syscall_emission_site_type
-                               emission_site_type)
+               enum lttng_event_rule_syscall_emission_site
+                               emission_site)
 {
        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) {
+       switch (emission_site) {
        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:
@@ -289,14 +289,14 @@ struct lttng_event_rule *lttng_event_rule_syscall_create(
        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;
+       syscall_rule->emission_site = emission_site;
 
 end:
        return rule;
@@ -334,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(syscall_comm->emission_site_type);
+       rule = lttng_event_rule_syscall_create(syscall_comm->emission_site);
        if (!rule) {
                ERR("Failed to create event rule syscall");
                ret = -1;
@@ -387,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;
@@ -412,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;
@@ -442,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;
@@ -517,11 +517,11 @@ 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(
+extern enum lttng_event_rule_syscall_emission_site
+lttng_event_rule_syscall_get_emission_site(
                const struct lttng_event_rule *rule)
 {
-       enum lttng_event_rule_syscall_emission_site_type emission_site_type =
+       enum lttng_event_rule_syscall_emission_site emission_site =
                LTTNG_EVENT_RULE_SYSCALL_EMISSION_SITE_UNKNOWN;
        struct lttng_event_rule_syscall *syscall;
 
@@ -530,17 +530,17 @@ lttng_event_rule_syscall_get_emission_site_type(
        }
 
        syscall = container_of(rule, struct lttng_event_rule_syscall, parent);
-       emission_site_type = syscall->emission_site_type;
+       emission_site = syscall->emission_site;
 
 end:
-       return emission_site_type;
+       return emission_site;
 }
 
 LTTNG_HIDDEN
 const char *lttng_event_rule_syscall_emission_site_str(
-               enum lttng_event_rule_syscall_emission_site_type type)
+               enum lttng_event_rule_syscall_emission_site emission_site)
 {
-       switch (type) {
+       switch (emission_site) {
        case LTTNG_EVENT_RULE_SYSCALL_EMISSION_SITE_ENTRY:
                return "entry";
        case LTTNG_EVENT_RULE_SYSCALL_EMISSION_SITE_ENTRY_EXIT: