X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2Ftest_ust_data.c;h=95c6fe12da691ffd8fb153d644652511eaff92bc;hp=ac3350d796baabe6647d0971b872c3feeeff23fd;hb=3a5f70173aa04d11ccb22694d5d31a702cad33ab;hpb=5c408ad8ef08a226c018702aca969536f36ac4e5 diff --git a/tests/unit/test_ust_data.c b/tests/unit/test_ust_data.c index ac3350d79..95c6fe12d 100644 --- a/tests/unit/test_ust_data.c +++ b/tests/unit/test_ust_data.c @@ -1,23 +1,10 @@ /* - * Copyright (c) 2011 David Goulet + * Copyright (C) 2011 David Goulet * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * as published by the Free Software Foundation; only version 2 - * of the License. + * SPDX-License-Identifier: GPL-2.0-only * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include -#include #include #include #include @@ -28,10 +15,13 @@ #include #include #include +#include #include #include #include +#include + #include /* This path will NEVER be created in this test */ @@ -42,17 +32,7 @@ /* Number of TAP tests in this file */ #define NUM_TESTS 16 -/* For error.h */ -int lttng_opt_quiet = 1; -int lttng_opt_verbose; -int lttng_opt_mi; - -int ust_consumerd32_fd; -int ust_consumerd64_fd; - -/* Global variables required by sessiond objects being linked-in */ -struct lttng_ht *agent_apps_ht_by_sock; -struct notification_thread_handle *notification_thread_handle; +DEFINE_LTTNG_UST_SIGBUS_STATE(); static const char alphanum[] = "0123456789" @@ -60,22 +40,6 @@ static const char alphanum[] = "abcdefghijklmnopqrstuvwxyz"; 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. @@ -95,9 +59,9 @@ static char *get_random_string(void) static void test_create_one_ust_session(void) { - dom.type = LTTNG_DOMAIN_UST; + struct ltt_ust_session *usess = + trace_ust_create_session(42); - usess = trace_ust_create_session(42); ok(usess != NULL, "Create UST session"); if (!usess) { @@ -130,14 +94,14 @@ static void test_create_ust_channel(void) uchan = trace_ust_create_channel(&attr, LTTNG_DOMAIN_UST); ok(uchan != NULL, "Create UST channel"); - if (!usess) { - skip(1, "UST session is null"); + if (!uchan) { + skip(1, "UST channel is null"); return; } ok(uchan->enabled == 0 && strncmp(uchan->name, "channel0", 8) == 0 && - uchan->name[LTTNG_UST_SYM_NAME_LEN - 1] == '\0' && + uchan->name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] == '\0' && uchan->ctx != NULL && uchan->events != NULL && uchan->attr.overwrite == attr.attr.overwrite, @@ -150,6 +114,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(), @@ -158,9 +123,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"); @@ -168,9 +133,9 @@ static void test_create_ust_event(void) } ok(event->enabled == 0 && - event->attr.instrumentation == LTTNG_UST_TRACEPOINT && + event->attr.instrumentation == LTTNG_UST_ABI_TRACEPOINT && strcmp(event->attr.name, ev.name) == 0 && - event->attr.name[LTTNG_UST_SYM_NAME_LEN - 1] == '\0', + event->attr.name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] == '\0', "Validate UST event"); trace_ust_destroy_event(event); @@ -178,11 +143,13 @@ 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; char *random_name; - struct lttng_event_exclusion *exclusion; + struct lttng_event_exclusion *exclusion = NULL; + struct lttng_event_exclusion *exclusion_copy = NULL; const int exclusion_count = 2; memset(&ev, 0, sizeof(ev)); @@ -212,10 +179,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); @@ -225,14 +192,34 @@ static void test_create_ust_event_exclusion(void) goto end; } + exclusion_copy = zmalloc(sizeof(*exclusion) + + LTTNG_SYMBOL_NAME_LEN * exclusion_count); + if (!exclusion_copy) { + skip(2, "zmalloc failed"); + goto end; + } + + /* + * We are giving ownership of the exclusion struct to the + * trace_ust_create_event() function. Make a copy of the exclusion struct + * so we can compare it later. + */ + exclusion->count = exclusion_count; strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 0), get_random_string(), LTTNG_SYMBOL_NAME_LEN); 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"); + exclusion_copy->count = exclusion_count; + strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion_copy, 0), + LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 0), LTTNG_SYMBOL_NAME_LEN); + strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion_copy, 1), + LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 1), LTTNG_SYMBOL_NAME_LEN); + + ret = trace_ust_create_event(&ev, NULL, NULL, exclusion, false, &event); + exclusion = NULL; + ok(ret == LTTNG_OK, "Create UST event with different exclusion names"); if (!event) { skip(1, "UST event with exclusion is null"); @@ -240,17 +227,19 @@ static void test_create_ust_event_exclusion(void) } ok(event->enabled == 0 && - event->attr.instrumentation == LTTNG_UST_TRACEPOINT && - strcmp(event->attr.name, ev.name) == 0 && - event->exclusion != NULL && - event->exclusion->count == exclusion_count && - !memcmp(event->exclusion->names, exclusion->names, - LTTNG_SYMBOL_NAME_LEN * exclusion_count) && - event->attr.name[LTTNG_UST_SYM_NAME_LEN - 1] == '\0', - "Validate UST event and exclusion"); + event->attr.instrumentation == LTTNG_UST_ABI_TRACEPOINT && + strcmp(event->attr.name, ev.name) == 0 && + event->exclusion != NULL && + event->exclusion->count == exclusion_count && + !memcmp(event->exclusion->names, exclusion_copy->names, + LTTNG_SYMBOL_NAME_LEN * exclusion_count) && + event->attr.name[LTTNG_UST_ABI_SYM_NAME_LEN - 1] == '\0', + "Validate UST event and exclusion"); trace_ust_destroy_event(event); end: + free(exclusion); + free(exclusion_copy); return; } @@ -265,8 +254,12 @@ static void test_create_ust_context(void) uctx = trace_ust_create_context(&ectx); ok(uctx != NULL, "Create UST context"); - ok((int) uctx->ctx.ctx == LTTNG_UST_CONTEXT_VTID, - "Validate UST context"); + if (uctx) { + ok((int) uctx->ctx.ctx == LTTNG_UST_ABI_CONTEXT_VTID, + "Validate UST context"); + } else { + skip(1, "Skipping UST context validation as creation failed"); + } free(uctx); }