#include <string.h>
#include <unistd.h>
#include <time.h>
+#include <urcu.h>
#include <lttng/lttng.h>
#include <bin/lttng-sessiond/lttng-ust-abi.h>
#include <common/defaults.h>
#include <bin/lttng-sessiond/trace-ust.h>
#include <bin/lttng-sessiond/ust-app.h>
+#include <bin/lttng-sessiond/notification-thread.h>
#include <tap/tap.h>
#define RANDOM_STRING_LEN 11
/* Number of TAP tests in this file */
-#define NUM_TESTS 13
+#define NUM_TESTS 16
/* For error.h */
int lttng_opt_quiet = 1;
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"
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 &&
{
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");
uchan = trace_ust_create_channel(&attr, LTTNG_DOMAIN_UST);
ok(uchan != NULL, "Create UST channel");
+ if (!usess) {
+ skip(1, "UST session is null");
+ return;
+ }
+
ok(uchan->enabled == 0 &&
strncmp(uchan->name, "channel0", 8) == 0 &&
uchan->name[LTTNG_UST_SYM_NAME_LEN - 1] == '\0' &&
struct lttng_event ev;
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;
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 &&
strcmp(event->attr.name, ev.name) == 0 &&
/* 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);
+ ok(exclusion != NULL, "Create UST exclusion");
if (!exclusion) {
- PERROR("zmalloc");
+ skip(4, "zmalloc failed");
+ goto end;
}
- ok(exclusion != NULL, "Create UST exclusion");
-
exclusion->count = exclusion_count;
random_name = get_random_string();
strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 0), random_name,
LTTNG_SYMBOL_NAME_LEN);
event = trace_ust_create_event(&ev, NULL, NULL, exclusion, false);
+ exclusion = NULL;
ok(!event, "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) {
- PERROR("zmalloc");
+ skip(2, "zmalloc failed");
+ goto end;
}
exclusion->count = exclusion_count;
get_random_string(), LTTNG_SYMBOL_NAME_LEN);
event = trace_ust_create_event(&ev, NULL, NULL, exclusion, false);
- assert(event != NULL);
-
ok(event != NULL, "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 &&
"Validate UST event and exclusion");
trace_ust_destroy_event(event);
+end:
+ return;
}
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();
}