X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust-libc-wrapper%2Flttng-ust-malloc.c;h=f3e1e19e28e52d8d5fe07d399f6c4741d0d87282;hb=f4a90c3e8f3f5e8dd5c1896afb82fa96c1a32f22;hp=4b21c971516d54ce3a5eaac80e63e660f0f14f84;hpb=1ddceb368197a46bcc7bb40054cf3cd51a72840c;p=lttng-ust.git

diff --git a/liblttng-ust-libc-wrapper/lttng-ust-malloc.c b/liblttng-ust-libc-wrapper/lttng-ust-malloc.c
index 4b21c971..f3e1e19e 100644
--- a/liblttng-ust-libc-wrapper/lttng-ust-malloc.c
+++ b/liblttng-ust-libc-wrapper/lttng-ust-malloc.c
@@ -18,7 +18,11 @@
  */
 
 #define _GNU_SOURCE
-#define _LGPL_SOURCE
+/*
+ * Do _not_ define _LGPL_SOURCE because we don't want to create a
+ * circular dependency loop between this malloc wrapper, liburcu and
+ * libc.
+ */
 #include <lttng/ust-dlfcn.h>
 #include <sys/types.h>
 #include <stdio.h>
@@ -417,6 +421,12 @@ int posix_memalign(void **memptr, size_t alignment, size_t size)
 	return retval;
 }
 
+static
+void lttng_ust_fixup_malloc_nesting_tls(void)
+{
+	asm volatile ("" : : "m" (URCU_TLS(malloc_nesting)));
+}
+
 __attribute__((constructor))
 void lttng_ust_malloc_wrapper_init(void)
 {
@@ -424,6 +434,7 @@ void lttng_ust_malloc_wrapper_init(void)
 	if (cur_alloc.calloc) {
 		return;
 	}
+	lttng_ust_fixup_malloc_nesting_tls();
 	/*
 	 * Ensure the allocator is in place before the process becomes
 	 * multithreaded.