X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fnotification%2Fnotification.c;h=c097c102698d88871a3c089a8d5558324a9be2b3;hb=0efb2ad7fc448283184e43d6fb0915febae45384;hp=e1d57f9635fb15a5ac31bf80810b149a840593a4;hpb=602a6d403fc83a01f2f21fffbd3951197eda91de;p=lttng-tools.git diff --git a/tests/regression/tools/notification/notification.c b/tests/regression/tools/notification/notification.c index e1d57f963..c097c1026 100644 --- a/tests/regression/tools/notification/notification.c +++ b/tests/regression/tools/notification/notification.c @@ -579,33 +579,30 @@ struct capture_base_field_tuple test_capture_base_fields[] = { static const char *get_notification_trigger_name( struct lttng_notification *notification) { - const char *name = NULL; - enum lttng_evaluation_status status; - const struct lttng_evaluation *evaluation; - evaluation = lttng_notification_get_evaluation(notification); - if (evaluation == NULL) { - fail("lttng_notification_get_evaluation"); + const char *trigger_name = NULL; + enum lttng_trigger_status trigger_status; + const struct lttng_trigger *trigger; + + trigger = lttng_notification_get_trigger(notification); + if (!trigger) { + fail("Failed to get trigger from notification"); goto end; } - switch (lttng_evaluation_get_type(evaluation)) { - case LTTNG_CONDITION_TYPE_ON_EVENT: - { - status = lttng_evaluation_on_event_get_trigger_name( - evaluation, &name); - if (status != LTTNG_EVALUATION_STATUS_OK) { - fail("lttng_evaluation_on_event_get_trigger_name"); - name = NULL; - goto end; - } + trigger_status = lttng_trigger_get_name(trigger, &trigger_name); + switch (trigger_status) { + case LTTNG_TRIGGER_STATUS_OK: + break; + case LTTNG_TRIGGER_STATUS_UNSET: + trigger_name = "(anonymous)"; break; - } default: - fail("Wrong notification evaluation type \n"); + fail("Failed to get name from notification's trigger"); goto end; } + end: - return name; + return trigger_name; } static int validator_notification_trigger_name( @@ -1504,7 +1501,7 @@ static void create_tracepoint_event_rule_trigger(const char *event_pattern, ok(success, "Setting tracepoint event rule exclusions"); } - tmp_condition = lttng_condition_on_event_create(event_rule); + tmp_condition = lttng_condition_event_rule_matches_create(event_rule); ok(tmp_condition, "Condition event rule object creation"); if (capture_desc_cb) { @@ -1872,7 +1869,7 @@ static void test_kprobe_event_rule_notification( ok(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK, "Setting kprobe event rule name: '%s'", trigger_name); - condition = lttng_condition_on_event_create(event_rule); + condition = lttng_condition_event_rule_matches_create(event_rule); ok(condition, "Condition event rule object creation"); /* Register the trigger for condition. */ @@ -1973,20 +1970,15 @@ static void test_uprobe_event_rule_notification( lttng_session_daemon_notification_endpoint); ok(notification_channel, "Notification channel object creation"); - event_rule = lttng_event_rule_userspace_probe_create(); + event_rule = lttng_event_rule_userspace_probe_create(probe_location); ok(event_rule, "kprobe event rule object creation"); - event_rule_status = lttng_event_rule_userspace_probe_set_location( - event_rule, probe_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); - condition = lttng_condition_on_event_create(event_rule); + condition = lttng_condition_event_rule_matches_create(event_rule); ok(condition, "Condition event rule object creation"); /* Register the trigger for condition. */ @@ -2070,7 +2062,7 @@ static void test_syscall_event_rule_notification( lttng_session_daemon_notification_endpoint); ok(notification_channel, "Notification channel object creation"); - event_rule = lttng_event_rule_syscall_create(); + event_rule = lttng_event_rule_syscall_create(LTTNG_EVENT_RULE_SYSCALL_EMISSION_SITE_ENTRY); ok(event_rule, "syscall event rule object creation"); event_rule_status = lttng_event_rule_syscall_set_pattern( @@ -2078,7 +2070,7 @@ static void test_syscall_event_rule_notification( ok(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK, "Setting syscall event rule pattern: '%s'", syscall_name); - condition = lttng_condition_on_event_create(event_rule); + condition = lttng_condition_event_rule_matches_create(event_rule); ok(condition, "Condition syscall event rule object creation"); /* Register the trigger for condition. */ @@ -2160,7 +2152,7 @@ static void test_syscall_event_rule_notification_filter( lttng_session_daemon_notification_endpoint); ok(notification_channel, "Notification channel object creation"); - event_rule = lttng_event_rule_syscall_create(); + event_rule = lttng_event_rule_syscall_create(LTTNG_EVENT_RULE_SYSCALL_EMISSION_SITE_ENTRY); ok(event_rule, "syscall event rule object creation"); event_rule_status = lttng_event_rule_syscall_set_pattern( @@ -2173,7 +2165,7 @@ static void test_syscall_event_rule_notification_filter( ok(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK, "Setting filter: '%s'", filter_pattern); - condition = lttng_condition_on_event_create(event_rule); + condition = lttng_condition_event_rule_matches_create(event_rule); ok(condition, "Condition event rule object creation"); /* Register the triggers for condition */ @@ -2288,7 +2280,7 @@ static int generate_capture_descr(struct lttng_condition *condition) goto end; } - cond_status = lttng_condition_on_event_append_capture_descriptor( + cond_status = lttng_condition_event_rule_matches_append_capture_descriptor( condition, expr); if (cond_status != LTTNG_CONDITION_STATUS_OK) { fail("Failed to append capture descriptor"); @@ -2311,7 +2303,8 @@ static int validator_notification_trigger_capture( { int ret; unsigned int capture_count, i; - enum lttng_evaluation_status evaluation_status; + enum lttng_evaluation_event_rule_matches_status + event_rule_matches_evaluation_status; enum lttng_event_field_value_status event_field_value_status; const struct lttng_evaluation *evaluation; const struct lttng_event_field_value *captured_fields; @@ -2324,11 +2317,13 @@ static int validator_notification_trigger_capture( goto end; } - evaluation_status = lttng_evaluation_on_event_get_captured_values( - evaluation, &captured_fields); - if (evaluation_status != LTTNG_EVALUATION_STATUS_OK) { + event_rule_matches_evaluation_status = + lttng_evaluation_event_rule_matches_get_captured_values( + evaluation, &captured_fields); + if (event_rule_matches_evaluation_status != + LTTNG_EVALUATION_EVENT_RULE_MATCHES_STATUS_OK) { diag("Failed to get event rule evaluation captured values: status = %d", - (int) evaluation_status); + (int) event_rule_matches_evaluation_status); ret = 1; goto end; } @@ -2628,7 +2623,7 @@ int main(int argc, const char *argv[]) { const char *testapp_path, *test_symbol_name; - plan_tests(13); + plan_tests(12); if (argc < 7) { fail("Missing parameter for tests to run %d", argc);