openharmony/arkcompiler_ets_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkcompiler_ets_runtime synced 2024-11-30 13:40:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix CpuProfiler probability of stopping failure

Browse Source 
Issue:#I9K8KR

Signed-off-by: yang-19970325 <yangyang585@huawei.com>
Change-Id: I7197b769a0ea5eefd9553c7f66e0db6e6b44c1a6
This commit is contained in:
yang-19970325 2024-04-28 10:47:50 +08:00
parent 658530428e
commit ceb49a5fee
3 changed files with 69 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ecmascript/debugger/js_debugger_manager.cpp
View File

@ -36,6 +36,7 @@ namespace panda::ecmascript::tooling {
}
return jsDebuggerManagerMap_[tid];
}
void JsDebuggerManager::DeleteJsDebuggerManager(int tid)
{
std::unique_lock<std::shared_mutex> lock(mutex_);

29
ecmascript/debugger/js_debugger_manager.h
View File

@ -124,11 +124,36 @@ public:
debuggerLibraryHandle_ = std::move(handle);
}
const LibraryHandle &GetDebugLibraryHandle() const
LibraryHandle &GetDebugLibraryHandle()
{
return debuggerLibraryHandle_;
}
void SetDebuggerPostTask(DebuggerPostTask debuggerPostTask)
{
debuggerPostTask_ = debuggerPostTask;
}
DebuggerPostTask GetDebuggerPostTask()
{
return debuggerPostTask_;
}
void SetLibraryPath(const char *libraryPath)
{
libraryPath_ = libraryPath;
}
const char *GetLibraryPath()
{
return libraryPath_;
}
EcmaVM *GetEcmaVM()
{
return jsThread_->GetEcmaVM();
}
void SetEvalFrameHandler(std::shared_ptr<FrameHandler> frameHandler)
{
frameHandler_ = frameHandler;
@ -256,6 +281,8 @@ private:
NotificationManager notificationManager_;
HotReloadManager hotReloadManager_;
DebuggerPostTask debuggerPostTask_;
const char *libraryPath_ {nullptr};
// Serialization / DeSerialization Timeout check
bool isSerializationTimeoutCheckEnabled_ { false };
// in milliseconds

51
ecmascript/napi/jsnapi_expo.cpp
View File

@ -3303,10 +3303,12 @@ bool JSNApi::StartDebugger([[maybe_unused]] EcmaVM *vm, [[maybe_unused]] const D
CROSS_THREAD_AND_EXCEPTION_CHECK_WITH_RETURN(vm, false);
const auto &handler = vm->GetJsDebuggerManager()->GetDebugLibraryHandle();
if (handler.IsValid()) {
LOG_ECMA(ERROR) << "[StartDebugger] handler has already loaded";
return false;
}
if (option.libraryPath == nullptr) {
LOG_ECMA(ERROR) << "[StartDebugger] option.libraryPath is nullptr";
return false;
}
auto handle = panda::os::library_loader::Load(std::string(option.libraryPath));
@ -3422,23 +3424,37 @@ bool JSNApi::StartDebuggerForSocketPair([[maybe_unused]] int tid, [[maybe_unused
LOG_ECMA(INFO) << "JSNApi::StartDebuggerForSocketPair, tid = " << tid << ", socketfd = " << socketfd;
JsDebuggerManager *jsDebuggerManager = JsDebuggerManager::GetJsDebuggerManager(tid);
if (jsDebuggerManager == nullptr) {
return false;
}
const auto &handle = jsDebuggerManager->GetDebugLibraryHandle();
if (!handle.IsValid()) {
LOG_ECMA(ERROR) << "[StartDebuggerForSocketPair] Get library handle fail";
LOG_ECMA(ERROR) << "[StartDebuggerForSocketPair] jsDebuggerManager is nullptr";
return false;
}
using StartDebugForSocketpair = bool (*)(int, int);
auto &handler = jsDebuggerManager->GetDebugLibraryHandle();
if (!handler.IsValid()) {
auto libraryPath = jsDebuggerManager->GetLibraryPath();
if (libraryPath == nullptr) {
LOG_ECMA(ERROR) << "[StartDebuggerForSocketPair] libraryPath is nullptr";
return false;
}
auto sym = panda::os::library_loader::ResolveSymbol(handle, "StartDebugForSocketpair");
auto handle = panda::os::library_loader::Load(std::string(libraryPath));
if (!handle) {
LOG_ECMA(ERROR) << "[StartDebuggerForSocketPair] Load library fail: " << libraryPath << " " << errno;
return false;
}
handler = std::move(handle.Value());
}
EcmaVM *vm = jsDebuggerManager->GetEcmaVM();
DebuggerPostTask debuggerPostTask = jsDebuggerManager->GetDebuggerPostTask();
using StartDebugForSocketpair = bool (*)(int, int, EcmaVM *, const DebuggerPostTask &);
auto sym = panda::os::library_loader::ResolveSymbol(handler, "StartDebugForSocketpair");
if (!sym) {
LOG_ECMA(ERROR) << "[StartDebuggerForSocketPair] Resolve symbol fail: " << sym.Error().ToString();
return false;
}
bool ret = reinterpret_cast<StartDebugForSocketpair>(sym.Value())(tid, socketfd);
bool ret = reinterpret_cast<StartDebugForSocketpair>(sym.Value())(tid, socketfd, vm, debuggerPostTask);
if (!ret) {
// Reset the config
jsDebuggerManager->SetDebugMode(false);
@ -3473,17 +3489,24 @@ bool JSNApi::NotifyDebugMode([[maybe_unused]] int tid,
}
CROSS_THREAD_AND_EXCEPTION_CHECK_WITH_RETURN(vm, false);
JsDebuggerManager *jsDebuggerManager = vm->GetJsDebuggerManager();
JsDebuggerManager::AddJsDebuggerManager(tid, jsDebuggerManager);
jsDebuggerManager->SetDebuggerPostTask(debuggerPostTask);
jsDebuggerManager->SetLibraryPath(option.libraryPath);
bool ret = false;
if (!debugApp) {
return true;
}
JsDebuggerManager *jsDebuggerManager = vm->GetJsDebuggerManager();
if (option.libraryPath == nullptr) {
LOG_ECMA(ERROR) << "[NotifyDebugMode] option.libraryPath is nullptr";
return false;
}
auto handle = panda::os::library_loader::Load(std::string(option.libraryPath));
if (!handle) {
LOG_ECMA(ERROR) << "[NotifyDebugMode] Load library fail: " << option.libraryPath << " " << errno;
return false;
}
JsDebuggerManager::AddJsDebuggerManager(tid, jsDebuggerManager);
jsDebuggerManager->SetDebugLibraryHandle(std::move(handle.Value()));
jsDebuggerManager->SetDebugMode(option.isDebugMode && debugApp);
jsDebuggerManager->SetIsDebugApp(debugApp);
@ -3546,6 +3569,7 @@ bool JSNApi::StoreDebugInfo([[maybe_unused]] int tid,
[[maybe_unused]] bool debugApp)
{
#if defined(ECMASCRIPT_SUPPORT_DEBUGGER)
LOG_ECMA(INFO) << "JSNApi::StoreDebugInfo, tid = " << tid;
if (vm == nullptr) {
return false;
}
@ -3554,12 +3578,17 @@ bool JSNApi::StoreDebugInfo([[maybe_unused]] int tid,
JsDebuggerManager *jsDebuggerManager = vm->GetJsDebuggerManager();
const auto &handler = jsDebuggerManager->GetDebugLibraryHandle();
if (handler.IsValid()) {
LOG_ECMA(ERROR) << "[StoreDebugInfo] handler has already loaded";
return false;
}
if (option.libraryPath == nullptr) {
LOG_ECMA(ERROR) << "[StoreDebugInfo] option.libraryPath is nullptr";
return false;
}
auto handle = panda::os::library_loader::Load(std::string(option.libraryPath));
if (!handle) {
LOG_ECMA(ERROR) << "[NotifyDebugMode] Load library fail: " << option.libraryPath << " " << errno;
LOG_ECMA(ERROR) << "[StoreDebugInfo] Load library fail: " << option.libraryPath << " " << errno;
return false;
}
JsDebuggerManager::AddJsDebuggerManager(tid, jsDebuggerManager);