X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;ds=sidebyside;f=liblttng-ust%2Fltt-events.c;h=72e315ec8593bb229f83788a681f84aae3e36147;hb=eddd8d5d1a04887d1979417f1aca6c2f109bfe50;hp=b6d4f9b51f6f50bdea1f3b2e5eeed2299a143307;hpb=2694975d1855ecc24d2178c9be20a5ba958540a3;p=lttng-ust.git

diff --git a/liblttng-ust/ltt-events.c b/liblttng-ust/ltt-events.c
index b6d4f9b5..72e315ec 100644
--- a/liblttng-ust/ltt-events.c
+++ b/liblttng-ust/ltt-events.c
@@ -493,7 +493,7 @@ int ltt_event_create(struct ltt_channel *chan,
 	struct ltt_event *event;
 	int ret = 0;
 
-	if (chan->used_event_id == -1UL) {
+	if (chan->used_event_id == -1U) {
 		ret = -ENOMEM;
 		goto full;
 	}
@@ -1455,3 +1455,16 @@ int ltt_wildcard_disable(struct session_wildcard *wildcard)
 	wildcard->enabled = 0;
 	return 0;
 }
+
+/*
+ * Take the TLS "fault" in libuuid if dlopen'd, which can take the
+ * dynamic linker mutex, outside of the UST lock, since the UST lock is
+ * taken in constructors, which are called with dynamic linker mutex
+ * held.
+ */
+void lttng_fixup_event_tls(void)
+{
+	unsigned char uuid[37];
+
+	(void) uuid_generate(uuid);
+}