X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=urcu-bp.c;h=273acb88cf2d1749e57bb840bc6e78ab414ebf1d;hb=408f6d9220576478e5ce9a20256d579fc9bfa954;hp=2973574436b7977e491df3a6634e5c99d2ea2a85;hpb=4a52c06932706e3878e6dff6b8c5418641b872e5;p=urcu.git

diff --git a/urcu-bp.c b/urcu-bp.c
index 2973574..273acb8 100644
--- a/urcu-bp.c
+++ b/urcu-bp.c
@@ -45,6 +45,35 @@
 #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
@@ -266,7 +295,7 @@ static void add_thread(void)
 	if (registry_arena.len
 	    < registry_arena.used + sizeof(struct rcu_reader))
 		resize_arena(&registry_arena,
-		max(registry_arena.len << 1, ARENA_INIT_ALLOC));
+		caa_max(registry_arena.len << 1, ARENA_INIT_ALLOC));
 	/*
 	 * Find a free spot.
 	 */