mds: throw std::bad_alloc on boost:pool<> depletion

A bit more informative than a segfault from this=NULL in the constructor.

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/mds/CDentry.h b/src/mds/CDentry.h
index 0971156b060ee4a3d9588f3f725e4ca144909e14..b67a71549a9579af0b91dfcfc8f0d13c89ea93c0 100644 (file)
--- a/src/mds/CDentry.h
+++ b/src/mds/CDentry.h
@@ -53,7 +53,10 @@ private:
   static boost::pool<> pool;
 public:
   static void *operator new(size_t num_bytes) { 
-    return pool.malloc();
+    void *n = pool.malloc();
+    if (!n)
+      throw std::bad_alloc();
+    return n;
   }
   void operator delete(void *p) {
     pool.free(p);

diff --git a/src/mds/CDir.h b/src/mds/CDir.h
index 18ee0785eacbdf1eb0be42102ef141f7d329ba17..a01e57311e62c7ff79e1f2447e578d737d2c36f5 100644 (file)
--- a/src/mds/CDir.h
+++ b/src/mds/CDir.h
@@ -49,7 +49,10 @@ private:
   static boost::pool<> pool;
 public:
   static void *operator new(size_t num_bytes) { 
-    return pool.malloc();
+    void *n = pool.malloc();
+    if (!n)
+      throw std::bad_alloc();
+    return n;
   }
   void operator delete(void *p) {
     pool.free(p);

diff --git a/src/mds/CInode.h b/src/mds/CInode.h
index 2d6d0e903ef15df9f86eee4f5796025e0fb9addd..e1aec5ee30b32e833671f833397b7a662c7cff29 100644 (file)
--- a/src/mds/CInode.h
+++ b/src/mds/CInode.h
@@ -61,7 +61,10 @@ private:
   static boost::pool<> pool;
 public:
   static void *operator new(size_t num_bytes) { 
-    return pool.malloc();
+    void *n = pool.malloc();
+    if (!n)
+      throw std::bad_alloc();
+    return n;
   }
   void operator delete(void *p) {
     pool.free(p);

diff --git a/src/mds/Capability.h b/src/mds/Capability.h
index 8bc5c90faa3f8faa2a6138b0aa3b05c08ea4ea05..4793289834069f946698a69d650ecdb680deed9b 100644 (file)
--- a/src/mds/Capability.h
+++ b/src/mds/Capability.h
@@ -62,7 +62,10 @@ private:
   static boost::pool<> pool;
 public:
   static void *operator new(size_t num_bytes) { 
-    return pool.malloc();
+    void *n = pool.malloc();
+    if (!n)
+      throw std::bad_alloc();
+    return n;
   }
   void operator delete(void *p) {
     pool.free(p);