From 9bb11ddfbec9408aa5d6926f9aa649f1dc8df0f9 Mon Sep 17 00:00:00 2001
From: zyxzyx <zhangyixin19@huawei.com>
Date: Mon, 30 Sep 2024 09:53:25 +0800
Subject: [PATCH] fix crash bug

Signed-off-by: zyxzyx <zhangyixin19@huawei.com>
---
 device/plugins/native_daemon/include/stack_data_repeater.h | 5 +++++
 device/plugins/native_daemon/src/hook_manager.cpp          | 5 ++++-
 device/plugins/native_daemon/src/stack_data_repeater.cpp   | 1 -
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/device/plugins/native_daemon/include/stack_data_repeater.h b/device/plugins/native_daemon/include/stack_data_repeater.h
index f24e6766f..ddb7c021a 100644
--- a/device/plugins/native_daemon/include/stack_data_repeater.h
+++ b/device/plugins/native_daemon/include/stack_data_repeater.h
@@ -69,6 +69,11 @@ public:
     std::shared_ptr<RawStack> GetRawStack();
     void ReturnRawStack(std::shared_ptr<RawStack> rawStack);
     size_t Size();
+    void ClearCache()
+    {
+        std::unique_lock<std::mutex> lock(cacheMutex_);
+        rawDataCacheQueue_.clear();
+    }
 
 private:
     std::mutex mutex_;
diff --git a/device/plugins/native_daemon/src/hook_manager.cpp b/device/plugins/native_daemon/src/hook_manager.cpp
index 8eca3d921..3b9749d47 100644
--- a/device/plugins/native_daemon/src/hook_manager.cpp
+++ b/device/plugins/native_daemon/src/hook_manager.cpp
@@ -536,6 +536,7 @@ void HookManager::ReadShareMemory(const std::shared_ptr<HookManagerCtx>& hookCtx
                                                      reinterpret_cast<char*>(rawStack->data));
             continue;
         } else if (rawStack->stackConext->type == END_MSG) {
+            hookCtx->FlushStackArray();
             if (!hookCtx->stackData->PutRawStack(rawStack, hookCtx->isRecordAccurately)) {
                 break;
             }
@@ -569,6 +570,9 @@ bool HookManager::DestroyPluginSession(const std::vector<uint32_t>& pluginIds)
         if (item->shareMemoryBlock != nullptr) {
             ShareMemoryAllocator::GetInstance().ReleaseMemoryBlockLocal(item->smbName);
         }
+        if (item->stackData != nullptr) {
+            item->stackData->ClearCache();
+        }
     }
     if (fpHookData_) {
         fclose(fpHookData_);
@@ -615,7 +619,6 @@ bool HookManager::StopPluginSession(const std::vector<uint32_t>& pluginIds)
         } else {
             PROFILER_LOG_INFO(LOG_CORE, "StopPluginSession: pid(%d) is less or equal zero.", item->pid);
         }
-        item->FlushStackArray();
         CHECK_TRUE(item->stackPreprocess != nullptr, false, "stop StackPreprocess FAIL");
         item->stackPreprocess->StopTakeResults();
         PROFILER_LOG_INFO(LOG_CORE, "StopTakeResults success");
diff --git a/device/plugins/native_daemon/src/stack_data_repeater.cpp b/device/plugins/native_daemon/src/stack_data_repeater.cpp
index dd56d0d06..e0a861189 100644
--- a/device/plugins/native_daemon/src/stack_data_repeater.cpp
+++ b/device/plugins/native_daemon/src/stack_data_repeater.cpp
@@ -49,7 +49,6 @@ void StackDataRepeater::Close()
     {
         std::unique_lock<std::mutex> lock(mutex_);
         rawDataQueue_.clear();
-        rawDataCacheQueue_.clear();
         closed_ = true;
     }
     PROFILER_LOG_INFO(LOG_CORE, "StackDataRepeater Close, reducedStackCount_ : %" PRIx64 " ", reducedStackCount_);