X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu-bp.c;h=39a6cd0e9ab3ffe06f1d96eaeb889f77f692ac89;hp=915debe2c5c2f89da1f1d096f9d5712a5283f28a;hb=9d2614f07691a813a3c560a6c0bcd0a7be854ed5;hpb=57760d447eaed07f8a9c6552b8cefc6223ac1158

diff --git a/urcu-bp.c b/urcu-bp.c
index 915debe..39a6cd0 100644
--- a/urcu-bp.c
+++ b/urcu-bp.c
@@ -37,10 +37,43 @@
 
 #include "urcu/map/urcu-bp.h"
 
-#include "urcu-bp-static.h"
+#include "urcu/static/urcu-bp.h"
 /* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */
 #include "urcu-bp.h"
 
+#ifndef MAP_ANONYMOUS
+#define MAP_ANONYMOUS MAP_ANON
+#endif
+
+#ifndef __linux__
+
+#define MREMAP_MAYMOVE	1
+#define MREMAP_FIXED	2
+
+/*
+ * mremap wrapper for non-Linux systems. Maps a RW, anonymous private mapping.
+ * This is not generic.
+*/
+void *mremap(void *old_address, size_t old_size, size_t new_size, int flags)
+{
+	void *new_address;
+
+	assert(flags & MREMAP_MAYMOVE);
+	assert(!(flags & MREMAP_FIXED));
+	new_address = mmap(old_address, new_size,
+			   PROT_READ | PROT_WRITE,
+			   MAP_ANONYMOUS | MAP_PRIVATE,
+			   -1, 0);
+	if (new_address == MAP_FAILED)
+		return MAP_FAILED;
+	if (old_address) {
+		memcpy(new_address, old_address, old_size);
+		munmap(old_address, old_size);
+	}
+	return new_address;
+}
+#endif
+
 /* Sleep delay in us */
 #define RCU_SLEEP_DELAY		1000
 #define ARENA_INIT_ALLOC	16
@@ -250,7 +283,6 @@ static void resize_arena(struct registry_arena *arena, size_t len)
 	if (new_arena == arena->p)
 		return;
 
-	memcpy(new_arena, arena->p, arena->len);
 	bzero(new_arena + arena->len, len - arena->len);
 	arena->p = new_arena;
 }