!17240 merge coroutines-sync-branches into master

sync coroutines code in master branch Created-by: panferovi Commit-by: Panferov Ivan Merged-by: openharmony_ci Description: **IssueNo**: https://gitcode.com/openharmony/arkcompiler_runtime_core/issues/8105 **Description**: sync coroutines code in master branch **稳定性自检：** | 自检项 | 自检结果 | | ------------------------------------------------------------ | -------- | | 涉及跨进程调用的相关操作需要抛至主线程或加锁防止并发 | | | 成员变量进行赋值或创建需要排查并发 | | | 谨慎在lambda表达式中使用引用捕获 | | | 谨慎在未经拷贝的情况下使用外部传入的string、C字符串 | | | map\vector\list\set等stl模板类使用时需要排查并发 | | | 谨慎考虑加锁范围 | | | 在IPC通信中谨慎使用同步通信方式 | | | 禁止传递this指针至其他模块或线程（特别是eventhandler任务） | | | 禁止将外部传入的裸指针在内部直接构造智能指针 | | | 禁止多个独立创建的智能指针管理同一地址 | | | 禁止在析构函数中抛异步任务 | | | 禁止js对象在非js线程（例如在IPC线程）创建、使用或销毁 | | | 禁止在对外接口中未经判空直接使用外部传入的指针 | | | 禁止接口返回局部变量引用 | | | 禁止在信号函数中加锁 | | | 禁止在关键流程（SA启动、应用启动等主流程）执行耗时的操作 | | | 禁止将同一个cpp编译在不同的so中 | | **安全编码自检：** | 自检项 | 自检结果 | | -------------------------------------------------------------- | -------- | | 裸指针避免通过隐式转换构造为sptr | | | json对象在取值之前必须先判断类型，避免类型不匹配 | | | 序列化时必须对传入的数组大小进行校验，避免出现超大数组 | | | 避免使用未明确位宽的整型，选择使用int8_t、uint8_t等类型 | | | 外部传入的路径要做规范化校验，对路径中的.、..、../等特殊字符严格校验 | | | 指针变量、表示资源描述符的变量、bool变量必须赋初值 | | | readParcelable获取的对象使用前需要判空 | | | 分配和释放内存的函数需要成对出现 | | | 申请内存后异常退出前需要及时进行内存释放 | | | 内存申请前必须对内存大小进行合法性校验 | | | 内存分配后必须判断是否成功 | | | 禁止使用realloc、alloca函数 | | | 禁止打印文件路径、口令等敏感信息，如有需要，使用private修饰 | | | 禁止打印内存地址 | | | 整数之间运算时必须严格检查，确保不会出现溢出、反转、除0 | | | 禁止对有符号整数进行位操作符运算 | | | 禁止对指针进行逻辑或位运算 | | | 循环次数如果收外部数据控制，需要检验其合法性 | | | 禁止使用内存操作类危险函数，需要使用安全函数 | | | 谨慎使用不可重入函数 | | | 必须检查安全函数的返回值，并进行正确处理 | | | 禁止仅通过TokenType类型判断绕过权限校验 | | **TDD Result**: **XTS Result**: ### 是否已执行L0用例 - [ ] 已验证 - [ ] 不涉及。如不涉及，请写明理由 See merge request: openharmony/ability_ability_runtime!17240
2026-08-24 12:43:16 -04:00 · 2025-11-07 21:44:48 +08:00
parent a18660f7ae 9bb1b2b4b5
commit 8cd8066710
5 changed files with 50 additions and 8 deletions
@@ -71,6 +71,7 @@ const char ETS_SYS_NSNAME[] = "ets_system";

 constexpr const char* CLASSNAME_STRING = "Lstd/core/String;";
 constexpr const char* CLASSNAME_LINKER = "Lstd/core/AbcRuntimeLinker;";
+constexpr const char* CLASSNAME_COROUTINE = "std.core.Coroutine";
 } // namespace

 ETSRuntimeAPI ETSEnvironment::lazyApis_ {};
