Address review comment

Author: yufengwangca

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

@@ -156,23 +156,11 @@ bool emberAfSoftwareDiagnosticsClusterResetWatermarksCallback(app::CommandHandle
 {
     EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS;
 
-    uint64_t currentHeapUsed;
-    CHIP_ERROR err = DeviceLayer::GetDiagnosticDataProvider().GetCurrentHeapUsed(currentHeapUsed);
-
-    // Skip SetCurrentHeapHighWatermark if GetCurrentHeapUsed is not implemented
-    if (err != CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE && err != CHIP_ERROR_NOT_IMPLEMENTED)
+    // If implemented, the server SHALL set the value of the CurrentHeapHighWatermark attribute to the
+    // value of the CurrentHeapUsed.
+    if (DeviceLayer::GetDiagnosticDataProvider().ResetWatermarks() != CHIP_NO_ERROR)
     {
-        if (err == CHIP_NO_ERROR)
-        {
-            if (CHIP_NO_ERROR != DeviceLayer::GetDiagnosticDataProvider().SetCurrentHeapHighWatermark(currentHeapUsed))
-            {
-                status = EMBER_ZCL_STATUS_FAILURE;
-            }
-        }
-        else
-        {
-            status = EMBER_ZCL_STATUS_FAILURE;
-        }
+        status = EMBER_ZCL_STATUS_FAILURE;
     }
 
     emberAfSendImmediateDefaultResponse(status);

src/include/platform/DiagnosticDataProvider.h

@@ -180,6 +180,7 @@ class DiagnosticDataProvider
     virtual CHIP_ERROR GetCurrentHeapUsed(uint64_t & currentHeapUsed);
     virtual CHIP_ERROR GetCurrentHeapHighWatermark(uint64_t & currentHeapHighWatermark);
     virtual CHIP_ERROR SetCurrentHeapHighWatermark(uint64_t heapHighWatermark);
+    virtual CHIP_ERROR ResetWatermarks();
 
     /*
      * Get the linked list of thread metrics of the current plaform. After usage, each caller of GetThreadMetrics
@@ -272,6 +273,11 @@ inline CHIP_ERROR DiagnosticDataProvider::SetCurrentHeapHighWatermark(uint64_t h
     return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
 }
 
+inline CHIP_ERROR DiagnosticDataProvider::ResetWatermarks()
+{
+    return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
+}
+
 inline CHIP_ERROR DiagnosticDataProvider::GetThreadMetrics(ThreadMetrics ** threadMetricsOut)
 {
     return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;

src/platform/Darwin/DiagnosticDataProviderImpl.cpp

@@ -68,5 +68,14 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetTotalOperationalHours(uint32_t & total
     return CHIP_ERROR_INVALID_TIME;
 }
 
+CHIP_ERROR DiagnosticDataProviderImpl::ResetWatermarks()
+{
+    // If implemented, the server SHALL set the value of the CurrentHeapHighWatermark attribute to the
+    // value of the CurrentHeapUsed.
+    // On Darwin, overide with non-op to pass CI.
+
+    return CHIP_NO_ERROR;
+}
+
 } // namespace DeviceLayer
 } // namespace chip

src/platform/Darwin/DiagnosticDataProviderImpl.h

@@ -38,6 +38,9 @@ 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 ResetWatermarks() override;
 };
 
 } // namespace DeviceLayer

src/platform/Linux/DiagnosticDataProviderImpl.cpp

@@ -274,6 +274,17 @@ CHIP_ERROR DiagnosticDataProviderImpl::SetCurrentHeapHighWatermark(uint64_t heap
     return CHIP_NO_ERROR;
 }
 
+CHIP_ERROR DiagnosticDataProviderImpl::ResetWatermarks()
+{
+    // If implemented, the server SHALL set the value of the CurrentHeapHighWatermark attribute to the
+    // value of the CurrentHeapUsed.
+
+    // On Linux, the write operation is non-op since we always rely on the mallinfo system
+    // function to get the current heap memory.
+
+    return CHIP_NO_ERROR;
+}
+
 CHIP_ERROR DiagnosticDataProviderImpl::GetThreadMetrics(ThreadMetrics ** threadMetricsOut)
 {
     CHIP_ERROR err = CHIP_ERROR_READ_FAILED;

src/platform/Linux/DiagnosticDataProviderImpl.h

@@ -44,6 +44,7 @@ class DiagnosticDataProviderImpl : public DiagnosticDataProvider
     CHIP_ERROR GetCurrentHeapHighWatermark(uint64_t & currentHeapHighWatermark) override;
     CHIP_ERROR GetThreadMetrics(ThreadMetrics ** threadMetricsOut) override;
     CHIP_ERROR SetCurrentHeapHighWatermark(uint64_t heapHighWatermark) override;
+    CHIP_ERROR ResetWatermarks() override;
     void ReleaseThreadMetrics(ThreadMetrics * threadMetrics) override;
 
     CHIP_ERROR GetRebootCount(uint16_t & rebootCount) override;