openharmony/js_worker_module
1
0
Fork 0
mirror of https://github.com/openharmony/js_worker_module.git synced 2026-07-19 11:22:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix for uv_close(uv_async_t) when ~Worker

Browse Source 
issue:https://gitee.com/openharmony/commonlibrary_ets_utils/issues/I5OXI2

Signed-off-by: wangzhaoyong <wangzhaoyong@huawei.com>
This commit is contained in:
wangzhaoyong
2022-08-31 10:06:09 +08:00
parent 54bb68be74
commit 90abd62026
2 changed files with 41 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
worker/worker.cpp
+39 -13
View File
@@ -34,8 +34,12 @@ void Worker::StartExecuteInThread(napi_env env, const char* script)
Helper::CloseHelp::DeletePointer(script, true);
return;
}
uv_async_init(loop, &hostOnMessageSignal_, reinterpret_cast<uv_async_cb>(Worker::HostOnMessage));
uv_async_init(loop, &hostOnErrorSignal_, reinterpret_cast<uv_async_cb>(Worker::HostOnError));
hostOnMessageSignal_ = new uv_async_t;
uv_async_init(loop, hostOnMessageSignal_, reinterpret_cast<uv_async_cb>(Worker::HostOnMessage));
hostOnMessageSignal_->data = this;
hostOnErrorSignal_ = new uv_async_t;
uv_async_init(loop, hostOnErrorSignal_, reinterpret_cast<uv_async_cb>(Worker::HostOnError));
hostOnErrorSignal_->data = this;
// 2. copy the script
script_ = std::string(script);
@@ -163,7 +167,7 @@ void Worker::PublishWorkerOverSignal()
// post NULL tell host worker is not running
if (!HostIsStop()) {
hostMessageQueue_.EnQueue(NULL);
uv_async_send(&hostOnMessageSignal_);
uv_async_send(hostOnMessageSignal_);
}
}
@@ -222,7 +226,7 @@ void Worker::ExecuteInThread(const void* data)
void Worker::HostOnMessage(const uv_async_t* req)
{
Worker* worker = Helper::DereferenceHelp::DereferenceOf(&Worker::hostOnMessageSignal_, req);
Worker* worker = static_cast<Worker*>(req->data);
if (worker == nullptr) {
HILOG_ERROR("worker::worker is null");
return;
@@ -259,7 +263,7 @@ void Worker::HostOnErrorInner()
void Worker::HostOnError(const uv_async_t* req)
{
Worker* worker = Helper::DereferenceHelp::DereferenceOf(&Worker::hostOnErrorSignal_, req);
Worker* worker = static_cast<Worker*>(req->data);
if (worker == nullptr) {
HILOG_ERROR("worker::worker is null");
return;
@@ -350,8 +354,18 @@ void Worker::HostOnMessageInner()
// receive close signal.
if (data == nullptr) {
HILOG_INFO("worker:: worker received close signal");
uv_close(reinterpret_cast<uv_handle_t*>(&hostOnMessageSignal_), nullptr);
uv_close(reinterpret_cast<uv_handle_t*>(&hostOnErrorSignal_), nullptr);
uv_close(reinterpret_cast<uv_handle_t*>(hostOnMessageSignal_), [](uv_handle_t* handle) {
if (handle != nullptr) {
delete reinterpret_cast<uv_async_t*>(handle);
handle = nullptr;
}
});
uv_close(reinterpret_cast<uv_handle_t*>(hostOnErrorSignal_), [](uv_handle_t* handle) {
if (handle != nullptr) {
delete reinterpret_cast<uv_async_t*>(handle);
handle = nullptr;
}
});
CloseHostCallback();
return;
}
@@ -417,7 +431,7 @@ void Worker::HandleException()
std::lock_guard<std::recursive_mutex> lock(liveStatusLock_);
if (!HostIsStop()) {
errorQueue_.EnQueue(data);
uv_async_send(&hostOnErrorSignal_);
uv_async_send(hostOnErrorSignal_);
}
}
} else {
@@ -563,7 +577,7 @@ void Worker::PostMessageToHostInner(MessageDataType data)
std::lock_guard<std::recursive_mutex> lock(liveStatusLock_);
if (hostEnv_ != nullptr && !HostIsStop()) {
hostMessageQueue_.EnQueue(data);
uv_async_send(&hostOnMessageSignal_);
uv_async_send(hostOnMessageSignal_);
} else {
HILOG_ERROR("worker:: worker host engine is nullptr.");
}
@@ -741,11 +755,23 @@ napi_value Worker::WorkerConstructor(napi_env env, napi_callback_info cbinfo)
{
std::lock_guard<std::recursive_mutex> lock(worker->liveStatusLock_);
if (worker->UpdateHostState(INACTIVE)) {
if (!uv_is_closing(reinterpret_cast<uv_handle_t*>(&worker->hostOnMessageSignal_))) {
uv_close(reinterpret_cast<uv_handle_t*>(&worker->hostOnMessageSignal_), nullptr);
if (worker->hostOnMessageSignal_ != nullptr &&
!uv_is_closing(reinterpret_cast<uv_handle_t*>(worker->hostOnMessageSignal_))) {
uv_close(reinterpret_cast<uv_handle_t*>(worker->hostOnMessageSignal_), [](uv_handle_t* handle) {
if (handle != nullptr) {
delete reinterpret_cast<uv_async_t*>(handle);
handle = nullptr;
}
});
}
if (!uv_is_closing(reinterpret_cast<uv_handle_t*>(&worker->hostOnErrorSignal_))) {
uv_close(reinterpret_cast<uv_handle_t*>(&worker->hostOnErrorSignal_), nullptr);
if (worker->hostOnErrorSignal_ != nullptr &&
!uv_is_closing(reinterpret_cast<uv_handle_t*>(worker->hostOnErrorSignal_))) {
uv_close(reinterpret_cast<uv_handle_t*>(worker->hostOnErrorSignal_), [](uv_handle_t* handle) {
if (handle != nullptr) {
delete reinterpret_cast<uv_async_t*>(handle);
handle = nullptr;
}
});
}
worker->ReleaseHostThreadContent();
}
worker/worker.h
+2 -2
View File
@@ -431,8 +431,8 @@ private:
MessageQueue errorQueue_ {};
uv_async_t workerOnMessageSignal_ {};
uv_async_t hostOnMessageSignal_ {};
uv_async_t hostOnErrorSignal_ {};
uv_async_t* hostOnMessageSignal_ = nullptr;
uv_async_t* hostOnErrorSignal_ = nullptr;
#if !defined(WINDOWS_PLATFORM) && !defined(MAC_PLATFORM)
uv_async_t debuggerOnPostTaskSignal_ {};
std::function<void()> debuggerTask_;