X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2Ftest_ust_data.c;h=b80cb5b5402eeb26ca2f67cb301a96d8b4714343;hp=cf795cfa0759631867ecf1e22872fa420366a0b2;hb=3968741092cac3eaf33f7bf558bb2b476189470b;hpb=67b2f51c7e8d8e873be92cb45a534855cecaf7de diff --git a/tests/unit/test_ust_data.c b/tests/unit/test_ust_data.c index cf795cfa0..b80cb5b54 100644 --- a/tests/unit/test_ust_data.c +++ b/tests/unit/test_ust_data.c @@ -23,12 +23,14 @@ #include #include #include +#include #include #include #include #include #include +#include #include @@ -48,8 +50,9 @@ int lttng_opt_mi; int ust_consumerd32_fd; int ust_consumerd64_fd; -/* Global variable required by sessiond objects being linked-in */ +/* Global variables required by sessiond objects being linked-in */ struct lttng_ht *agent_apps_ht_by_sock; +struct notification_thread_handle *notification_thread_handle; static const char alphanum[] = "0123456789" @@ -60,6 +63,19 @@ static char random_string[RANDOM_STRING_LEN]; static struct ltt_ust_session *usess; static struct lttng_domain dom; +/* + * Stub to prevent an undefined reference in this test without having to link + * the entire tree because of a cascade of dependencies. This is not used, + * it is just there to prevent GCC from complaining. + */ +int rotate_add_channel_pending(uint64_t key, enum lttng_domain_type domain, + struct ltt_session *session) +{ + ERR("Stub called instead of the real function"); + abort(); + return -1; +} + /* * Return random string of 10 characters. * Not thread-safe. @@ -103,8 +119,11 @@ static void test_create_ust_channel(void) { struct ltt_ust_channel *uchan; struct lttng_channel attr; + struct lttng_channel_extended extended; memset(&attr, 0, sizeof(attr)); + memset(&extended, 0, sizeof(extended)); + attr.attr.extended.ptr = &extended; ok(lttng_strncpy(attr.name, "channel0", sizeof(attr.name)) == 0, "Validate channel name length"); @@ -131,6 +150,7 @@ static void test_create_ust_event(void) { struct ltt_ust_event *event; struct lttng_event ev; + enum lttng_error_code ret; memset(&ev, 0, sizeof(ev)); ok(lttng_strncpy(ev.name, get_random_string(), @@ -139,9 +159,9 @@ static void test_create_ust_event(void) ev.type = LTTNG_EVENT_TRACEPOINT; ev.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL; - event = trace_ust_create_event(&ev, NULL, NULL, NULL, false); + ret = trace_ust_create_event(&ev, NULL, NULL, NULL, false, &event); - ok(event != NULL, "Create UST event"); + ok(ret == LTTNG_OK, "Create UST event"); if (!event) { skip(1, "UST event is null"); @@ -159,6 +179,7 @@ static void test_create_ust_event(void) static void test_create_ust_event_exclusion(void) { + enum lttng_error_code ret; struct ltt_ust_event *event; struct lttng_event ev; char *name; @@ -193,10 +214,10 @@ static void test_create_ust_event_exclusion(void) strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 1), random_name, LTTNG_SYMBOL_NAME_LEN); - event = trace_ust_create_event(&ev, NULL, NULL, exclusion, false); + ret = trace_ust_create_event(&ev, NULL, NULL, exclusion, false, &event); exclusion = NULL; - ok(!event, "Create UST event with identical exclusion names fails"); + ok(ret != LTTNG_OK, "Create UST event with identical exclusion names fails"); exclusion = zmalloc(sizeof(*exclusion) + LTTNG_SYMBOL_NAME_LEN * exclusion_count); @@ -212,8 +233,8 @@ static void test_create_ust_event_exclusion(void) strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 1), get_random_string(), LTTNG_SYMBOL_NAME_LEN); - event = trace_ust_create_event(&ev, NULL, NULL, exclusion, false); - ok(event != NULL, "Create UST event with different exclusion names"); + ret = trace_ust_create_event(&ev, NULL, NULL, exclusion, false, &event); + ok(ret == LTTNG_OK, "Create UST event with different exclusion names"); if (!event) { skip(1, "UST event with exclusion is null"); @@ -257,11 +278,15 @@ int main(int argc, char **argv) diag("UST data structures unit test"); + rcu_register_thread(); + test_create_one_ust_session(); test_create_ust_channel(); test_create_ust_event(); test_create_ust_context(); test_create_ust_event_exclusion(); + rcu_unregister_thread(); + return exit_status(); }