openharmony/request_request
1
0
Fork 0
mirror of https://gitee.com/openharmony/request_request synced 2025-02-19 23:01:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!502 修复env crash问题

Browse Source 
Merge pull request !502 from ann_lesley/master
This commit is contained in:
openharmony_ci 2023-08-28 07:40:02 +00:00 committed by Gitee
commit 30e7bdeb0f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frameworks/js/napi/include/request_notify.h
View File

@ -31,9 +31,9 @@
namespace OHOS::Request {
struct EditorEventInfo {
struct NotifyEventInfo {
int64_t timestamp{};
bool operator==(const EditorEventInfo &info) const
bool operator==(const NotifyEventInfo &info) const
{
return (timestamp == info.timestamp);
}
@ -57,8 +57,8 @@ public:
napi_ref ref_;
Notify notify_;
std::mutex notifyMutex_;
EditorEventInfo info_;
static BlockQueue<EditorEventInfo> editorQueue_;
NotifyEventInfo info_;
static BlockQueue<NotifyEventInfo> notifyQueue_;
};
struct NotifyDataPtr {

1
frameworks/js/napi/src/js_task.cpp
View File

@ -67,6 +67,7 @@ napi_property_descriptor clzDesV9[] = {
JsTask::~JsTask()
{
REQUEST_HILOGD("~JsTask()");
ClearListener();
RequestEvent::RemoveCache(tid_);
}

16
frameworks/js/napi/src/request_notify.cpp
View File

@ -23,8 +23,8 @@
#include "js_task.h"
namespace OHOS::Request {
constexpr int32_t MAX_WAIT_TIME = 5000;
BlockQueue<EditorEventInfo> RequestNotify::editorQueue_{ MAX_WAIT_TIME };
constexpr int32_t MAX_WAIT_TIME = 3000;
BlockQueue<NotifyEventInfo> RequestNotify::notifyQueue_{ MAX_WAIT_TIME };
RequestNotify::RequestNotify(napi_env env, napi_value callback) : NotifyStub()
{
@ -36,11 +36,11 @@ RequestNotify::RequestNotify(napi_env env, napi_value callback) : NotifyStub()
RequestNotify::~RequestNotify()
{
REQUEST_HILOGI("~RequestNotify()");
std::lock_guard<std::mutex> lock(envMutex_);
if (valid_ && env_ != nullptr && ref_ != nullptr) {
UvQueue::DeleteRef(env_, ref_);
}
REQUEST_HILOGI("~RequestNotify()");
}
void RequestNotify::CallBack(const Notify &notify)
@ -48,7 +48,7 @@ void RequestNotify::CallBack(const Notify &notify)
REQUEST_HILOGI("RequestNotify CallBack in");
SetNotify(notify);
info_.timestamp = std::chrono::system_clock::now().time_since_epoch().count();
editorQueue_.Push(info_);
notifyQueue_.Push(info_);
NotifyDataPtr *dataPtr = new NotifyDataPtr();
dataPtr->callback = this;
@ -68,8 +68,8 @@ void RequestNotify::CallBack(const Notify &notify)
}
NotifyDataPtr *dataPtr = static_cast<NotifyDataPtr *>(work->data);
if (dataPtr != nullptr) {
editorQueue_.Wait(dataPtr->callback->info_);
REQUEST_HILOGI("timestamp is %{public}" PRId64, dataPtr->callback->info_.timestamp);
notifyQueue_.Wait(dataPtr->callback->info_);
}
}, [](uv_work_t *work, int status) {
if (work == nullptr) {
@ -80,7 +80,7 @@ void RequestNotify::CallBack(const Notify &notify)
dataPtr->callback->ExecCallBack();
delete dataPtr;
}
editorQueue_.Pop();
notifyQueue_.Pop();
delete work;
});
}
@ -93,6 +93,10 @@ void RequestNotify::ExecCallBack()
{
REQUEST_HILOGI("ExecCallBack in");
std::lock_guard<std::mutex> lock(envMutex_);
if (!valid_ || env_ == nullptr || ref_ == nullptr) {
REQUEST_HILOGE("ref is null");
return;
}
napi_handle_scope scope = nullptr;
napi_open_handle_scope(env_, &scope);
napi_value callbackFunc = nullptr;