X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2Ftest_ust_data.c;h=ac3350d796baabe6647d0971b872c3feeeff23fd;hp=cf795cfa0759631867ecf1e22872fa420366a0b2;hb=5c408ad8ef08a226c018702aca969536f36ac4e5;hpb=67b2f51c7e8d8e873be92cb45a534855cecaf7de

diff --git a/tests/unit/test_ust_data.c b/tests/unit/test_ust_data.c
index cf795cfa0..ac3350d79 100644
--- a/tests/unit/test_ust_data.c
+++ b/tests/unit/test_ust_data.c
@@ -23,12 +23,14 @@
 #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>
 
@@ -48,8 +50,9 @@ int lttng_opt_mi;
 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"
@@ -60,6 +63,19 @@ static char random_string[RANDOM_STRING_LEN];
 static struct ltt_ust_session *usess;
 static struct lttng_domain dom;
 
+/*
+ * Stub to prevent an undefined reference in this test without having to link
+ * the entire tree because of a cascade of dependencies. This is not used,
+ * it is just there to prevent GCC from complaining.
+ */
+int rotate_add_channel_pending(uint64_t key, enum lttng_domain_type domain,
+		struct ltt_session *session)
+{
+	ERR("Stub called instead of the real function");
+	abort();
+	return -1;
+}
+
 /*
  * Return random string of 10 characters.
  * Not thread-safe.
@@ -103,8 +119,11 @@ static void test_create_ust_channel(void)
 {
 	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");
@@ -257,11 +276,15 @@ int main(int argc, char **argv)
 
 	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();
 }