X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Ftest_ust_data_trace.c;h=459520db1e547e12fe988b5b5c5dc85d053b27f0;hb=bf74a86dd175816a617f2bb3c32214b5a01c4424;hp=e4d42b40ab3b148a78a66d9352436979fbfd870f;hpb=10a8a2237343699e3923d87e24dbf2d7fe225377;p=lttng-tools.git

diff --git a/tests/test_ust_data_trace.c b/tests/test_ust_data_trace.c
index e4d42b40a..459520db1 100644
--- a/tests/test_ust_data_trace.c
+++ b/tests/test_ust_data_trace.c
@@ -27,7 +27,7 @@
 
 #include <lttng/lttng.h>
 #include <bin/lttng-sessiond/lttng-ust-abi.h>
-#include <common/lttng-share.h>
+#include <common/defaults.h>
 #include <bin/lttng-sessiond/trace-ust.h>
 
 #include "utils.h"
@@ -35,33 +35,36 @@
 /* This path will NEVER be created in this test */
 #define PATH1 "/tmp/.test-junk-lttng"
 
+#define RANDOM_STRING_LEN	11
+
 /* For lttngerr.h */
-int opt_quiet = 1;
-int opt_verbose = 0;
+int lttng_opt_quiet = 1;
+int lttng_opt_verbose;
 
 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 char *get_random_string(void)
 {
 	int i;
-	char *str = malloc(11);
 
-	for (i = 0; i < 10; i++) {
-		str[i] = alphanum[rand() % (sizeof(alphanum) - 1)];
+	for (i = 0; i < RANDOM_STRING_LEN - 1; i++) {
+		random_string[i] = alphanum[rand() % (sizeof(alphanum) - 1)];
 	}
 
-	str[10] = '\0';
+	random_string[RANDOM_STRING_LEN - 1] = '\0';
 
-	return str;
+	return random_string;
 }
 
 static void create_one_ust_session(void)
@@ -122,6 +125,8 @@ static void create_ust_channel(void)
 	struct ltt_ust_channel *uchan;
 	struct lttng_channel attr;
 
+	memset(&attr, 0, sizeof(attr));
+
 	strncpy(attr.name, "channel0", 8);
 
 	printf("Creating UST channel: ");
@@ -147,8 +152,10 @@ static void create_ust_event(void)
 	struct ltt_ust_event *event;
 	struct lttng_event ev;
 
+	memset(&ev, 0, sizeof(ev));
 	strncpy(ev.name, get_random_string(), LTTNG_SYMBOL_NAME_LEN);
 	ev.type = LTTNG_EVENT_TRACEPOINT;
+	ev.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
 
 	printf("Creating UST event: ");
 	event = trace_ust_create_event(&ev);
@@ -168,16 +175,18 @@ static void create_ust_event(void)
 
 static void create_ust_context(void)
 {
-	struct lttng_event_context ctx;
+	struct lttng_event_context ectx;
 	struct ltt_ust_context *uctx;
 
+	ectx.ctx = LTTNG_EVENT_CONTEXT_VTID;
+
 	printf("Creating UST context: ");
-	uctx = trace_ust_create_context(&ctx);
+	uctx = trace_ust_create_context(&ectx);
 	assert(uctx != NULL);
 	PRINT_OK();
 
 	printf("Validating UST context: ");
-	assert((int) ctx.ctx == (int)uctx->ctx.ctx);
+	assert((int) uctx->ctx.ctx == LTTNG_UST_CONTEXT_VTID);
 	PRINT_OK();
 }