Improve the error message when the BDX transfer pool is exhausted.

project-chip · Sep 11, 2024 · efebf7f · efebf7f
1 parent 024a8a9
commit efebf7f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/controller/python/chip/bdx/bdx-transfer-manager.cpp b/src/controller/python/chip/bdx/bdx-transfer-manager.cpp
@@ -52,7 +52,11 @@ BdxTransfer * BdxTransferManager::Allocate()
     VerifyOrReturnValue(mExpectedTransfers != 0, nullptr);
 
     BdxTransfer * result = mTransferPool.CreateObject(mSystemLayer);
-    VerifyOrReturnValue(result != nullptr, nullptr);
+    if (result == nullptr) {
+      ChipLogError(BDX, "Failed to allocate BDX transfer. The pool (size %d) is exhausted.",
+                   static_cast<int>(kTransferPoolSize));
+      return nullptr;
+    }
     result->SetDelegate(mBdxTransferDelegate);
 
     --mExpectedTransfers;

diff --git a/src/controller/python/chip/bdx/bdx-transfer-manager.h b/src/controller/python/chip/bdx/bdx-transfer-manager.h
@@ -51,7 +51,11 @@ class BdxTransferManager : public BdxTransferPool
     void Release(BdxTransfer * bdxTransfer) override;
 
 private:
-    ObjectPool<BdxTransfer, 2> mTransferPool;
+    // The maximum number of transfers to support at once. This number was chosen because it should be sufficient for
+    // current tests that use BDX.
+    static constexpr size_t kTransferPoolSize = 2;
+
+    ObjectPool<BdxTransfer, kTransferPoolSize> mTransferPool;
     System::Layer * mSystemLayer                 = nullptr;
     BdxTransfer::Delegate * mBdxTransferDelegate = nullptr;
     size_t mExpectedTransfers                    = 0;