Change "event rule hit" to "event-rule matches" in user interface strings

The condition name was changed from "event rule hit" to "event rule
matches", but there are some leftover user-visible strings with the old
name. Fix them.

Change-Id: I619c9265d68ca6bf4a3ac11ef38cabc715b01110
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/src/bin/lttng-sessiond/notification-thread-events.c b/src/bin/lttng-sessiond/notification-thread-events.c
index 2772e6fa61b18fdec34a0a507c200e48a5a9e9c8..c7037a482bfcdeccf70e0159089467196b690a79 100644 (file)
--- a/src/bin/lttng-sessiond/notification-thread-events.c
+++ b/src/bin/lttng-sessiond/notification-thread-events.c
@@ -4616,10 +4616,11 @@ int dispatch_one_event_notifier_notification(struct notification_thread_state *s
                        notification->capture_buf_size, false);
 
        if (evaluation == NULL) {
-               ERR("Failed to create event rule hit evaluation while creating and enqueuing action executor job");
+               ERR("Failed to create event rule matches evaluation while creating and enqueuing action executor job");
                ret = -1;
                goto end_unlock;
        }
+
        client_list = get_client_list_from_condition(state,
                        lttng_trigger_get_const_condition(element->trigger));
        executor_status = action_executor_enqueue_trigger(state->executor,

diff --git a/src/common/conditions/condition.c b/src/common/conditions/condition.c
index 97598f24963cf8aff6c48f06d868b7a32e722554..4b290cdb4c1b7dc2e594c5f368f909f3394050af 100644 (file)
--- a/src/common/conditions/condition.c
+++ b/src/common/conditions/condition.c
@@ -232,7 +232,7 @@ const char *lttng_condition_type_str(enum lttng_condition_type type)
                return "session rotation completed";
 
        case LTTNG_CONDITION_TYPE_EVENT_RULE_MATCHES:
-               return "event rule hit";
+               return "event rule matches";
 
        default:
                return "???";

diff --git a/tests/regression/tools/trigger/test_list_triggers_cli b/tests/regression/tools/trigger/test_list_triggers_cli
index faf3a030fa51365eeb4beb3428f3a9c4a712cce1..cb7a3b4760d68f0c0da14c27ba2890a685228314 100755 (executable)
--- a/tests/regression/tools/trigger/test_list_triggers_cli
+++ b/tests/regression/tools/trigger/test_list_triggers_cli
@@ -75,7 +75,7 @@ test_top_level_options ()
        cat > "${tmp_expected_stdout}" <<- EOF
        - name: hello
          owner uid: ${uid}
-         condition: event rule hit
+         condition: event rule matches
            rule: test-name (type: tracepoint, domain: ust)
          actions:
            notify
@@ -106,7 +106,7 @@ test_event_rule_matches_tracepoint ()
        cat > "${tmp_expected_stdout}" <<- EOF
        - name: A
          owner uid: ${uid}
-         condition: event rule hit
+         condition: event rule matches
            rule: aaa (type: tracepoint, domain: ust, filter: p == 2)
          actions:
            notify
@@ -114,7 +114,7 @@ test_event_rule_matches_tracepoint ()
          errors: none
        - name: B
          owner uid: ${uid}
-         condition: event rule hit
+         condition: event rule matches
            rule: gerboise (type: tracepoint, domain: ust, log level at least INFO)
          actions:
            notify
@@ -122,7 +122,7 @@ test_event_rule_matches_tracepoint ()
          errors: none
        - name: C
          owner uid: ${uid}
-         condition: event rule hit
+         condition: event rule matches
            rule: * (type: tracepoint, domain: ust)
          actions:
            notify
@@ -130,7 +130,7 @@ test_event_rule_matches_tracepoint ()
          errors: none
        - name: D
          owner uid: ${uid}
-         condition: event rule hit
+         condition: event rule matches
            rule: hello* (type: tracepoint, domain: ust, exclusions: hello2,hello3,hello4)
          actions:
            notify
@@ -138,7 +138,7 @@ test_event_rule_matches_tracepoint ()
          errors: none
        - name: E
          owner uid: ${uid}
-         condition: event rule hit
+         condition: event rule matches
            rule: lemming (type: tracepoint, domain: ust, log level is WARNING)
          actions:
            notify
@@ -146,7 +146,7 @@ test_event_rule_matches_tracepoint ()
          errors: none
        - name: F
          owner uid: ${uid}
-         condition: event rule hit
+         condition: event rule matches
            rule: capture-payload-field (type: tracepoint, domain: ust)
            captures:
              - a
@@ -156,7 +156,7 @@ test_event_rule_matches_tracepoint ()
          errors: none
        - name: G
          owner uid: ${uid}
-         condition: event rule hit
+         condition: event rule matches
            rule: capture-array (type: tracepoint, domain: ust)
            captures:
              - a[2]
@@ -167,7 +167,7 @@ test_event_rule_matches_tracepoint ()
          errors: none
        - name: H
          owner uid: ${uid}
-         condition: event rule hit
+         condition: event rule matches
            rule: capture-chan-ctx (type: tracepoint, domain: ust)
            captures:
              - \$ctx.vpid
@@ -177,7 +177,7 @@ test_event_rule_matches_tracepoint ()
          errors: none
        - name: I
          owner uid: ${uid}
-         condition: event rule hit
+         condition: event rule matches
            rule: capture-app-ctx (type: tracepoint, domain: ust)
            captures:
              - \$app.iga:active_clients
@@ -187,7 +187,7 @@ test_event_rule_matches_tracepoint ()
          errors: none
        - name: J
          owner uid: ${uid}
-         condition: event rule hit
+         condition: event rule matches
            rule: lemming (type: tracepoint, domain: ust)
          actions:
            notify
@@ -239,7 +239,7 @@ test_event_rule_matches_probe ()
        cat > "${tmp_expected_stdout}" <<- EOF
        - name: T0
          owner uid: ${uid}
-         condition: event rule hit
+         condition: event rule matches
            rule: my_channel_enable (type: probe, location: lttng_channel_enable)
          actions:
            notify
@@ -247,7 +247,7 @@ test_event_rule_matches_probe ()
          errors: none
        - name: T1
          owner uid: ${uid}
-         condition: event rule hit
+         condition: event rule matches
            rule: my_channel_enable (type: probe, location: ${base_symbol}+${offset_hex})
          actions:
            notify
@@ -255,7 +255,7 @@ test_event_rule_matches_probe ()
          errors: none
        - name: T2
          owner uid: ${uid}
-         condition: event rule hit
+         condition: event rule matches
            rule: my_channel_enable (type: probe, location: 0x${channel_enable_addr})
          actions:
            notify
@@ -281,7 +281,7 @@ test_event_rule_matches_userspace_probe_elf ()
        cat > "${tmp_expected_stdout}" <<- EOF
        - name: T0
          owner uid: ${uid}
-         condition: event rule hit
+         condition: event rule matches
            rule: ma-probe-elf (type: userspace probe, location type: ELF, location: ${uprobe_elf_binary}:${elf_function_name})
          actions:
            notify
@@ -306,7 +306,7 @@ test_event_rule_matches_userspace_probe_sdt ()
        cat > "${tmp_expected_stdout}" <<- EOF
        - name: T0
          owner uid: 0
-         condition: event rule hit
+         condition: event rule matches
            rule: ma-probe-sdt (type: userspace probe, location type: SDT, location: ${uprobe_sdt_binary}:${sdt_provider_name}:${sdt_probe_name})
          actions:
            notify
@@ -332,7 +332,7 @@ test_event_rule_matches_syscall ()
        cat > "${tmp_expected_stdout}" <<- EOF
        - name: T0
          owner uid: ${uid}
-         condition: event rule hit
+         condition: event rule matches
            rule: open (type: syscall:entry+exit)
          actions:
            notify
@@ -340,7 +340,7 @@ test_event_rule_matches_syscall ()
          errors: none
        - name: T1
          owner uid: ${uid}
-         condition: event rule hit
+         condition: event rule matches
            rule: open (type: syscall:entry)
          actions:
            notify
@@ -348,7 +348,7 @@ test_event_rule_matches_syscall ()
          errors: none
        - name: T2
          owner uid: ${uid}
-         condition: event rule hit
+         condition: event rule matches
            rule: open (type: syscall:exit)
          actions:
            notify
@@ -356,7 +356,7 @@ test_event_rule_matches_syscall ()
          errors: none
        - name: T3
          owner uid: ${uid}
-         condition: event rule hit
+         condition: event rule matches
            rule: open (type: syscall:entry+exit)
          actions:
            notify
@@ -364,7 +364,7 @@ test_event_rule_matches_syscall ()
          errors: none
        - name: T4
          owner uid: ${uid}
-         condition: event rule hit
+         condition: event rule matches
            rule: ptrace (type: syscall:entry+exit, filter: a > 2)
          actions:
            notify
@@ -508,7 +508,7 @@ test_snapshot_action ()
        cat > "${tmp_expected_stdout}" <<- EOF
        - name: T0
          owner uid: ${uid}
-         condition: event rule hit
+         condition: event rule matches
            rule: some-event (type: tracepoint, domain: ust)
          actions:
            snapshot session \`ze-session\`
@@ -516,7 +516,7 @@ test_snapshot_action ()
          errors: none
        - name: T1
          owner uid: ${uid}
-         condition: event rule hit
+         condition: event rule matches
            rule: some-event (type: tracepoint, domain: ust)
          actions:
            snapshot session \`ze-session\`, path: /some/path
@@ -524,7 +524,7 @@ test_snapshot_action ()
          errors: none
        - name: T2
          owner uid: ${uid}
-         condition: event rule hit
+         condition: event rule matches
            rule: some-event (type: tracepoint, domain: ust)
          actions:
            snapshot session \`ze-session\`, path: /some/other/path
@@ -532,7 +532,7 @@ test_snapshot_action ()
          errors: none
        - name: T3
          owner uid: ${uid}
-         condition: event rule hit
+         condition: event rule matches
            rule: some-event (type: tracepoint, domain: ust)
          actions:
            snapshot session \`ze-session\`, url: net://1.2.3.4
@@ -540,7 +540,7 @@ test_snapshot_action ()
          errors: none
        - name: T4
          owner uid: ${uid}
-         condition: event rule hit
+         condition: event rule matches
            rule: some-event (type: tracepoint, domain: ust)
          actions:
            snapshot session \`ze-session\`, url: net://1.2.3.4:1234:1235
@@ -548,7 +548,7 @@ test_snapshot_action ()
          errors: none
        - name: T5
          owner uid: ${uid}
-         condition: event rule hit
+         condition: event rule matches
            rule: some-event (type: tracepoint, domain: ust)
          actions:
            snapshot session \`ze-session\`, control url: tcp://1.2.3.4:1111, data url: tcp://1.2.3.4:1112
@@ -556,7 +556,7 @@ test_snapshot_action ()
          errors: none
        - name: T6
          owner uid: ${uid}
-         condition: event rule hit
+         condition: event rule matches
            rule: some-event (type: tracepoint, domain: ust)
          actions:
            snapshot session \`ze-session\`, path: /some/path, max size: 1234
@@ -564,7 +564,7 @@ test_snapshot_action ()
          errors: none
        - name: T7
          owner uid: ${uid}
-         condition: event rule hit
+         condition: event rule matches
            rule: some-event (type: tracepoint, domain: ust)
          actions:
            snapshot session \`ze-session\`, path: /some/path, name: meh
@@ -572,7 +572,7 @@ test_snapshot_action ()
          errors: none
        - name: T8
          owner uid: ${uid}
-         condition: event rule hit
+         condition: event rule matches
            rule: some-event (type: tracepoint, domain: ust)
          actions:
            snapshot session \`ze-session\`, rate policy: after every 10 occurrences
@@ -580,7 +580,7 @@ test_snapshot_action ()
          errors: none
        - name: T9
          owner uid: ${uid}
-         condition: event rule hit
+         condition: event rule matches
            rule: some-event (type: tracepoint, domain: ust)
          actions:
            snapshot session \`ze-session\`, rate policy: once after 10 occurrences
@@ -610,7 +610,7 @@ test_notify_action ()
        cat > "${tmp_expected_stdout}" <<- EOF
        - name: T0
          owner uid: ${uid}
-         condition: event rule hit
+         condition: event rule matches
            rule: some-event (type: tracepoint, domain: ust)
          actions:
            notify, rate policy: once after 5 occurrences
@@ -618,7 +618,7 @@ test_notify_action ()
          errors: none
        - name: T1
          owner uid: ${uid}
-         condition: event rule hit
+         condition: event rule matches
            rule: some-event (type: tracepoint, domain: ust)
          actions:
            notify, rate policy: after every 10 occurrences

diff --git a/tests/regression/tools/trigger/test_remove_trigger_cli b/tests/regression/tools/trigger/test_remove_trigger_cli
index 8d539d4b2670173a7df42a37df4b0e17000c6e62..126355a09107952b4d39cc81df5f1c96c63494ff 100755 (executable)
--- a/tests/regression/tools/trigger/test_remove_trigger_cli
+++ b/tests/regression/tools/trigger/test_remove_trigger_cli
@@ -74,7 +74,7 @@ lttng_add_trigger_ok "DEF" --condition event-rule-matches --domain=user --action
 cat > "${tmp_expected_stdout}" <<- EOF
 - name: ABC
   owner uid: ${uid}
-  condition: event rule hit
+  condition: event rule matches
     rule: aaa (type: tracepoint, domain: ust, filter: p == 2)
   actions:
     notify
@@ -82,7 +82,7 @@ cat > "${tmp_expected_stdout}" <<- EOF
   errors: none
 - name: DEF
   owner uid: ${uid}
-  condition: event rule hit
+  condition: event rule matches
     rule: * (type: tracepoint, domain: ust)
   actions:
     notify
@@ -96,7 +96,7 @@ remove_trigger "ABC"
 cat > "${tmp_expected_stdout}" <<- EOF
 - name: DEF
   owner uid: ${uid}
-  condition: event rule hit
+  condition: event rule matches
     rule: * (type: tracepoint, domain: ust)
   actions:
     notify