X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2Ftest_ust_data.c;h=92f8771898b5167ffd47dc7cf32b52bc8e9a95bb;hp=ae8b1232a02a1b3f0f9a2095f2741c99b975fb10;hb=d7a72c64c5108b76f1fb524633022d621620e718;hpb=f949b23ee2362d8f88cebe3ddc9c7f7f9f1edf17

diff --git a/tests/unit/test_ust_data.c b/tests/unit/test_ust_data.c
index ae8b1232a..92f877189 100644
--- a/tests/unit/test_ust_data.c
+++ b/tests/unit/test_ust_data.c
@@ -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_METADATA_SWITCH_TIMER &&
-	   metadata->attr.read_timer_interval
-			== DEFAULT_METADATA_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;
@@ -151,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");
 
@@ -164,6 +137,45 @@ 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");
+
+	trace_ust_destroy_event(event);
+}
+
+
 static void test_create_ust_context(void)
 {
 	struct lttng_event_context ectx;
@@ -186,10 +198,10 @@ int main(int argc, char **argv)
 	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();
 }