event-rule: userspace probe: rename get/set_name to get/set_event_name

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I4a7fbd26b4dfe352100a6fa78b828c1da0fa9928

diff --git a/include/lttng/event-rule/userspace-probe.h b/include/lttng/event-rule/userspace-probe.h
index f4020a16aa2590ea0f9e85ab8faf3b291a4bf033..dd90966cfb1cbea3110605c8abae3c2d37ab1949 100644 (file)
--- a/include/lttng/event-rule/userspace-probe.h
+++ b/include/lttng/event-rule/userspace-probe.h
@@ -59,7 +59,7 @@ extern enum lttng_event_rule_status lttng_event_rule_userspace_probe_get_locatio
  * Return LTTNG_EVENT_RULE_STATUS_OK on success, LTTNG_EVENT_RULE_STATUS_INVALID
  * if invalid parameters are passed.
  */
  * Return LTTNG_EVENT_RULE_STATUS_OK on success, LTTNG_EVENT_RULE_STATUS_INVALID
  * if invalid parameters are passed.
  */

-extern enum lttng_event_rule_status lttng_event_rule_userspace_probe_set_name(
+extern enum lttng_event_rule_status lttng_event_rule_userspace_probe_set_event_name(

                struct lttng_event_rule *rule, const char *name);
 
 /*
                struct lttng_event_rule *rule, const char *name);
 
 /*


@@ -73,7 +73,7 @@ extern enum lttng_event_rule_status lttng_event_rule_userspace_probe_set_name(
  * success, LTTNG_EVENT_RULE_STATUS_INVALID if an invalid parameter is passed,
  * or LTTNG_EVENT_RULE_STATUS_UNSET if a name was not set prior to this call.
  */
  * success, LTTNG_EVENT_RULE_STATUS_INVALID if an invalid parameter is passed,
  * or LTTNG_EVENT_RULE_STATUS_UNSET if a name was not set prior to this call.
  */

-extern enum lttng_event_rule_status lttng_event_rule_userspace_probe_get_name(
+extern enum lttng_event_rule_status lttng_event_rule_userspace_probe_get_event_name(

                const struct lttng_event_rule *rule, const char **name);
 
 #ifdef __cplusplus
                const struct lttng_event_rule *rule, const char **name);
 
 #ifdef __cplusplus

diff --git a/src/bin/lttng-sessiond/trace-kernel.c b/src/bin/lttng-sessiond/trace-kernel.c
index d420fb4df005a6a2635b54ee1b6134f0dc3167f6..9c2f61ad7f2232fd7190e5df37ffc5a60f36118e 100644 (file)
--- a/src/bin/lttng-sessiond/trace-kernel.c
+++ b/src/bin/lttng-sessiond/trace-kernel.c
@@ -647,7 +647,8 @@ enum lttng_error_code trace_kernel_init_event_notifier_from_event_rule(
                        abort();
                }
 
                        abort();
                }
 

-               status = lttng_event_rule_userspace_probe_get_name(rule, &name);
+               status = lttng_event_rule_userspace_probe_get_event_name(
+                               rule, &name);

                assert(status == LTTNG_EVENT_RULE_STATUS_OK);
                ret_code = LTTNG_OK;
                break;
                assert(status == LTTNG_EVENT_RULE_STATUS_OK);
                ret_code = LTTNG_OK;
                break;

diff --git a/src/bin/lttng/commands/add_trigger.c b/src/bin/lttng/commands/add_trigger.c
index ec629cb30750c5b81a46b7174540d10247a38264..092f3c8e2dd3991d03b97ad498a1f5909af3029b 100644 (file)
--- a/src/bin/lttng/commands/add_trigger.c
+++ b/src/bin/lttng/commands/add_trigger.c
@@ -1007,8 +1007,9 @@ struct parse_event_rule_res parse_event_rule(int *argc, const char ***argv)
                        goto error;
                }
 
                        goto error;
                }
 

-               event_rule_status = lttng_event_rule_userspace_probe_set_name(
-                               res.er, tracepoint_name);
+               event_rule_status =
+                               lttng_event_rule_userspace_probe_set_event_name(
+                                               res.er, tracepoint_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);
                if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
                        ERR("Failed to set user space probe event rule's name to '%s'.",
                                        tracepoint_name);

diff --git a/src/bin/lttng/commands/list_triggers.c b/src/bin/lttng/commands/list_triggers.c
index 666f8f077fcfede0b0ec4571d469bd9cd2aad982..054b3fb725027c5c5b8fadfd5967db425c47e3ff 100644 (file)
--- a/src/bin/lttng/commands/list_triggers.c
+++ b/src/bin/lttng/commands/list_triggers.c
@@ -201,7 +201,8 @@ void print_event_rule_userspace_probe(const struct lttng_event_rule *event_rule)
 
        assert(lttng_event_rule_get_type(event_rule) == LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE);
 
 
        assert(lttng_event_rule_get_type(event_rule) == LTTNG_EVENT_RULE_TYPE_USERSPACE_PROBE);
 

