Cascaded allocator

ACE/ace/Malloc_T.cpp

@@ -190,9 +190,16 @@ ACE_Cascaded_Dynamic_Cached_Allocator<ACE_LOCK>::ACE_Cascaded_Dynamic_Cached_All
   // If ACE_NEW fails, the hierarchy_ will be reconstructed when malloc API is called.
   ACE_NEW (tmp, comb_alloc_type(this->initial_n_chunks_, this->chunk_size_));
 
-  // Increase the chunk sum if succeed.
-  this->chunk_sum_ += tmp->pool_depth();
+  // Consider the exception of vector push_back call
   this->hierarchy_.push_back(tmp);
+  if (0 == this->hierarchy_.size())
+  {
+    delete tmp;
+    return;
+  }
+
+  // Increase the chunk sum if all points having potential risk of exception is passed.
+  this->chunk_sum_ += tmp->pool_depth ();
 }
 
 template <class ACE_LOCK>
@@ -227,11 +234,21 @@ ACE_Cascaded_Dynamic_Cached_Allocator<ACE_LOCK>::malloc (size_t nbytes)
   if(ptr == nullptr)
   {
     comb_alloc_ptr tmp;
-    ACE_NEW_RETURN (tmp, comb_alloc_type(this->initial_n_chunks_ * 2 * this->hierarchy_.size(), this->chunk_size_), nullptr);
+    ACE_NEW_RETURN (tmp, comb_alloc_type(this->initial_n_chunks_ * (1 << this->hierarchy_.size()),
+                    this->chunk_size_),
+                    nullptr);
 
-    // Increase the chunk sum if succeed.
-    this->chunk_sum_ += tmp->pool_depth();
+    // Consider the exception of vector push_back call
+    const auto old_size = this->hierarchy_.size();
     this->hierarchy_.push_back(tmp);
+    if (old_size == this->hierarchy_.size())
+    {
+      delete tmp;
+      return nullptr;
+    }
+
+    // Increase the chunk sum if all points having potential risk of exception is passed.
+    this->chunk_sum_ += tmp->pool_depth ();
     ptr = tmp->malloc(nbytes);
   }
 

ACE/tests/Allocator_Cascaded_Test.cpp

@@ -22,7 +22,7 @@ do                                                       \
 {                                                        \
   if (expression)                                        \
   {                                                      \
-    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT (message)), 1);\
+    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT_CHAR_TO_TCHAR (message)), 1);\
   }                                                      \
 }                                                        \
 while (0)
@@ -84,7 +84,8 @@ run_cascaded_allocator_test ()
   ptr1 = alloc.malloc (nbytes);
   ACE_TEST_EXCEPTION_RETURN (ptr1 == nullptr,
                              "  pool must return valid ptr, cascaded pool must support to alloc more times secondly\n");
-  ACE_TEST_EXCEPTION_RETURN (alloc.pool_depth () != 1,
+  pool_depth = alloc.pool_depth ();
+  ACE_TEST_EXCEPTION_RETURN (pool_depth != 1,
                              "  cascaded pool depth must support to alloc twice\n");
 
   old_pool_depth = alloc.pool_depth();