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

!264 uitest前后端对象销毁机制bugfix. Signed-off-by: <wanglongjin1@huawei.com>

Browse Source 
Merge pull request !264 from wanglongjin/OpenHarmony-3.2-Beta3
This commit is contained in:
openharmony_ci
2022-09-19 07:05:20 +00:00
committed by Gitee
parent 3779386cc8 babc637bbb
commit 8be58ec7e1
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
uitest/napi/uitest_napi.cpp
+19 -13
View File
@@ -13,8 +13,10 @@
* limitations under the License.
*/
#include <future>
#include <napi/native_api.h>
#include <napi/native_node_api.h>
#include <queue>
#include <set>
#include <string>
#include <unistd.h>
@@ -28,7 +30,7 @@ namespace OHOS::uitest {
static constexpr size_t NAPI_MAX_BUF_LEN = 1024;
static constexpr size_t NAPI_MAX_ARG_COUNT = 8;
static constexpr size_t BACKEND_OBJ_CLEAN_THRESHOLD = 20;
static constexpr size_t BACKEND_OBJ_GC_BATCH = 100;
// type of unexpected or napi-internal error
static constexpr napi_status NAPI_ERR = napi_status::napi_generic_failure;
// the name of property that represents the objectRef of the backend object
@@ -36,7 +38,8 @@ namespace OHOS::uitest {
/**For dfx usage, records the uncalled js apis. */
static set<string> g_unCalledJsFuncNames;
/**For gc usage, records the backend objRefs about to delete. */
static set<string> g_backendObjsAboutToDelete;
static queue<string> g_backendObjsAboutToDelete;
static mutex g_gcQueueMutex;
// use external setup/transact/disposal callback functions
extern bool SetupTransactionEnv(string_view token);
@@ -196,7 +199,7 @@ namespace OHOS::uitest {
napi_value refValue = *pOut;
napi_value constructor = nullptr;
NAPI_CALL_BASE(env, GetJsConstructorFromGlobal(env, frontendTypeName, &constructor), NAPI_ERR);
NAPI_CALL_BASE(env, napi_new_instance(env, constructor, 0, nullptr, pOut), NAPI_ERR);
NAPI_CALL_BASE(env, napi_new_instance(env, constructor, 1, &refValue, pOut), NAPI_ERR);
NAPI_CALL_BASE(env, napi_set_named_property(env, *pOut, PROP_BACKEND_OBJ_REF, refValue), NAPI_ERR);
if (bindJsThis) { // bind the jsThis object
LOG_D("Bind jsThis");
@@ -249,14 +252,16 @@ namespace OHOS::uitest {
NAPI_CALL(env, napi_get_undefined(env, &resultValue)); // return undefined it's error
}
// notify backend objects deleting
if (g_backendObjsAboutToDelete.size() >= BACKEND_OBJ_CLEAN_THRESHOLD) {
if (g_backendObjsAboutToDelete.size() >= BACKEND_OBJ_GC_BATCH) {
auto gcCall = ApiCallInfo {.apiId_ = "BackendObjectsCleaner"};
auto gcReply = ApiReplyInfo();
for (auto& ref : g_unCalledJsFuncNames) {
gcCall.paramList_.emplace_back(ref);
unique_lock<mutex> lock(g_gcQueueMutex);
for (auto count = 0; count < BACKEND_OBJ_GC_BATCH; count++) {
gcCall.paramList_.emplace_back(g_backendObjsAboutToDelete.front());
g_backendObjsAboutToDelete.pop();
}
lock.unlock();
auto gcReply = ApiReplyInfo();
transactFunc(gcCall, gcReply);
g_backendObjsAboutToDelete.clear();
}
return resultValue;
}
@@ -390,16 +395,17 @@ namespace OHOS::uitest {
descs[idx] = desc;
}
constexpr auto initializer = [](napi_env env, napi_callback_info info) {
auto argc = NAPI_MAX_ARG_COUNT;
napi_value argv[NAPI_MAX_ARG_COUNT] = { nullptr };
napi_value jsThis = nullptr;
NAPI_CALL_BASE(env, napi_get_cb_info(env, info, nullptr, nullptr, &jsThis, nullptr), jsThis);
napi_value refValue = nullptr;
NAPI_CALL_BASE(env, napi_get_named_property(env, jsThis, PROP_BACKEND_OBJ_REF, &refValue), jsThis);
auto ref = make_unique<string>(JsStrToCppStr(env, refValue));
NAPI_CALL_BASE(env, napi_get_cb_info(env, info, &argc, argv, &jsThis, nullptr), jsThis);
auto ref = make_unique<string>(argc <= 0 ? "" : JsStrToCppStr(env, argv[0]));
auto finalizer = [](napi_env env, void *data, void *hint) {
auto ref = reinterpret_cast<string *>(data);
if (ref->length() > 0) {
LOG_D("Finalizing object: %{public}s", ref->c_str());
g_backendObjsAboutToDelete.insert(*ref);
unique_lock<mutex> lock(g_gcQueueMutex);
g_backendObjsAboutToDelete.push(*ref);
}
delete ref;
};