#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>
int lttng_opt_verbose;
int lttng_opt_mi;
-int ust_consumerd32_fd;
-int ust_consumerd64_fd;
-
-/* Global variable required by sessiond objects being linked-in */
-struct lttng_ht *agent_apps_ht_by_sock;
-
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.
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 &&
{
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 (!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' &&
{
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(),
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");
+ return;
+ }
ok(event->enabled == 0 &&
event->attr.instrumentation == LTTNG_UST_TRACEPOINT &&
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));
/* 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,
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);
+ ok(exclusion != NULL, "Create UST exclusion");
if (!exclusion) {
- PERROR("zmalloc");
+ skip(2, "zmalloc failed");
+ goto end;
}
- ok(exclusion != NULL, "Create UST exclusion");
+ 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),
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);
- assert(event != NULL);
+ 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");
- 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 &&
- 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_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;
}
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);
}
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();
}
projects / lttng-tools.git / blobdiff