X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fbigalloc.c;h=a1060e60be7d3cb7185bfff87b4f4c92aa33083f;hb=8c48090e240d68564c79eb29ac9004cc911bb5d0;hp=ad6aeff0cd523e9acc97bcc53408e8367abb989d;hpb=bc64ab012833cd38592982444fd8c35b6e203250;p=libucw.git

diff --git a/lib/bigalloc.c b/lib/bigalloc.c
index ad6aeff0..a1060e60 100644
--- a/lib/bigalloc.c
+++ b/lib/bigalloc.c
@@ -1,7 +1,8 @@
 /*
  *	UCW Library -- Allocation of Large Aligned Buffers
  *
- *	(c) 2006 Martin Mares <mj@ucw.cz>
+ *	(c) 2006--2007 Martin Mares <mj@ucw.cz>
+ *	(c) 2007 Pavel Charvat <char@ucw.cz>
  *
  *	This software may be freely distributed and used according to the terms
  *	of the GNU Lesser General Public License.
@@ -10,23 +11,54 @@
 #include "lib/lib.h"
 
 #include <sys/mman.h>
+#include <string.h>
+#include <limits.h>
 
-static unsigned int
-big_round(unsigned int len)
+void *
+page_alloc(u64 len)
+{
+  if (len > SIZE_MAX)
+    die("page_alloc: Size %llu is too large for the current architecture", (long long) len);
+  ASSERT(!(len & (CPU_PAGE_SIZE-1)));
+  byte *p = mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);
+  if (p == (byte*) MAP_FAILED)
+    die("Cannot mmap %llu bytes of memory: %m", (long long)len);
+  return p;
+}
+
+void
+page_free(void *start, u64 len)
+{
+  ASSERT(!(len & (CPU_PAGE_SIZE-1)));
+  ASSERT(!((uintptr_t) start & (CPU_PAGE_SIZE-1)));
+  munmap(start, len);
+}
+
+void *
+page_realloc(void *start, u64 old_len, u64 new_len)
 {
-  return ALIGN_TO(len, CPU_PAGE_SIZE);
+  void *p = page_alloc(new_len);
+  memcpy(p, start, MIN(old_len, new_len));
+  page_free(start, old_len);
+  return p;
+}
+
+static u64
+big_round(u64 len)
+{
+  return ALIGN_TO(len, (u64)CPU_PAGE_SIZE);
 }
 
 void *
-big_alloc(unsigned int len)
+big_alloc(u64 len)
 {
   len = big_round(len);
+  if (len > SIZE_MAX - 2*CPU_PAGE_SIZE)
+    die("big_alloc: Size %llu is too large for the current architecture", (long long) len);
 #ifdef CONFIG_DEBUG
   len += 2*CPU_PAGE_SIZE;
 #endif
-  byte *p = mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);
-  if (p == (byte*) MAP_FAILED)
-    die("Cannot mmap %d bytes of memory: %m", len);
+  byte *p = page_alloc(len);
 #ifdef CONFIG_DEBUG
   mprotect(p, CPU_PAGE_SIZE, PROT_NONE);
   mprotect(p+len-CPU_PAGE_SIZE, CPU_PAGE_SIZE, PROT_NONE);
@@ -36,16 +68,15 @@ big_alloc(unsigned int len)
 }
 
 void
-big_free(void *start, unsigned int len)
+big_free(void *start, u64 len)
 {
   byte *p = start;
-  ASSERT(!((uintptr_t) p & (CPU_PAGE_SIZE-1)));
   len = big_round(len);
 #ifdef CONFIG_DEBUG
   p -= CPU_PAGE_SIZE;
   len += 2*CPU_PAGE_SIZE;
 #endif
-  munmap(p, len);
+  page_free(p, len);
 }
 
 #ifdef TEST