X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2Ftest_ust_data.c;h=52b93e9f6b87013bda56f56c34e1d7f65cfabc1c;hp=0f1c99b95d90a650c826a8d7aec527644baa336a;hb=d28f6a948209434945e785f2ad3b89aaa67897e4;hpb=5d2e1e66a968d9e555f9b8b00d0589ebfaf3de32

diff --git a/tests/unit/test_ust_data.c b/tests/unit/test_ust_data.c
index 0f1c99b95..52b93e9f6 100644
--- a/tests/unit/test_ust_data.c
+++ b/tests/unit/test_ust_data.c
@@ -29,11 +29,10 @@
 #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 <tap/tap.h>
 
-#include "utils.h"
-
 /* This path will NEVER be created in this test */
 #define PATH1 "/tmp/.test-junk-lttng"
 
@@ -46,6 +45,9 @@
 int lttng_opt_quiet = 1;
 int lttng_opt_verbose;
 
+int ust_consumerd32_fd;
+int ust_consumerd64_fd;
+
 static const char alphanum[] =
 	"0123456789"
 	"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
@@ -76,14 +78,12 @@ static void test_create_one_ust_session(void)
 {
 	dom.type = LTTNG_DOMAIN_UST;
 
-	usess = trace_ust_create_session(PATH1, 42);
+	usess = trace_ust_create_session(42);
 	ok(usess != NULL, "Create UST session");
 
 	ok(usess->id == 42 &&
 	   usess->start_trace == 0 &&
 	   usess->domain_global.channels != NULL &&
-	   usess->domain_pid != NULL &&
-	   usess->domain_exec != NULL &&
 	   usess->uid == 0 &&
 	   usess->gid == 0,
 	   "Validate UST session");
@@ -91,33 +91,6 @@ static void test_create_one_ust_session(void)
 	trace_ust_destroy_session(usess);
 }
 
-static void test_create_ust_metadata(void)
-{
-	struct ltt_ust_metadata *metadata;
-
-	assert(usess != NULL);
-
-	metadata = trace_ust_create_metadata(PATH1);
-	ok(metadata != NULL, "Create UST metadata");
-
-	ok(metadata->handle == -1 &&
-	   strlen(metadata->pathname) &&
-	   metadata->attr.overwrite
-			== DEFAULT_CHANNEL_OVERWRITE &&
-	   metadata->attr.subbuf_size
-			== default_get_metadata_subbuf_size() &&
-	   metadata->attr.num_subbuf
-			== DEFAULT_METADATA_SUBBUF_NUM &&
-	   metadata->attr.switch_timer_interval
-			== DEFAULT_UST_CHANNEL_SWITCH_TIMER &&
-	   metadata->attr.read_timer_interval
-			== DEFAULT_UST_CHANNEL_READ_TIMER &&
-	   metadata->attr.output == LTTNG_UST_MMAP,
-	   "Validate UST session metadata");
-
-	trace_ust_destroy_metadata(metadata);
-}
-
 static void test_create_ust_channel(void)
 {
 	struct ltt_ust_channel *uchan;
@@ -127,11 +100,10 @@ static void test_create_ust_channel(void)
 
 	strncpy(attr.name, "channel0", 8);
 
-	uchan = trace_ust_create_channel(&attr, PATH1);
+	uchan = trace_ust_create_channel(&attr);
 	ok(uchan != NULL, "Create UST channel");
 
 	ok(uchan->enabled == 0 &&
-	   strcmp(PATH1, uchan->pathname) == 0 &&
 	   strncmp(uchan->name, "channel0", 8) == 0 &&
 	   uchan->name[LTTNG_UST_SYM_NAME_LEN - 1] == '\0' &&
 	   uchan->ctx != NULL &&
@@ -152,7 +124,7 @@ 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);
+	event = trace_ust_create_event(&ev, NULL, NULL);
 
 	ok(event != NULL, "Create UST event");
 
@@ -165,6 +137,46 @@ static void test_create_ust_event(void)
 	trace_ust_destroy_event(event);
 }
 
+static void test_create_ust_event_exclusion(void)
+{
+	struct ltt_ust_event *event;
+	struct lttng_event ev;
+	char *name;
+	struct lttng_event_exclusion *exclusion;
+
+	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);
+
+	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);
+
+	event = trace_ust_create_event(&ev, NULL, exclusion);
+
+	ok(event != NULL, "Create UST event with exclusion");
+
+	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");
+
+	free(exclusion);
+	trace_ust_destroy_event(event);
+}
+
+
 static void test_create_ust_context(void)
 {
 	struct lttng_event_context ectx;
@@ -177,19 +189,20 @@ static void test_create_ust_context(void)
 
 	ok((int) uctx->ctx.ctx == LTTNG_UST_CONTEXT_VTID,
 	   "Validate UST context");
+	free(uctx);
 }
 
 int main(int argc, char **argv)
 {
-	diag("UST data structures unit test");
-
 	plan_tests(NUM_TESTS);
 
+	diag("UST data structures unit test");
+
 	test_create_one_ust_session();
-	test_create_ust_metadata();
 	test_create_ust_channel();
 	test_create_ust_event();
 	test_create_ust_context();
+	test_create_ust_event_exclusion();
 
 	return exit_status();
 }