X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fnotification%2Fnotification.c;h=9638bb4527ff8efad3533a90cbfd782e4ddb6d2a;hb=b2eeb0d5db1245d03f5bfc300a42ee3e9615237f;hp=0f1a418112eefedb41401b5c89174b3c9baf4feb;hpb=d891bb526224eeaf1cf688e072c7bf77321c6c2f;p=lttng-tools.git diff --git a/tests/regression/tools/notification/notification.c b/tests/regression/tools/notification/notification.c index 0f1a41811..9638bb452 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( @@ -1223,7 +1220,8 @@ static void test_subscription_twice(const char *session_name, domain_type, BUFFER_USAGE_TYPE_LOW, 0.99, &condition, &action, &trigger); if (ret) { - fail("Setup error on trigger registration"); + fail("Setup error on trigger registration in %s()", + __FUNCTION__); goto end; } @@ -1248,7 +1246,11 @@ static void test_subscription_twice(const char *session_name, "Subscribe to a condition for which subscription was already done"); end: - lttng_unregister_trigger(trigger); + ret = lttng_unregister_trigger(trigger); + if (ret) { + fail("Failed to unregister trigger in %s()", __FUNCTION__); + } + lttng_trigger_destroy(trigger); lttng_notification_channel_destroy(notification_channel); lttng_action_destroy(action); @@ -1452,13 +1454,12 @@ static void create_tracepoint_event_rule_trigger(const char *event_pattern, struct lttng_trigger **trigger) { enum lttng_event_rule_status event_rule_status; - enum lttng_trigger_status trigger_status; - struct lttng_action *tmp_action = NULL; struct lttng_event_rule *event_rule = NULL; struct lttng_condition *tmp_condition = NULL; struct lttng_trigger *tmp_trigger = NULL; int ret; + enum lttng_error_code ret_code; assert(event_pattern); assert(trigger_name); @@ -1468,7 +1469,7 @@ static void create_tracepoint_event_rule_trigger(const char *event_pattern, event_rule = lttng_event_rule_tracepoint_create(domain_type); ok(event_rule, "Tracepoint event rule object creation"); - event_rule_status = lttng_event_rule_tracepoint_set_pattern( + event_rule_status = lttng_event_rule_tracepoint_set_name_pattern( event_rule, event_pattern); ok(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK, "Setting tracepoint event rule pattern: '%s'", @@ -1491,7 +1492,7 @@ static void create_tracepoint_event_rule_trigger(const char *event_pattern, for (i = 0; i < exclusion_count; i++) { event_rule_status = - lttng_event_rule_tracepoint_add_exclusion( + lttng_event_rule_tracepoint_add_name_pattern_exclusion( event_rule, exclusions[i]); if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) { @@ -1504,7 +1505,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) { @@ -1521,12 +1522,8 @@ static void create_tracepoint_event_rule_trigger(const char *event_pattern, tmp_trigger = lttng_trigger_create(tmp_condition, tmp_action); ok(tmp_trigger, "Trigger object creation %s", trigger_name); - trigger_status = lttng_trigger_set_name(tmp_trigger, trigger_name); - ok(trigger_status == LTTNG_TRIGGER_STATUS_OK, - "Setting name to trigger %s", trigger_name); - - ret = lttng_register_trigger(tmp_trigger); - ok(ret == 0, "Trigger registration %s", trigger_name); + ret_code = lttng_register_trigger_with_name(tmp_trigger, trigger_name); + ok(ret_code == LTTNG_OK, "Trigger registration %s", trigger_name); lttng_event_rule_destroy(event_rule); @@ -1835,10 +1832,10 @@ static void test_kprobe_event_rule_notification( enum lttng_domain_type domain_type) { int i, ret; + enum lttng_error_code ret_code; const int notification_count = 3; enum lttng_notification_channel_status nc_status; enum lttng_event_rule_status event_rule_status; - enum lttng_trigger_status trigger_status; struct lttng_notification_channel *notification_channel = NULL; struct lttng_condition *condition = NULL; struct lttng_kernel_probe_location *location = NULL; @@ -1864,20 +1861,15 @@ static void test_kprobe_event_rule_notification( lttng_session_daemon_notification_endpoint); ok(notification_channel, "Notification channel object creation"); - event_rule = lttng_event_rule_kernel_probe_create(); + event_rule = lttng_event_rule_kernel_probe_create(location); ok(event_rule, "kprobe event rule object creation"); - event_rule_status = lttng_event_rule_kernel_probe_set_location( - event_rule, location); - ok(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK, - "Setting kprobe event rule location: '%s'", symbol_name); - event_rule_status = lttng_event_rule_kernel_probe_set_event_name( event_rule, trigger_name); 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. */ @@ -1887,12 +1879,8 @@ static void test_kprobe_event_rule_notification( goto end; } - trigger_status = lttng_trigger_set_name(trigger, trigger_name); - ok(trigger_status == LTTNG_TRIGGER_STATUS_OK, - "Setting trigger name to '%s'", trigger_name); - - ret = lttng_register_trigger(trigger); - if (ret) { + ret_code = lttng_register_trigger_with_name(trigger, trigger_name); + if (ret_code != LTTNG_OK) { fail("Failed to register trigger with kernel probe event rule condition and notify action"); goto end; } @@ -1941,10 +1929,10 @@ static void test_uprobe_event_rule_notification( const char *test_symbol_name) { int i, ret; + enum lttng_error_code ret_code; const int notification_count = 3; enum lttng_notification_channel_status nc_status; enum lttng_event_rule_status event_rule_status; - enum lttng_trigger_status trigger_status; struct lttng_notification_channel *notification_channel = NULL; struct lttng_userspace_probe_location *probe_location = NULL; struct lttng_userspace_probe_location_lookup_method *lookup_method = @@ -1978,20 +1966,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. */ @@ -2001,12 +1984,8 @@ static void test_uprobe_event_rule_notification( goto end; } - trigger_status = lttng_trigger_set_name(trigger, trigger_name); - ok(trigger_status == LTTNG_TRIGGER_STATUS_OK, - "Setting name to trigger '%s'", trigger_name); - - ret = lttng_register_trigger(trigger); - if (ret) { + ret_code = lttng_register_trigger_with_name(trigger, trigger_name); + if (ret_code != LTTNG_OK) { fail("Failed to register trigger with userspace probe event rule condition and notify action"); goto end; } @@ -2053,10 +2032,10 @@ static void test_syscall_event_rule_notification( enum lttng_domain_type domain_type) { int i, ret; + enum lttng_error_code ret_code; const int notification_count = 3; enum lttng_notification_channel_status nc_status; enum lttng_event_rule_status event_rule_status; - enum lttng_trigger_status trigger_status; struct lttng_notification_channel *notification_channel = NULL; struct lttng_condition *condition = NULL; struct lttng_event_rule *event_rule = NULL; @@ -2075,15 +2054,15 @@ 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( + event_rule_status = lttng_event_rule_syscall_set_name_pattern( event_rule, syscall_name); 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. */ @@ -2093,12 +2072,8 @@ static void test_syscall_event_rule_notification( goto end; } - trigger_status = lttng_trigger_set_name(trigger, trigger_name); - ok(trigger_status == LTTNG_TRIGGER_STATUS_OK, - "Setting name to trigger '%s'", trigger_name); - - ret = lttng_register_trigger(trigger); - if (ret) { + ret_code = lttng_register_trigger_with_name(trigger, trigger_name); + if (ret_code != LTTNG_OK) { fail("Failed to register trigger with syscall event rule condition and notify action"); goto end; } @@ -2142,10 +2117,10 @@ static void test_syscall_event_rule_notification_filter( enum lttng_domain_type domain_type) { int i, ret; + enum lttng_error_code ret_code; const int notification_count = 3; enum lttng_notification_channel_status nc_status; enum lttng_event_rule_status event_rule_status; - enum lttng_trigger_status trigger_status; struct lttng_notification_channel *notification_channel = NULL; struct lttng_condition *condition = NULL; struct lttng_event_rule *event_rule = NULL; @@ -2165,10 +2140,10 @@ 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( + event_rule_status = lttng_event_rule_syscall_set_name_pattern( event_rule, syscall_name); ok(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK, "Setting syscall event rule pattern: '%s'", syscall_name); @@ -2178,7 +2153,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 */ @@ -2188,12 +2163,8 @@ static void test_syscall_event_rule_notification_filter( goto end; } - trigger_status = lttng_trigger_set_name(trigger, trigger_name); - ok(trigger_status == LTTNG_TRIGGER_STATUS_OK, - "Setting name to trigger '%s'", trigger_name); - - ret = lttng_register_trigger(trigger); - if (ret) { + ret_code = lttng_register_trigger_with_name(trigger, trigger_name); + if (ret_code != LTTNG_OK) { fail("Failed to register trigger with syscall filtering event rule condition and notify action"); goto end; } @@ -2293,7 +2264,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"); @@ -2316,7 +2287,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; @@ -2329,11 +2301,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; } @@ -2519,7 +2493,7 @@ int main(int argc, const char *argv[]) switch (test_scenario) { case 1: { - plan_tests(44); + plan_tests(41); /* Test cases that need gen-ust-event testapp. */ diag("Test basic notification error paths for %s domain", @@ -2585,7 +2559,7 @@ int main(int argc, const char *argv[]) * Test cases that need a test app with more than one event * type. */ - plan_tests(25); + plan_tests(23); /* * At the moment, the only test case of this scenario is @@ -2600,7 +2574,7 @@ int main(int argc, const char *argv[]) } case 4: { - plan_tests(13); + plan_tests(11); /* Test cases that need the kernel tracer. */ assert(domain_type == LTTNG_DOMAIN_KERNEL); @@ -2613,7 +2587,7 @@ int main(int argc, const char *argv[]) } case 5: { - plan_tests(25); + plan_tests(23); /* Test cases that need the kernel tracer. */ assert(domain_type == LTTNG_DOMAIN_KERNEL); @@ -2633,7 +2607,7 @@ int main(int argc, const char *argv[]) { const char *testapp_path, *test_symbol_name; - plan_tests(13); + plan_tests(11); if (argc < 7) { fail("Missing parameter for tests to run %d", argc); @@ -2657,10 +2631,10 @@ int main(int argc, const char *argv[]) { switch(domain_type) { case LTTNG_DOMAIN_UST: - plan_tests(222); + plan_tests(221); break; case LTTNG_DOMAIN_KERNEL: - plan_tests(216); + plan_tests(215); break; default: assert(0);