Merge branch 'project-chip:master' into issue_226_temp_2

project-chip · Dec 4, 2024 · 733c081 · 733c081
2 parents 41bdc70 + e0fc29a
commit 733c081
Show file tree

Hide file tree

Showing 27 changed files with 276 additions and 150 deletions.
diff --git a/examples/chip-tool/templates/logging/DataModelLogger-src.zapt b/examples/chip-tool/templates/logging/DataModelLogger-src.zapt
@@ -100,7 +100,7 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP
         default:
           break;
     }
-    ChipLogProgress(chipTool, "  Don't know how to log atribute value");
+    ChipLogProgress(chipTool, "  Don't know how to log attribute value");
     return CHIP_NO_ERROR;
 }
 

diff --git a/examples/fabric-bridge-app/linux/CommissionerControlDelegate.cpp b/examples/fabric-bridge-app/linux/CommissionerControlDelegate.cpp
@@ -116,7 +116,7 @@ CHIP_ERROR CommissionerControlDelegate::HandleCommissioningApprovalRequest(const
         mLabel.ClearValue();
     }
 
-    CHIP_ERROR err = CommissionerControlServer::Instance().GenerateCommissioningRequestResultEvent(kAggregatorEndpointId, result);
+    CHIP_ERROR err = mCommissionerControlServer.GenerateCommissioningRequestResultEvent(kAggregatorEndpointId, result);
 
     if (err == CHIP_NO_ERROR)
     {
@@ -228,7 +228,7 @@ CHIP_ERROR CommissionerControlInit()
         return CHIP_ERROR_NO_MEMORY;
     }
 
