[llvm-commits] CVS: poolalloc/runtime/FreeListAllocator/PoolAllocator.cpp

[John Criswell]

Changes in directory poolalloc/runtime/FreeListAllocator:

PoolAllocator.cpp updated: 1.10 -> 1.11

---
Log message:

Added run time checks for big problems.



---
Diffs of the changes:  (+20 -2)

Index: poolalloc/runtime/FreeListAllocator/PoolAllocator.cpp
diff -u poolalloc/runtime/FreeListAllocator/PoolAllocator.cpp:1.10 poolalloc/runtime/FreeListAllocator/PoolAllocator.cpp:1.11
--- poolalloc/runtime/FreeListAllocator/PoolAllocator.cpp:1.10	Tue Nov 11 14:13:42 2003
+++ poolalloc/runtime/FreeListAllocator/PoolAllocator.cpp	Tue Nov 11 14:37:47 2003
@@ -17,6 +17,7 @@
 #include "PoolSlab.h"
 #include <assert.h>
 #include <stdlib.h>
+#include <iostream>
 
 #undef assert
 #define assert(X)
@@ -48,18 +49,35 @@
   MaxNodesPerPage = (PageSize - sizeof (struct SlabHeader)) / (sizeof (NodePointer) + NodeSize);
 
   //
+  // If we can't fit a node into a page, give up.
+  //
+  if (MaxNodesPerPage == 0)
+  {
+    std::cerr << "Node size is too large" << std::endl;
+    abort();
+  }
+
+  //
   // Allocate the memory for the slab and initialize its contents.
   //
   if (NodesPerSlab > MaxNodesPerPage)
   {
     NewSlab = (struct SlabHeader *) GetPages ((NodeSize * NodesPerSlab / PageSize) + 1);
-    assert (NewSlab != NULL);
+    if (NewSlab == NULL)
+    {
+      std::cerr << "Failed large allocation" << std::endl;
+      abort();
+    }
     NewSlab->IsArray = 1;
   }
   else
   {
     NewSlab = (struct SlabHeader *) AllocatePage ();
-    assert (NewSlab != NULL);
+    if (NewSlab == NULL)
+    {
+      std::cerr << "Failed regular allocation" << std::endl;
+      abort();
+    }
     NewSlab->IsArray = 0;
 
     //