X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2Ftest_ust_data.c;h=a900d1274e44effe84f50de7a9691e2fcdf1cec3;hp=dd00089266ad7770ce4c64e18b1340439f167c9b;hb=44cdb3a261262ebabea3fb0cae9360ac05e66f2c;hpb=c7e35b037773dbbfe10178c946ba44feefb226e1 diff --git a/tests/unit/test_ust_data.c b/tests/unit/test_ust_data.c index dd0008926..a900d1274 100644 --- a/tests/unit/test_ust_data.c +++ b/tests/unit/test_ust_data.c @@ -16,7 +16,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#define _GNU_SOURCE #include #include #include @@ -24,12 +23,14 @@ #include #include #include +#include #include #include #include #include #include +#include #include @@ -39,25 +40,19 @@ #define RANDOM_STRING_LEN 11 /* Number of TAP tests in this file */ -#define NUM_TESTS 10 +#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; - static const char alphanum[] = "0123456789" "ABCDEFGHIJKLMNOPQRSTUVWXYZ" "abcdefghijklmnopqrstuvwxyz"; static char random_string[RANDOM_STRING_LEN]; -static struct ltt_ust_session *usess; -static struct lttng_domain dom; - /* * Return random string of 10 characters. * Not thread-safe. @@ -77,11 +72,16 @@ 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) { + skip(1, "UST session is null"); + return; + } + ok(usess->id == 42 && usess->active == 0 && usess->domain_global.channels != NULL && @@ -96,14 +96,22 @@ 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; - strncpy(attr.name, "channel0", 8); - - uchan = trace_ust_create_channel(&attr); + ok(lttng_strncpy(attr.name, "channel0", sizeof(attr.name)) == 0, + "Validate channel name length"); + uchan = trace_ust_create_channel(&attr, LTTNG_DOMAIN_UST); ok(uchan != NULL, "Create UST channel"); + 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' && @@ -119,15 +127,23 @@ 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)); - strncpy(ev.name, get_random_string(), LTTNG_SYMBOL_NAME_LEN); + ok(lttng_strncpy(ev.name, get_random_string(), + LTTNG_SYMBOL_NAME_LEN) == 0, + "Validate string length"); ev.type = LTTNG_EVENT_TRACEPOINT; ev.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL; - event = trace_ust_create_event(&ev, NULL, NULL, NULL); + ret = trace_ust_create_event(&ev, NULL, NULL, NULL, false, &event); + + ok(ret == LTTNG_OK, "Create UST event"); - ok(event != NULL, "Create UST event"); + if (!event) { + skip(1, "UST event is null"); + return; + } ok(event->enabled == 0 && event->attr.instrumentation == LTTNG_UST_TRACEPOINT && @@ -140,40 +156,104 @@ 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; - struct lttng_event_exclusion *exclusion; + char *random_name; + struct lttng_event_exclusion *exclusion = NULL; + struct lttng_event_exclusion *exclusion_copy = NULL; + const int exclusion_count = 2; memset(&ev, 0, sizeof(ev)); /* make a wildcarded event name */ name = get_random_string(); name[strlen(name) - 1] = '*'; - strncpy(ev.name, name, LTTNG_SYMBOL_NAME_LEN); + ok(lttng_strncpy(ev.name, name, LTTNG_SYMBOL_NAME_LEN) == 0, + "Validate string length"); ev.type = LTTNG_EVENT_TRACEPOINT; ev.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL; /* set up an exclusion set */ - exclusion = zmalloc(sizeof(*exclusion) + LTTNG_SYMBOL_NAME_LEN); - exclusion->count = 1; - strncpy((char *)(exclusion->names), get_random_string(), LTTNG_SYMBOL_NAME_LEN); + exclusion = zmalloc(sizeof(*exclusion) + + LTTNG_SYMBOL_NAME_LEN * exclusion_count); + ok(exclusion != NULL, "Create UST exclusion"); + if (!exclusion) { + skip(4, "zmalloc failed"); + goto end; + } + + exclusion->count = exclusion_count; + random_name = get_random_string(); + strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 0), random_name, + LTTNG_SYMBOL_NAME_LEN); + strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 1), random_name, + LTTNG_SYMBOL_NAME_LEN); - event = trace_ust_create_event(&ev, NULL, NULL, exclusion); + ret = trace_ust_create_event(&ev, NULL, NULL, exclusion, false, &event); + exclusion = NULL; - ok(event != NULL, "Create UST event with exclusion"); + ok(ret != LTTNG_OK, "Create UST event with identical exclusion names fails"); + + exclusion = zmalloc(sizeof(*exclusion) + + LTTNG_SYMBOL_NAME_LEN * exclusion_count); + ok(exclusion != NULL, "Create UST exclusion"); + if (!exclusion) { + skip(2, "zmalloc failed"); + 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); + + 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"); + goto end; + } ok(event->enabled == 0 && - event->attr.instrumentation == LTTNG_UST_TRACEPOINT && - strcmp(event->attr.name, ev.name) == 0 && - event->exclusion != NULL && - event->exclusion->count == 1 && - strcmp((char *)(event->exclusion->names), (char *)(exclusion->names)) == 0 && - event->attr.name[LTTNG_UST_SYM_NAME_LEN - 1] == '\0', - "Validate UST event and exclusion"); + 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_copy->names, + LTTNG_SYMBOL_NAME_LEN * exclusion_count) && + event->attr.name[LTTNG_UST_SYM_NAME_LEN - 1] == '\0', + "Validate UST event and exclusion"); trace_ust_destroy_event(event); +end: + free(exclusion); + free(exclusion_copy); + return; } @@ -187,8 +267,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_CONTEXT_VTID, + "Validate UST context"); + } else { + skip(1, "Skipping UST context validation as creation failed"); + } free(uctx); } @@ -198,11 +282,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(); }