@@ -533,8 +534,11 @@ bool ETSEnvironment::FinishPreload() {

 bool ETSEnvironment::PostFork(void *napiEnv, const std::string &aotPath,
    const std::vector<std::string> &appInnerHspPathList,
-    const std::vector<OHOS::AbilityRuntime::CommonHspBundleInfo> &commonHspBundleInfos)
+    const std::vector<OHOS::AbilityRuntime::CommonHspBundleInfo> &commonHspBundleInfos,
+    const std::shared_ptr<OHOS::AppExecFwk::EventRunner> &eventRunner)
 {
+    InitEventHandler(eventRunner);
+
    std::vector<ani_option> options;
    std::string aotPathString = "";
    if (!aotPath.empty()) {
@@ -555,6 +559,9 @@ bool ETSEnvironment::PostFork(void *napiEnv, const std::string &aotPath,
    
    appInnerHspPathList_ = appInnerHspPathList;
    commonHspBundleInfos_ = commonHspBundleInfos;
+
+    PostCoroutineScheduleTask();
+
    return true;
 }

@@ -610,8 +617,10 @@ ETSEnvFuncs *ETSEnvironment::RegisterFuncs()
            ETSEnvironment::GetInstance()->FinishPreload();
        },
        .PostFork = [](void *napiEnv, const std::string &aotPath, const std::vector<std::string> &appInnerHspPathList,
-            const std::vector<OHOS::AbilityRuntime::CommonHspBundleInfo> &commonHspBundleInfos) {
-            ETSEnvironment::GetInstance()->PostFork(napiEnv, aotPath, appInnerHspPathList, commonHspBundleInfos);
+            const std::vector<OHOS::AbilityRuntime::CommonHspBundleInfo> &commonHspBundleInfos,
+            const std::shared_ptr<OHOS::AppExecFwk::EventRunner> &eventRunner) {
+            ETSEnvironment::GetInstance()->PostFork(
+                napiEnv, aotPath, appInnerHspPathList, commonHspBundleInfos, eventRunner);
        },
        .PreloadSystemClass = [](const char *className) {
            ETSEnvironment::GetInstance()->PreloadSystemClass(className);
@@ -713,7 +722,7 @@ int32_t ETSEnvironment::ParseHdcRegisterOption(std::string& option)
 void ETSEnvironment::InitEventHandler(const std::shared_ptr<AppExecFwk::EventRunner> &eventRunner)
 {
    TAG_LOGD(AAFwkTag::ETSRUNTIME, "InitEventHandler called");
-    if (eventRunner != nullptr) {
+    if (eventRunner != nullptr && eventHandler_ == nullptr) {
        eventHandler_ = std::make_shared<AppExecFwk::EventHandler>(eventRunner);
    }
 }
@@ -895,6 +904,35 @@ ani_object ETSEnvironment::CreateRuntimeLinker(

    return object;
 }
+
+static void ScheduleCoroutine(ani_env *aniEnv)
+{
+    ani_class cls = nullptr;
+    if (aniEnv->FindClass(CLASSNAME_COROUTINE, &cls) != ANI_OK) {
+        TAG_LOGE(AAFwkTag::ETSRUNTIME, "FindClass std.core.Coroutine Failed");
+        return;
+    }
+    ani_static_method schedule {};
+    if (aniEnv->Class_FindStaticMethod(cls, "Schedule", ":", &schedule) != ANI_OK) {
+        TAG_LOGE(AAFwkTag::ETSRUNTIME, "Class_FindStaticMethod Schedule failed");
+        return;
+    }
+    if (aniEnv->Class_CallStaticMethod_Void(cls, schedule) != ANI_OK) {
+        TAG_LOGE(AAFwkTag::ETSRUNTIME, "Class_CallStaticMethod_Void Schedule failed");
+        return;
+    }
+}
+
+void ETSEnvironment::PostCoroutineScheduleTask()
+{
+    auto scheduleTask = []() {
+        auto &etsEnv = GetInstance();
+        ScheduleCoroutine(etsEnv->GetAniEnv());
+        etsEnv->PostCoroutineScheduleTask();
+    };
+    PostTask(scheduleTask, "ScheduleCoroutine", 1);
+}
+
 } // namespace EtsEnv
 } // namespace OHOS

@@ -61,7 +61,8 @@ public:
        void *&obj, void *&ref);
    bool FinishPreload();
    bool PostFork(void *napiEnv, const std::string &aotPath, const std::vector<std::string>& appInnerHspPathList,
-        const std::vector<OHOS::AbilityRuntime::CommonHspBundleInfo> &commonHspBundleInfos);
+        const std::vector<OHOS::AbilityRuntime::CommonHspBundleInfo> &commonHspBundleInfos,
+        const std::shared_ptr<OHOS::AppExecFwk::EventRunner> &eventRunner);
    bool PreloadSystemClass(const char *className);

    void RemoveInstance(uint32_t instanceId);
@@ -99,6 +100,7 @@ private:
    bool LoadAbcLinker(ani_env *env, const std::string &modulePath, ani_class &abcCls, ani_object &abcObj);
    void InitEventHandler(const std::shared_ptr<AppExecFwk::EventRunner> &eventRunner);
    int32_t ParseHdcRegisterOption(std::string& option);
+    void PostCoroutineScheduleTask();
    static ETSRuntimeAPI lazyApis_;
    VMEntry vmEntry_;
    ETSUncaughtExceptionInfo uncaughtExceptionInfo_;
@@ -50,7 +50,8 @@ struct ETSEnvFuncs {
    void (*FinishPreload)() = nullptr;
    void (*PostFork)(void *napiEnv, const std::string &aotPath,
        const std::vector<std::string> &appInnerHspPathList,
-        const std::vector<OHOS::AbilityRuntime::CommonHspBundleInfo> &commonHspBundleInfos) = nullptr;
+        const std::vector<OHOS::AbilityRuntime::CommonHspBundleInfo> &commonHspBundleInfos,
+        const std::shared_ptr<OHOS::AppExecFwk::EventRunner> &eventRunner) = nullptr;
    void (*PreloadSystemClass)(const char *className) = nullptr;
    void (*SetExtensionApiCheckCallback)(
        std::function<bool(const std::string &className, const std::string &fileName)> &cb) = nullptr;
@@ -338,7 +338,8 @@ HWTEST_F(EtsEnvironmentTest, PostFork_0100, TestSize.Level0)
    std::string aotPath = "aotPath";
    std::vector<std::string> appInnerHspPathList;
    std::vector<OHOS::AbilityRuntime::CommonHspBundleInfo> commonHspBundleInfos;
-    auto result = etsEnv->PostFork(napiEnv, aotPath, appInnerHspPathList, commonHspBundleInfos);
+    std::shared_ptr<OHOS::AppExecFwk::EventRunner> eventRunner;
+    auto result = etsEnv->PostFork(napiEnv, aotPath, appInnerHspPathList, commonHspBundleInfos, eventRunner);
    EXPECT_FALSE(result);
 }

@@ -173,7 +173,7 @@ bool ETSRuntime::PostFork(const Options &options, std::unique_ptr<Runtime> &jsRu
    }

    g_etsEnvFuncs->PostFork(reinterpret_cast<void *>(napiEnv), aotFilePath, options.appInnerHspPathList,
-        options.commonHspBundleInfos);
+        options.commonHspBundleInfos, options.eventRunner);
    return true;
 }