X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fnotification%2Fnotification.c;h=556a0e0b1b8807618f2bd7bb02ac5a330d7f0772;hb=695f70446965aeac8b1118bb08d572630c96114d;hp=092ac5f1ec5e978fafbdaf89467bf3eb3ac2c6ee;hpb=a5c2d2a71919b8d1542b62f6d32579125cc2c8f8;p=lttng-tools.git diff --git a/tests/regression/tools/notification/notification.c b/tests/regression/tools/notification/notification.c index 092ac5f1e..556a0e0b1 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); @@ -1448,6 +1453,18 @@ static void create_tracepoint_event_rule_trigger(const char *event_pattern, struct lttng_condition **condition, struct lttng_trigger **trigger) { + typedef struct lttng_event_rule *(*event_rule_create)(void); + typedef enum lttng_event_rule_status ( + *event_rule_set_name_pattern)( + struct lttng_event_rule *rule, + const char *pattern); + typedef enum lttng_event_rule_status (*event_rule_set_filter)( + struct lttng_event_rule *rule, + const char *expression); + typedef enum lttng_event_rule_status ( + *event_rule_add_name_pattern_exclusion)( + struct lttng_event_rule * rule, const char *exclusion); + enum lttng_event_rule_status event_rule_status; struct lttng_action *tmp_action = NULL; struct lttng_event_rule *event_rule = NULL; @@ -1455,24 +1472,45 @@ static void create_tracepoint_event_rule_trigger(const char *event_pattern, struct lttng_trigger *tmp_trigger = NULL; int ret; enum lttng_error_code ret_code; + event_rule_create create; + event_rule_set_name_pattern set_name_pattern; + event_rule_set_filter set_filter; + event_rule_add_name_pattern_exclusion add_name_pattern_exclusion; assert(event_pattern); assert(trigger_name); assert(condition); assert(trigger); - event_rule = lttng_event_rule_tracepoint_create(domain_type); + /* Set the function pointers based on the domain type. */ + switch (domain_type) { + case LTTNG_DOMAIN_UST: + create = lttng_event_rule_user_tracepoint_create; + set_name_pattern = lttng_event_rule_user_tracepoint_set_name_pattern; + set_filter = lttng_event_rule_user_tracepoint_set_filter; + add_name_pattern_exclusion = lttng_event_rule_user_tracepoint_add_name_pattern_exclusion; + break; + case LTTNG_DOMAIN_KERNEL: + create = lttng_event_rule_kernel_tracepoint_create; + set_name_pattern = lttng_event_rule_kernel_tracepoint_set_name_pattern; + set_filter = lttng_event_rule_kernel_tracepoint_set_filter; + add_name_pattern_exclusion = NULL; + break; + default: + abort(); + break; + } + + event_rule = create(); ok(event_rule, "Tracepoint event rule object creation"); - event_rule_status = lttng_event_rule_tracepoint_set_pattern( - event_rule, event_pattern); + event_rule_status = set_name_pattern(event_rule, event_pattern); ok(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK, "Setting tracepoint event rule pattern: '%s'", event_pattern); if (filter) { - event_rule_status = lttng_event_rule_tracepoint_set_filter( - event_rule, filter); + event_rule_status = set_filter(event_rule, filter); ok(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK, "Setting tracepoint event rule filter: '%s'", filter); @@ -1483,13 +1521,12 @@ static void create_tracepoint_event_rule_trigger(const char *event_pattern, bool success = true; assert(domain_type == LTTNG_DOMAIN_UST); + assert(add_name_pattern_exclusion != NULL); assert(exclusion_count > 0); for (i = 0; i < exclusion_count; i++) { - event_rule_status = - lttng_event_rule_tracepoint_add_exclusion( - event_rule, - exclusions[i]); + event_rule_status = add_name_pattern_exclusion( + event_rule, exclusions[i]); if (event_rule_status != LTTNG_EVENT_RULE_STATUS_OK) { fail("Setting tracepoint event rule exclusion '%s'.", exclusions[i]); @@ -1856,10 +1893,10 @@ 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(location); + event_rule = lttng_event_rule_kernel_kprobe_create(location); ok(event_rule, "kprobe event rule object creation"); - event_rule_status = lttng_event_rule_kernel_probe_set_event_name( + event_rule_status = lttng_event_rule_kernel_kprobe_set_event_name( event_rule, trigger_name); ok(event_rule_status == LTTNG_EVENT_RULE_STATUS_OK, "Setting kprobe event rule name: '%s'", trigger_name); @@ -1961,10 +1998,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); @@ -2049,10 +2086,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); @@ -2135,15 +2172,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); @@ -2569,7 +2606,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); @@ -2582,7 +2619,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); @@ -2602,7 +2639,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); @@ -2629,7 +2666,7 @@ int main(int argc, const char *argv[]) plan_tests(221); break; case LTTNG_DOMAIN_KERNEL: - plan_tests(216); + plan_tests(215); break; default: assert(0);