-       event_rule_status = lttng_event_rule_userspace_probe_get_name(event_rule, &name);
+       event_rule_status = lttng_event_rule_userspace_probe_get_event_name(
+                       event_rule, &name);

        if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
                ERR("Failed to get uprobe event rule's name.");
                goto end;
        if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) {
                ERR("Failed to get uprobe event rule's name.");
                goto end;

diff --git a/src/common/event-rule/userspace-probe.c b/src/common/event-rule/userspace-probe.c
index 66db5a6e404dbc4bce90d2e2dbd4cb13394e4985..44a7a8043087a2dfdd6f0a4cef93b4e6d093d235 100644 (file)
--- a/src/common/event-rule/userspace-probe.c
+++ b/src/common/event-rule/userspace-probe.c
@@ -300,7 +300,7 @@ ssize_t lttng_event_rule_userspace_probe_create_from_payload(
        uprobe = container_of(rule, struct lttng_event_rule_userspace_probe, parent);
        uprobe->location = location;
 
        uprobe = container_of(rule, struct lttng_event_rule_userspace_probe, parent);
        uprobe->location = location;
 

-       status = lttng_event_rule_userspace_probe_set_name(rule, name);
+       status = lttng_event_rule_userspace_probe_set_event_name(rule, name);

        if (status != LTTNG_EVENT_RULE_STATUS_OK) {
                ret = -1;
                goto end;
        if (status != LTTNG_EVENT_RULE_STATUS_OK) {
                ret = -1;
                goto end;


@@ -384,7 +384,7 @@ lttng_event_rule_userspace_probe_get_location_mutable(
        return uprobe->location;
 }
 
        return uprobe->location;
 }
 

-enum lttng_event_rule_status lttng_event_rule_userspace_probe_set_name(
+enum lttng_event_rule_status lttng_event_rule_userspace_probe_set_event_name(

                struct lttng_event_rule *rule, const char *name)
 {
        char *name_copy = NULL;
                struct lttng_event_rule *rule, const char *name)
 {
        char *name_copy = NULL;


@@ -414,7 +414,7 @@ end:
        return status;
 }
 
        return status;
 }
 

-enum lttng_event_rule_status lttng_event_rule_userspace_probe_get_name(
+enum lttng_event_rule_status lttng_event_rule_userspace_probe_get_event_name(

                const struct lttng_event_rule *rule, const char **name)
 {
        struct lttng_event_rule_userspace_probe *uprobe;
                const struct lttng_event_rule *rule, const char **name)
 {
        struct lttng_event_rule_userspace_probe *uprobe;

diff --git a/tests/regression/tools/notification/notification.c b/tests/regression/tools/notification/notification.c
index e1d57f9635fb15a5ac31bf80810b149a840593a4..5f75334538504d43abd8741e548602792fb766a1 100644 (file)
--- a/tests/regression/tools/notification/notification.c
+++ b/tests/regression/tools/notification/notification.c
@@ -1981,7 +1981,7 @@ static void test_uprobe_event_rule_notification(
        ok(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK,
                        "Setting uprobe event rule location");
 
        ok(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK,
                        "Setting uprobe event rule location");
 

-       event_rule_status = lttng_event_rule_userspace_probe_set_name(
+       event_rule_status = lttng_event_rule_userspace_probe_set_event_name(

                        event_rule, trigger_name);
        ok(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK,
                        "Setting uprobe event rule name: '%s'", trigger_name);
                        event_rule, trigger_name);
        ok(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK,
                        "Setting uprobe event rule name: '%s'", trigger_name);

diff --git a/tests/unit/test_event_rule.c b/tests/unit/test_event_rule.c
index 49aade24d8bf184a8b457f7d5515f0bc4760c91d..b92a10aac0b6e1a23814b742b2f8ca3490f11c7e 100644 (file)
--- a/tests/unit/test_event_rule.c
+++ b/tests/unit/test_event_rule.c
@@ -276,10 +276,10 @@ static void test_event_rule_userspace_probe(void)
                           probe_location, probe_location_tmp),
                        "Location is equal.");
 
                           probe_location, probe_location_tmp),
                        "Location is equal.");
 

-       status = lttng_event_rule_userspace_probe_set_name(uprobe, probe_name);
+       status = lttng_event_rule_userspace_probe_set_event_name(uprobe, probe_name);

        ok(status == LTTNG_EVENT_RULE_STATUS_OK,
                        "Setting uprobe event rule name: %s.", probe_name);
        ok(status == LTTNG_EVENT_RULE_STATUS_OK,
                        "Setting uprobe event rule name: %s.", probe_name);

-       status = lttng_event_rule_userspace_probe_get_name(uprobe, &tmp);
+       status = lttng_event_rule_userspace_probe_get_event_name(uprobe, &tmp);

        ok(status == LTTNG_EVENT_RULE_STATUS_OK, "Getting uprobe name.");
        ok(!strcmp(probe_name, tmp), "Uprobe name are equal.");
 
        ok(status == LTTNG_EVENT_RULE_STATUS_OK, "Getting uprobe name.");
        ok(!strcmp(probe_name, tmp), "Uprobe name are equal.");