-    err = Clusters::CommissionerControl::CommissionerControlServer::Instance().Init(*sCommissionerControlDelegate);
+    err = sCommissionerControlDelegate->GetCommissionerControlServer().Init();
     if (err != CHIP_NO_ERROR)
     {
         ChipLogError(AppServer, "Initialization failed on Commissioner Control Delegate.");
@@ -242,7 +242,7 @@ CHIP_ERROR CommissionerControlInit()
     supportedDeviceCategories.SetField(Clusters::CommissionerControl::SupportedDeviceCategoryBitmap::kFabricSynchronization, 1);
 
     Protocols::InteractionModel::Status status =
-        Clusters::CommissionerControl::CommissionerControlServer::Instance().SetSupportedDeviceCategoriesValue(
+        sCommissionerControlDelegate->GetCommissionerControlServer().SetSupportedDeviceCategoriesValue(
             Clusters::CommissionerControl::kAggregatorEndpointId, supportedDeviceCategories);
 
     if (status != Protocols::InteractionModel::Status::Success)

diff --git a/examples/fabric-bridge-app/linux/include/CommissionerControlDelegate.h b/examples/fabric-bridge-app/linux/include/CommissionerControlDelegate.h
@@ -31,6 +31,8 @@ inline constexpr EndpointId kAggregatorEndpointId = 1;
 class CommissionerControlDelegate : public Delegate
 {
 public:
+    CommissionerControlDelegate() : mCommissionerControlServer(this, kAggregatorEndpointId, CommissionerControl::Id) {}
+
     CHIP_ERROR HandleCommissioningApprovalRequest(const CommissioningApprovalRequest & request) override;
     // TODO(#35627) clientNodeId should move towards ScopedNodeId.
     CHIP_ERROR ValidateCommissionNodeCommand(NodeId clientNodeId, uint64_t requestId) override;
@@ -39,6 +41,8 @@ class CommissionerControlDelegate : public Delegate
 
     ~CommissionerControlDelegate() = default;
 
+    CommissionerControlServer & GetCommissionerControlServer() { return mCommissionerControlServer; }
+
 private:
     enum class Step : uint8_t
     {
@@ -82,6 +86,8 @@ class CommissionerControlDelegate : public Delegate
     ByteSpan mPBKDFSalt;
     Crypto::Spake2pVerifierSerialized mPAKEPasscodeVerifierBuffer;
     ByteSpan mPAKEPasscodeVerifier;
+
+    CommissionerControlServer mCommissionerControlServer;
 };
 
 } // namespace CommissionerControl

diff --git a/examples/fabric-sync/bridge/include/CommissionerControlDelegate.h b/examples/fabric-sync/bridge/include/CommissionerControlDelegate.h
@@ -32,7 +32,9 @@ inline constexpr EndpointId kAggregatorEndpointId = 1;
 class CommissionerControlDelegate : public Delegate
 {
 public:
-    CommissionerControlDelegate(bridge::FabricAdminDelegate * fabricAdmin) : mFabricAdmin(fabricAdmin) {}
+    CommissionerControlDelegate(bridge::FabricAdminDelegate * fabricAdmin) :
+        mFabricAdmin(fabricAdmin), mCommissionerControlServer(this, kAggregatorEndpointId, CommissionerControl::Id)
+    {}
 
     CHIP_ERROR HandleCommissioningApprovalRequest(const CommissioningApprovalRequest & request) override;
     // TODO(#35627) clientNodeId should move towards ScopedNodeId.
@@ -42,6 +44,8 @@ class CommissionerControlDelegate : public Delegate
 
     ~CommissionerControlDelegate() = default;
 
+    CommissionerControlServer & GetCommissionerControlServer() { return mCommissionerControlServer; }
+
 private:
     enum class Step : uint8_t
     {
@@ -87,6 +91,7 @@ class CommissionerControlDelegate : public Delegate
     ByteSpan mPAKEPasscodeVerifier;
 
     bridge::FabricAdminDelegate * mFabricAdmin;
+    CommissionerControlServer mCommissionerControlServer;
 };
 
 } // namespace CommissionerControl

diff --git a/examples/fabric-sync/bridge/src/BridgedDeviceManager.cpp b/examples/fabric-sync/bridge/src/BridgedDeviceManager.cpp
@@ -245,12 +245,13 @@ std::optional<uint16_t> BridgedDeviceManager::AddDeviceEndpoint(std::unique_ptr<
 
 int BridgedDeviceManager::RemoveDeviceEndpoint(BridgedDevice * dev)
 {
+    assertChipStackLockedByCurrentThread();
+
     uint8_t index = 0;
     while (index < CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT)
     {
         if (mDevices[index].get() == dev)
         {
-            DeviceLayer::StackLock lock;
             // Silence complaints about unused ep when progress logging
             // disabled.
             [[maybe_unused]] EndpointId ep = emberAfClearDynamicEndpoint(index);
@@ -266,6 +267,8 @@ int BridgedDeviceManager::RemoveDeviceEndpoint(BridgedDevice * dev)
 
 BridgedDevice * BridgedDeviceManager::GetDevice(chip::EndpointId endpointId) const
 {
+    assertChipStackLockedByCurrentThread();
+
     for (uint8_t index = 0; index < CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; ++index)
     {
         if (mDevices[index] && mDevices[index]->GetEndpointId() == endpointId)
@@ -304,6 +307,8 @@ std::string BridgedDeviceManager::GenerateUniqueId()
 
 BridgedDevice * BridgedDeviceManager::GetDeviceByUniqueId(const std::string & id)
 {
+    assertChipStackLockedByCurrentThread();
+
     for (uint8_t index = 0; index < CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; ++index)
     {
         if (mDevices[index] && mDevices[index]->GetBridgedAttributes().uniqueId == id)
@@ -316,6 +321,8 @@ BridgedDevice * BridgedDeviceManager::GetDeviceByUniqueId(const std::string & id
 
 BridgedDevice * BridgedDeviceManager::GetDeviceByScopedNodeId(chip::ScopedNodeId scopedNodeId) const
 {
+    assertChipStackLockedByCurrentThread();
+
     for (uint8_t index = 0; index < CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; ++index)
     {
         if (mDevices[index] && mDevices[index]->GetScopedNodeId() == scopedNodeId)
@@ -328,11 +335,12 @@ BridgedDevice * BridgedDeviceManager::GetDeviceByScopedNodeId(chip::ScopedNodeId
 
 std::optional<uint16_t> BridgedDeviceManager::RemoveDeviceByScopedNodeId(chip::ScopedNodeId scopedNodeId)
 {
+    assertChipStackLockedByCurrentThread();
+
     for (uint16_t index = 0; index < CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT; ++index)
     {
         if (mDevices[index] && mDevices[index]->GetScopedNodeId() == scopedNodeId)
         {
-            DeviceLayer::StackLock lock;
             EndpointId ep   = emberAfClearDynamicEndpoint(index);
             mDevices[index] = nullptr;
             ChipLogProgress(NotSpecified, "Removed device with Id=[%d:0x" ChipLogFormatX64 "] from dynamic endpoint %d (index=%d)",

diff --git a/examples/fabric-sync/bridge/src/CommissionerControlDelegate.cpp b/examples/fabric-sync/bridge/src/CommissionerControlDelegate.cpp
@@ -114,7 +114,7 @@ CHIP_ERROR CommissionerControlDelegate::HandleCommissioningApprovalRequest(const
         mLabel.ClearValue();
     }
 
-    CHIP_ERROR err = CommissionerControlServer::Instance().GenerateCommissioningRequestResultEvent(kAggregatorEndpointId, result);
+    CHIP_ERROR err = mCommissionerControlServer.GenerateCommissioningRequestResultEvent(kAggregatorEndpointId, result);
 
     if (err == CHIP_NO_ERROR)
     {
@@ -227,7 +227,7 @@ CHIP_ERROR CommissionerControlInit(bridge::FabricAdminDelegate * fabricAdmin)
         return CHIP_ERROR_NO_MEMORY;
     }
 
-    err = Clusters::CommissionerControl::CommissionerControlServer::Instance().Init(*sCommissionerControlDelegate);
+    err = sCommissionerControlDelegate->GetCommissionerControlServer().Init();
     if (err != CHIP_NO_ERROR)
     {
         ChipLogError(AppServer, "Initialization failed on Commissioner Control Delegate.");
@@ -241,7 +241,7 @@ CHIP_ERROR CommissionerControlInit(bridge::FabricAdminDelegate * fabricAdmin)
     supportedDeviceCategories.SetField(Clusters::CommissionerControl::SupportedDeviceCategoryBitmap::kFabricSynchronization, 1);
 
     Protocols::InteractionModel::Status status =
-        Clusters::CommissionerControl::CommissionerControlServer::Instance().SetSupportedDeviceCategoriesValue(
+        sCommissionerControlDelegate->GetCommissionerControlServer().SetSupportedDeviceCategoriesValue(
             Clusters::CommissionerControl::kAggregatorEndpointId, supportedDeviceCategories);
 
     if (status != Protocols::InteractionModel::Status::Success)