X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fnotification%2Fnotification.c;h=aa42d5ef2f9584aad2d8b3cf6796d0917899bb82;hb=46fd07accf36998fca3e43e54513755a98f68f48;hp=c097c102698d88871a3c089a8d5558324a9be2b3;hpb=0efb2ad7fc448283184e43d6fb0915febae45384;p=lttng-tools.git diff --git a/tests/regression/tools/notification/notification.c b/tests/regression/tools/notification/notification.c index c097c1026..aa42d5ef2 100644 --- a/tests/regression/tools/notification/notification.c +++ b/tests/regression/tools/notification/notification.c @@ -1220,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; } @@ -1245,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); @@ -1449,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); @@ -1465,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'", @@ -1488,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) { @@ -1518,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); @@ -1832,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; @@ -1879,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; } @@ -1933,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 = @@ -1970,10 +1966,10 @@ 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(probe_location); + event_rule = lttng_event_rule_kernel_uprobe_create(probe_location); ok(event_rule, "kprobe event rule object creation"); - event_rule_status = lttng_event_rule_userspace_probe_set_event_name( + event_rule_status = lttng_event_rule_kernel_uprobe_set_event_name( event_rule, trigger_name); ok(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK, "Setting uprobe event rule name: '%s'", trigger_name); @@ -1988,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; } @@ -2040,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; @@ -2062,10 +2054,10 @@ 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(LTTNG_EVENT_RULE_SYSCALL_EMISSION_SITE_ENTRY); + event_rule = lttng_event_rule_kernel_syscall_create(LTTNG_EVENT_RULE_KERNEL_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_kernel_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); @@ -2080,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; } @@ -2129,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; @@ -2152,15 +2140,15 @@ 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(LTTNG_EVENT_RULE_SYSCALL_EMISSION_SITE_ENTRY); + event_rule = lttng_event_rule_kernel_syscall_create(LTTNG_EVENT_RULE_KERNEL_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_kernel_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); - event_rule_status = lttng_event_rule_syscall_set_filter( + event_rule_status = lttng_event_rule_kernel_syscall_set_filter( event_rule, filter_pattern); ok(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK, "Setting filter: '%s'", filter_pattern); @@ -2175,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; } @@ -2509,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", @@ -2575,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 @@ -2590,7 +2574,7 @@ int main(int argc, const char *argv[]) } case 4: { - plan_tests(12); + plan_tests(11); /* Test cases that need the kernel tracer. */ assert(domain_type == LTTNG_DOMAIN_KERNEL); @@ -2603,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); @@ -2623,7 +2607,7 @@ int main(int argc, const char *argv[]) { const char *testapp_path, *test_symbol_name; - plan_tests(12); + plan_tests(11); if (argc < 7) { fail("Missing parameter for tests to run %d", argc); @@ -2647,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);