openharmony/arkcompiler_ets_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkcompiler_ets_runtime synced 2024-11-23 18:20:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

多实例录制CPU profiler过程中，销毁Woker实例，会导致方舟主线程采样崩溃，进程退出。

Browse Source 
issues:https://gitee.com/openharmony/arkcompiler_ets_runtime/issues/I8ADBJ1

Signed-off-by: rentangyu <rentangyu@huawei.com>
This commit is contained in:
rentangyu 2023-10-24 10:40:02 +08:00
parent 5eb60f158a
commit 7e6d93ce5c
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ecmascript/dfx/cpu_profiler/cpu_profiler.cpp
View File

@ -563,4 +563,9 @@ bool CpuProfiler::GetBuildNapiStack()
{
return isBuildNapiStack_.load();
}
bool CpuProfiler::GetOutToFile()
{
return outToFile_;
}
} // namespace panda::ecmascript

1
ecmascript/dfx/cpu_profiler/cpu_profiler.h
View File

@ -93,6 +93,7 @@ public:
void RecordCallNapiInfo(const std::string &methodAddr);
void SetBuildNapiStack(bool flag);
bool GetBuildNapiStack();
bool GetOutToFile();
explicit CpuProfiler(const EcmaVM *vm, const int interval = CPUPROFILER_DEFAULT_INTERVAL);
virtual ~CpuProfiler();

7
ecmascript/ecma_vm.cpp
View File

@ -236,8 +236,11 @@ EcmaVM::~EcmaVM()
initialized_ = false;
#if defined(ECMASCRIPT_SUPPORT_CPUPROFILER)
if (thread_->isProfiling_) {
DFXJSNApi::StopCpuProfilerForFile(this);
DFXJSNApi::StopCpuProfilerForInfo(this);
if (profiler_->GetOutToFile()) {
DFXJSNApi::StopCpuProfilerForFile(this);
} else {
DFXJSNApi::StopCpuProfilerForInfo(this);
}
}
#endif
#if defined(ECMASCRIPT_SUPPORT_HEAPPROFILER)