X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fbigalloc.c;h=9581188cc046f8171241ef5bfde20e64a44e5a0c;hb=5a78c3505ae7fa76a061e26676450049ec5946d5;hp=e4b9faf155ef18690788952e64a1fa16b69699e2;hpb=f3625d622964cf99300ceb7e499b99ebbce9fe69;p=libucw.git

diff --git a/lib/bigalloc.c b/lib/bigalloc.c
index e4b9faf1..9581188c 100644
--- a/lib/bigalloc.c
+++ b/lib/bigalloc.c
@@ -12,19 +12,30 @@
 
 #include <sys/mman.h>
 #include <string.h>
+#include <limits.h>
 
 void *
-page_alloc(unsigned int len)
+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 %d bytes of memory: %m", len);
+    die("Cannot mmap %llu bytes of memory: %m", (long long)len);
+  return p;
+}
+
+void *
+page_alloc_zero(u64 len)
+{
+  void *p = page_alloc(len);
+  bzero(p, len);
   return p;
 }
 
 void
-page_free(void *start, unsigned int len)
+page_free(void *start, u64 len)
 {
   ASSERT(!(len & (CPU_PAGE_SIZE-1)));
   ASSERT(!((uintptr_t) start & (CPU_PAGE_SIZE-1)));
@@ -32,7 +43,7 @@ page_free(void *start, unsigned int len)
 }
 
 void *
-page_realloc(void *start, unsigned int old_len, unsigned int new_len)
+page_realloc(void *start, u64 old_len, u64 new_len)
 {
   void *p = page_alloc(new_len);
   memcpy(p, start, MIN(old_len, new_len));
@@ -49,33 +60,42 @@ big_round(u64 len)
 void *
 big_alloc(u64 len)
 {
-  len = big_round(len);
-#ifndef CPU_64BIT_POINTERS
-  if (len > 0xff000000)
-    die("big_alloc: Size %ju is too large for a 32-bit machine", (uintmax_t) len);
-#endif
+  u64 l = big_round(len);
+  if (l > 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;
+  l += 2*CPU_PAGE_SIZE;
 #endif
-  byte *p = page_alloc(len);
+  byte *p = page_alloc(l);
 #ifdef CONFIG_DEBUG
+  *(u64*)p = len;
   mprotect(p, CPU_PAGE_SIZE, PROT_NONE);
-  mprotect(p+len-CPU_PAGE_SIZE, CPU_PAGE_SIZE, PROT_NONE);
+  mprotect(p+l-CPU_PAGE_SIZE, CPU_PAGE_SIZE, PROT_NONE);
   p += CPU_PAGE_SIZE;
 #endif
   return p;
 }
 
+void *
+big_alloc_zero(u64 len)
+{
+  void *p = big_alloc(len);
+  bzero(p, big_round(len));
+  return p;
+}
+
 void
 big_free(void *start, u64 len)
 {
   byte *p = start;
-  len = big_round(len);
+  u64 l = big_round(len);
 #ifdef CONFIG_DEBUG
   p -= CPU_PAGE_SIZE;
-  len += 2*CPU_PAGE_SIZE;
+  mprotect(p, CPU_PAGE_SIZE, PROT_READ);
+  ASSERT(*(u64*)p == len);
+  l += 2*CPU_PAGE_SIZE;
 #endif
-  page_free(p, len);
+  page_free(p, l);
 }
 
 #ifdef TEST