openharmony/filemanagement_user_file_service
1
0
Fork 0
mirror of https://gitee.com/openharmony/filemanagement_user_file_service synced 2024-11-23 15:29:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix :保障list多线程线程安全问题

Browse Source 
Signed-off-by: dengjun <dengjun39@huawei.com>
This commit is contained in:
dengjun 2024-01-26 21:21:59 +08:00
parent 1da6560cce
commit bb5fdeba74
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
frameworks/js/napi/file_access_module/napi_fileaccess_helper.cpp
View File

@ -18,6 +18,7 @@
#include <cstring>
#include <utility>
#include <vector>
#include <mutex>
#include "file_access_framework_errno.h"
#include "file_access_helper.h"
@ -49,7 +50,24 @@ namespace {
using CallbackComplete = std::function<NVal(napi_env, NError)>;
}
std::list<std::shared_ptr<FileAccessHelper>> g_fileAccessHelperList = {};
static std::mutex g_fileAccessHelperMutex;
static std::list<std::shared_ptr<FileAccessHelper>> g_fileAccessHelperList = {};
static void AddFileAccessHelperList(std::pair<std::shared_ptr<FileAccessHelper>, int> &createResult)
{
std::lock_guard<std::mutex> lock(g_fileAccessHelperMutex);
g_fileAccessHelperList.emplace_back(createResult.first);
HILOG_INFO("g_fileAccessHelperList size %{public}zu", g_fileAccessHelperList.size());
}
static void RemoveFileAccessHelperList(FileAccessHelper *objectInfo)
{
std::lock_guard<std::mutex> lock(g_fileAccessHelperMutex);
g_fileAccessHelperList.remove_if([objectInfo](const std::shared_ptr<FileAccessHelper> &fileAccessHelper) {
return objectInfo == fileAccessHelper.get();
});
HILOG_INFO("g_fileAccessHelperList size %{public}zu", g_fileAccessHelperList.size());
}
static napi_value FileAccessHelperConstructor(napi_env env, napi_callback_info info)
{
@ -80,15 +98,12 @@ static napi_value FileAccessHelperConstructor(napi_env env, napi_callback_info i
CHECK_STATUS_RETURN(!(createResult.first == nullptr || createResult.second != ERR_OK),
NapiFileInfoExporter::ThrowError(env, createResult.second),
"FileAccessHelperConstructor: Creator failed ret=%{public}d", createResult.second);
g_fileAccessHelperList.emplace_back(createResult.first);
HILOG_INFO("g_fileAccessHelperList size %{public}zu", g_fileAccessHelperList.size());
AddFileAccessHelperList(createResult);
auto finalize = [](napi_env env, void *data, void *hint) {
FileAccessHelper *objectInfo = static_cast<FileAccessHelper *>(data);
if (objectInfo != nullptr) {
objectInfo->Release();
g_fileAccessHelperList.remove_if([objectInfo](const std::shared_ptr<FileAccessHelper> &fileAccessHelper) {
return objectInfo == fileAccessHelper.get();
});
RemoveFileAccessHelperList(objectInfo);
objectInfo = nullptr;
}
};