Skip SetCurrentHeapHighWatermark if GetCurrentHeapUsed is not implemented

Author: yufengwangca

src/app/clusters/software-diagnostics-server/software-diagnostics-server.cpp

@@ -158,12 +158,23 @@ bool emberAfSoftwareDiagnosticsClusterResetWatermarksCallback(app::CommandHandle
 
     uint64_t currentHeapUsed;
     CHIP_ERROR err = DeviceLayer::GetDiagnosticDataProvider().GetCurrentHeapUsed(currentHeapUsed);
-    VerifyOrExit(err == CHIP_NO_ERROR, status = EMBER_ZCL_STATUS_FAILURE);
 
-    err = DeviceLayer::GetDiagnosticDataProvider().SetCurrentHeapHighWatermark(currentHeapUsed);
-    VerifyOrExit(err == CHIP_NO_ERROR, status = EMBER_ZCL_STATUS_FAILURE);
+    // Skip SetCurrentHeapHighWatermark if GetCurrentHeapUsed is not implemented
+    if (err != CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE && err != CHIP_ERROR_NOT_IMPLEMENTED)
+    {
+        if (err == CHIP_NO_ERROR)
+        {
+            if (CHIP_NO_ERROR != DeviceLayer::GetDiagnosticDataProvider().SetCurrentHeapHighWatermark(currentHeapUsed))
+            {
+                status = EMBER_ZCL_STATUS_FAILURE;
+            }
+        }
+        else
+        {
+            status = EMBER_ZCL_STATUS_FAILURE;
+        }
+    }
 
-exit:
     emberAfSendImmediateDefaultResponse(status);
 
     return true;

src/platform/Darwin/DiagnosticDataProviderImpl.cpp

@@ -68,32 +68,5 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetTotalOperationalHours(uint32_t & total
     return CHIP_ERROR_INVALID_TIME;
 }
 
-CHIP_ERROR DiagnosticDataProviderImpl::GetCurrentHeapFree(uint64_t & currentHeapFree)
-{
-    // Overide with dummy value to pass CI
-    currentHeapFree = 0;
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DiagnosticDataProviderImpl::GetCurrentHeapUsed(uint64_t & currentHeapUsed)
-{
-    // Overide with dummy value to pass CI
-    currentHeapUsed = 0;
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DiagnosticDataProviderImpl::GetCurrentHeapHighWatermark(uint64_t & currentHeapHighWatermark)
-{
-    // Overide with dummy value to pass CI
-    currentHeapHighWatermark = 0;
-    return CHIP_NO_ERROR;
-}
-
-CHIP_ERROR DiagnosticDataProviderImpl::SetCurrentHeapHighWatermark(uint64_t heapHighWatermark)
-{
-    // Overide to pass CI
-    return CHIP_NO_ERROR;
-}
-
 } // namespace DeviceLayer
 } // namespace chip

src/platform/Darwin/DiagnosticDataProviderImpl.h

@@ -38,12 +38,6 @@ class DiagnosticDataProviderImpl : public DiagnosticDataProvider
     // ===== Methods that implement the PlatformManager abstract interface.
     CHIP_ERROR GetUpTime(uint64_t & upTime) override;
     CHIP_ERROR GetTotalOperationalHours(uint32_t & totalOperationalHours) override;
-
-    // ===== Methods that implement the DiagnosticDataProvider abstract interface.
-    CHIP_ERROR GetCurrentHeapFree(uint64_t & currentHeapFree) override;
-    CHIP_ERROR GetCurrentHeapUsed(uint64_t & currentHeapUsed) override;
-    CHIP_ERROR GetCurrentHeapHighWatermark(uint64_t & currentHeapHighWatermark) override;
-    CHIP_ERROR SetCurrentHeapHighWatermark(uint64_t heapHighWatermark) override;
 };
 
 } // namespace DeviceLayer