X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2Ftest_ust_data.c;h=2f08b38c0bffe44ffd42045493f3c010a73bd6be;hp=294b5c58941d7ab8eee7ee4b2d34f33ae0ca9fa7;hb=41d7b959e0bdbd6ae4ced9129ecda5d961377548;hpb=e3bef7256ce348cf232ede3f36721e661cfda2a7

diff --git a/tests/unit/test_ust_data.c b/tests/unit/test_ust_data.c
index 294b5c589..2f08b38c0 100644
--- a/tests/unit/test_ust_data.c
+++ b/tests/unit/test_ust_data.c
@@ -33,15 +33,13 @@
 
 #include <tap/tap.h>
 
-#include "utils.h"
-
 /* This path will NEVER be created in this test */
 #define PATH1 "/tmp/.test-junk-lttng"
 
 #define RANDOM_STRING_LEN	11
 
 /* Number of TAP tests in this file */
-#define NUM_TESTS 10
+#define NUM_TESTS 12
 
 /* For lttngerr.h */
 int lttng_opt_quiet = 1;
@@ -80,7 +78,7 @@ 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 &&
@@ -111,9 +109,9 @@ static void test_create_ust_metadata(void)
 	   metadata->attr.num_subbuf
 			== DEFAULT_METADATA_SUBBUF_NUM &&
 	   metadata->attr.switch_timer_interval
-			== DEFAULT_UST_CHANNEL_SWITCH_TIMER &&
+			== DEFAULT_METADATA_SWITCH_TIMER &&
 	   metadata->attr.read_timer_interval
-			== DEFAULT_UST_CHANNEL_READ_TIMER &&
+			== DEFAULT_METADATA_READ_TIMER &&
 	   metadata->attr.output == LTTNG_UST_MMAP,
 	   "Validate UST session metadata");
 
@@ -129,7 +127,7 @@ 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 &&
@@ -153,7 +151,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");
 
@@ -166,6 +164,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;
@@ -178,6 +216,7 @@ 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)
@@ -191,6 +230,7 @@ int main(int argc, char **argv)
 	test_create_ust_channel();
 	test_create_ust_event();
 	test_create_ust_context();
+	test_create_ust_event_exclusion();
 
 	return exit_status();
 }