X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fnotification%2Fnotification.c;h=a56b7945d2605db870ec788a4d98a01318e81465;hb=a0377dfefe40662ba7d68617bce6ff467114136c;hp=9638bb4527ff8efad3533a90cbfd782e4ddb6d2a;hpb=b2eeb0d5db1245d03f5bfc300a42ee3e9615237f;p=lttng-tools.git diff --git a/tests/regression/tools/notification/notification.c b/tests/regression/tools/notification/notification.c index 9638bb452..a56b7945d 100644 --- a/tests/regression/tools/notification/notification.c +++ b/tests/regression/tools/notification/notification.c @@ -9,7 +9,6 @@ * */ -#include #include #include #include @@ -24,6 +23,7 @@ #include #include +#include #include #include @@ -613,8 +613,8 @@ static int validator_notification_trigger_name( bool name_is_equal; const char *name; - assert(notification); - assert(trigger_name); + LTTNG_ASSERT(notification); + LTTNG_ASSERT(trigger_name); name = get_notification_trigger_name(notification); if (name == NULL) { @@ -742,7 +742,7 @@ int suspend_application(void) /* * Send SIGUSR1 to application instructing it to bypass tracepoint. */ - assert(app_pid > 1); + LTTNG_ASSERT(app_pid > 1); ret = kill(app_pid, SIGUSR1); if (ret) { @@ -774,7 +774,7 @@ int resume_application(void) goto error; } - assert(app_pid > 1); + LTTNG_ASSERT(app_pid > 1); ret = kill(app_pid, SIGUSR1); if (ret) { @@ -908,7 +908,7 @@ void test_triggers_buffer_usage_condition(const char *session_name, /* Safety check */ if (mask_position != test_vector_size -1) { - assert("Logic error for test vector generation"); + LTTNG_ASSERT("Logic error for test vector generation"); } loop_ret = asprintf(&test_tuple_string, "session name %s, channel name %s, threshold ratio %s, threshold byte %s, domain type %s", @@ -981,7 +981,7 @@ void wait_data_pending(const char *session_name) do { ret = lttng_data_pending(session_name); - assert(ret >= 0); + LTTNG_ASSERT(ret >= 0); } while (ret != 0); } @@ -1453,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; @@ -1460,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; + + LTTNG_ASSERT(event_pattern); + LTTNG_ASSERT(trigger_name); + LTTNG_ASSERT(condition); + LTTNG_ASSERT(trigger); + + /* 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; + } - assert(event_pattern); - assert(trigger_name); - assert(condition); - assert(trigger); - - event_rule = lttng_event_rule_tracepoint_create(domain_type); + event_rule = create(); ok(event_rule, "Tracepoint event rule object creation"); - event_rule_status = lttng_event_rule_tracepoint_set_name_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); @@ -1487,14 +1520,13 @@ static void create_tracepoint_event_rule_trigger(const char *event_pattern, int i; bool success = true; - assert(domain_type == LTTNG_DOMAIN_UST); - assert(exclusion_count > 0); + LTTNG_ASSERT(domain_type == LTTNG_DOMAIN_UST); + LTTNG_ASSERT(add_name_pattern_exclusion != NULL); + LTTNG_ASSERT(exclusion_count > 0); for (i = 0; i < exclusion_count; i++) { - event_rule_status = - lttng_event_rule_tracepoint_add_name_pattern_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]); @@ -1861,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); @@ -1966,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); @@ -2054,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_name_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); @@ -2140,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_name_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); @@ -2376,7 +2408,7 @@ static int validator_notification_trigger_capture( field_value_type_to_str( lttng_event_field_value_get_type(captured_field))); - assert(validate); + LTTNG_ASSERT(validate); ret = validate(captured_field, iteration); if (ret) { at_least_one_error = true; @@ -2565,7 +2597,7 @@ int main(int argc, const char *argv[]) * At the moment, the only test case of this scenario is * exclusion which is only supported by UST. */ - assert(domain_type == LTTNG_DOMAIN_UST); + LTTNG_ASSERT(domain_type == LTTNG_DOMAIN_UST); diag("Test tracepoint event rule notifications with exclusion for domain %s", domain_type_string); test_tracepoint_event_rule_notification_exclusion(domain_type); @@ -2576,7 +2608,7 @@ int main(int argc, const char *argv[]) { plan_tests(11); /* Test cases that need the kernel tracer. */ - assert(domain_type == LTTNG_DOMAIN_KERNEL); + LTTNG_ASSERT(domain_type == LTTNG_DOMAIN_KERNEL); diag("Test kprobe event rule notifications for domain %s", domain_type_string); @@ -2589,7 +2621,7 @@ int main(int argc, const char *argv[]) { plan_tests(23); /* Test cases that need the kernel tracer. */ - assert(domain_type == LTTNG_DOMAIN_KERNEL); + LTTNG_ASSERT(domain_type == LTTNG_DOMAIN_KERNEL); diag("Test syscall event rule notifications for domain %s", domain_type_string); @@ -2617,7 +2649,7 @@ int main(int argc, const char *argv[]) testapp_path = argv[5]; test_symbol_name = argv[6]; /* Test cases that need the kernel tracer. */ - assert(domain_type == LTTNG_DOMAIN_KERNEL); + LTTNG_ASSERT(domain_type == LTTNG_DOMAIN_KERNEL); diag("Test userspace-probe event rule notifications for domain %s", domain_type_string); @@ -2637,7 +2669,7 @@ int main(int argc, const char *argv[]) plan_tests(215); break; default: - assert(0); + abort(); } diag("Test tracepoint event rule notification captures for domain %s",