Add function to reset heap high watermarks (project-chip#21105)

isiu-apple · Sep 16, 2022 · 0ce8f96 · 0ce8f96
1 parent cc37735
commit 0ce8f96
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/src/platform/qpg/DiagnosticDataProviderImpl.cpp b/src/platform/qpg/DiagnosticDataProviderImpl.cpp
@@ -69,6 +69,12 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetCurrentHeapHighWatermark(uint64_t & cu
     return CHIP_NO_ERROR;
 }
 
+CHIP_ERROR DiagnosticDataProviderImpl::ResetWatermarks()
+{
+    qvCHIP_ResetHeapStats();
+    return CHIP_NO_ERROR;
+}
+
 DiagnosticDataProvider & GetDiagnosticDataProviderImpl()
 {
     return DiagnosticDataProviderImpl::GetDefaultInstance();

diff --git a/src/platform/qpg/DiagnosticDataProviderImpl.h b/src/platform/qpg/DiagnosticDataProviderImpl.h
@@ -39,9 +39,11 @@ class DiagnosticDataProviderImpl : public DiagnosticDataProvider
 
     // ===== Methods that implement the PlatformManager abstract interface.
 
+    bool SupportsWatermarks() override { return true; }
     CHIP_ERROR GetCurrentHeapFree(uint64_t & currentHeapFree) override;
     CHIP_ERROR GetCurrentHeapUsed(uint64_t & currentHeapUsed) override;
     CHIP_ERROR GetCurrentHeapHighWatermark(uint64_t & currentHeapHighWatermark) override;
+    CHIP_ERROR ResetWatermarks() override;
 };
 
 /**

diff --git a/third_party/qpg_sdk/qpg_executable.gni b/third_party/qpg_sdk/qpg_executable.gni
@@ -97,7 +97,7 @@ template("qpg_executable") {
     gen_ota_header("$executable_target_name.ota") {
       ota_header_script_name = "${root_out_dir}/${executable_target_name}.ota"
       out_dir = rebase_path(root_out_dir, root_build_dir)
-      ota_header_generator = "${qpg_sdk_root}/Tools/ota/generate_ota_img.py"
+      ota_header_generator = "${qpg_sdk_root}/Tools/Ota/generate_ota_img.py"
 
       ota_header_options = [
         string_join("=",
@@ -119,7 +119,7 @@ template("qpg_executable") {
                     [
                       "--pem_file_path",
                       rebase_path(qpg_sdk_root, root_build_dir) +
-                          "/Tools/ota/example_private_key.pem.example",
+                          "/Tools/Ota/example_private_key.pem.example",
                     ]),
         "--pem_password=test1234",
         "--sign",

diff --git a/third_party/qpg_sdk/repo b/third_party/qpg_sdk/repo