X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=liblttng-ust-libc-wrapper%2Flttng-ust-malloc.c;h=1e9a25e5c89dbbefbf6ff819a3a37a2e7d8d8c24;hb=09f78acbebc1a1ab8f6f138d18684ab8b886a417;hp=4b21c971516d54ce3a5eaac80e63e660f0f14f84;hpb=1ddceb368197a46bcc7bb40054cf3cd51a72840c;p=deliverable%2Flttng-ust.git

diff --git a/liblttng-ust-libc-wrapper/lttng-ust-malloc.c b/liblttng-ust-libc-wrapper/lttng-ust-malloc.c
index 4b21c971..1e9a25e5 100644
--- a/liblttng-ust-libc-wrapper/lttng-ust-malloc.c
+++ b/liblttng-ust-libc-wrapper/lttng-ust-malloc.c
@@ -17,8 +17,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#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>
@@ -92,8 +95,8 @@ void ust_malloc_spin_unlock(pthread_mutex_t *lock)
 #define pthread_mutex_lock ust_malloc_spin_lock
 #define pthread_mutex_unlock ust_malloc_spin_unlock
 static DEFINE_URCU_TLS(int, malloc_nesting);
-#undef ust_malloc_spin_unlock
-#undef ust_malloc_spin_lock
+#undef pthread_mutex_unlock
+#undef pthread_mutex_lock
 #undef calloc
 
 /*
@@ -118,7 +121,7 @@ void *static_calloc_aligned(size_t nmemb, size_t size, size_t alignment)
 	res_offset = CMM_LOAD_SHARED(static_calloc_buf_offset);
 	do {
 		prev_offset = res_offset;
-		aligned_offset = ALIGN(prev_offset + sizeof(size_t), alignment);
+		aligned_offset = LTTNG_UST_ALIGN(prev_offset + sizeof(size_t), alignment);
 		new_offset = aligned_offset + nmemb * size;
 		if (new_offset > sizeof(static_calloc_buf)) {
 			abort();
@@ -417,6 +420,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 +433,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.