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

IssueNo:#I51UW4

Browse Source 
Description:task_dispatcher所属部件调整
Sig:SIG_ApplicationFramework
Feature or Bugfix: Feature
Binary Source: No

Signed-off-by: dy_study <dingyao5@huawei.com>
Change-Id: I4e9c1a903d07e21596041c8189f4e4777480cce2
This commit is contained in:
dy_study 2022-04-09 14:39:43 +08:00
parent 3253838b43
commit b23feda515
17 changed files with 69 additions and 288 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bundle.json
View File

@ -156,18 +156,6 @@
]
},
"name": "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native"
},
{
"header": {
"header_base": "//foundation/aafwk/standard/common/task_dispatcher/include",
"header_files": [
"dispatcher/parallel_task_dispatcher.h",
"dispatcher/task_dispatcher_context.h",
"threading/runnable.h",
"task/task.h"
]
},
"name": "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher"
}
],
"test": [

3
common/task_dispatcher/BUILD.gn
View File

@ -54,12 +54,11 @@ ohos_shared_library("task_dispatcher") {
}
deps = []
external_deps = [
"bundle_framework:appexecfwk_base",
"eventhandler:libeventhandler",
"hiviewdfx_hilog_native:libhilog",
"utils_base:utils",
]
subsystem_name = "aafwk"
part_name = "ability_runtime"
part_name = "ability_base"
}

4
common/task_dispatcher/include/task/barrier_handler.h
View File

@ -16,11 +16,11 @@
#define OHOS_APP_DISPATCHER_BARRIER_HANDLER_H
#include <set>
#include "appexecfwk_errors.h"
#include "task.h"
#include "task_listener.h"
#include "task_errors.h"
#include "task_executor.h"
#include "task_execute_interceptor.h"
#include "task_listener.h"
#include "task_stage.h"
namespace OHOS {

33
common/task_dispatcher/include/task/task_errors.h Normal file
View File

@ -0,0 +1,33 @@
/*
* Copyright (c) 2021-2022 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef OHOS_TASK_ERRORS_H
#define OHOS_TASK_ERRORS_H
#include "errors.h"
namespace OHOS {
enum {
ABILITY_MODULE_TASK = 0x08,
};
constexpr ErrCode AAFWK_TASK_ERR_OFFSET = ErrCodeOffset(SUBSYS_APPEXECFWK, ABILITY_MODULE_TASK);
enum {
ERR_APPEXECFWK_CHECK_FAILED = AAFWK_TASK_ERR_OFFSET + 1,
ERR_APPEXECFWK_INTERCEPT_TASK_EXECUTE_SUCCESS
};
} // namespace OHOS
#endif // OHOS_TASK_ERRORS_H

2
common/task_dispatcher/include/threading/task_execute_interceptor.h
View File

@ -16,7 +16,7 @@
#ifndef OHOS_APP_DISPATCHER_TASK_TaskExecuteInterceptor_H
#define OHOS_APP_DISPATCHER_TASK_TaskExecuteInterceptor_H
#include "task.h"
#include "appexecfwk_errors.h"
#include "task_errors.h"
namespace OHOS {
namespace AppExecFwk {

3
common/task_dispatcher/include/threading/task_executor.h
View File

@ -19,12 +19,11 @@
#include <mutex>
#include <thread>
#include "appexecfwk_errors.h"
#include "blocking_queue.h"
#include "delay_execute_service.h"
#include "delay_queue.h"
#include "task.h"
#include "task_errors.h"
#include "work_thread.h"
#include "worker_pool.h"

6
common/task_dispatcher/include/threading/work_thread.h
View File

@ -18,10 +18,10 @@
#include <atomic>
#include "thread_factory.h"
#include "task.h"
#include "hilog_wrapper.h"
#include "appexecfwk_errors.h"
#include "task.h"
#include "task_errors.h"
#include "thread_factory.h"
namespace OHOS {
namespace AppExecFwk {

2
common/task_dispatcher/src/dispatcher/parallel_task_dispatcher_base.cpp
View File

@ -15,7 +15,7 @@
#include "parallel_task_dispatcher_base.h"
#include "hilog_wrapper.h"
#include "appexecfwk_errors.h"
#include "task_errors.h"
namespace OHOS {
namespace AppExecFwk {

2
common/task_dispatcher/src/dispatcher/serial_task_dispatcher.cpp
View File

@ -15,7 +15,7 @@
#include "serial_task_dispatcher.h"
#include "hilog_wrapper.h"
#include "appexecfwk_errors.h"
#include "task_errors.h"
namespace OHOS {
namespace AppExecFwk {
std::string SerialTaskDispatcher::DISPATCHER_TAG = "SerialTaskDispatcher";

2
common/task_dispatcher/test/unittest/barrier_handler_test/barrier_handler_test.cpp
View File

@ -17,8 +17,8 @@
#define private public
#include "barrier_handler.h"
#undef private
#include "appexecfwk_errors.h"
#include "default_worker_pool_config.h"
#include "task_errors.h"
using namespace testing;
using namespace testing::ext;

8
common/task_dispatcher/test/unittest/parallel_task_dispatcher_base_test/parallel_task_dispatcher_base_test.cpp
View File

@ -17,11 +17,11 @@
#define private public
#include "parallel_task_dispatcher_base.h"
#undef private
#include "appexecfwk_errors.h"
#include "task_priority.h"
#include "task_executor.h"
#include "task.h"
#include "default_worker_pool_config.h"
#include "task.h"
#include "task_errors.h"
#include "task_executor.h"
#include "task_priority.h"
using namespace testing;
using namespace testing::ext;

6
common/task_dispatcher/test/unittest/parallel_task_dispatcher_test/parallel_task_dispatcher_test.cpp
View File

@ -17,11 +17,11 @@
#define private public
#include "parallel_task_dispatcher.h"
#undef private
#include "default_worker_pool_config.h"
#include "task.h"
#include "task_errors.h"
#include "task_priority.h"
#include "task_executor.h"
#include "task.h"
#include "default_worker_pool_config.h"
#include "appexecfwk_errors.h"
using namespace testing;
using namespace testing::ext;

4
common/task_dispatcher/test/unittest/serial_task_dispatcher_test/serial_task_dispatcher_test.cpp
View File

@ -17,10 +17,10 @@
#define private public
#include "serial_task_dispatcher.h"
#undef private
#include "hilog_wrapper.h"
#include "appexecfwk_errors.h"
#include "default_worker_pool_config.h"
#include "hilog_wrapper.h"
#include "task.h"
#include "task_errors.h"
#include "task_executor.h"
#include "task_priority.h"

2
frameworks/kits/ability/native/BUILD.gn
View File

@ -232,6 +232,7 @@ ohos_shared_library("abilitykit_native") {
external_deps = [
"ability_base:base",
"ability_base:configuration",
"ability_base:task_dispatcher",
"ability_base:want",
"ability_base:zuri",
"ability_runtime:ability_context_native",
@ -239,7 +240,6 @@ ohos_shared_library("abilitykit_native") {
"ability_runtime:app_manager",
"ability_runtime:napi_base_context",
"ability_runtime:runtime",
"ability_runtime:task_dispatcher",
"ability_runtime:wantagent_innerkits",
"access_token:libaccesstoken_sdk",
"bundle_framework:appexecfwk_base",

6
frameworks/kits/appkit/native/app/include/task_dispatcher.h
View File

@ -17,11 +17,11 @@
#define OHOS_APP_DISPATCHER_TASK_DISPATCHER_H
#include <memory>
#include "task_priority.h"
#include "group.h"
#include "revocable.h"
#include "runnable.h"
#include "group.h"
#include "appexecfwk_errors.h"
#include "task_errors.h"
#include "task_priority.h"
namespace OHOS {
namespace AppExecFwk {
template<typename T>

12
interfaces/innerkits/bundle.json
View File

@ -91,6 +91,18 @@
]
},
"name": "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri"
},
{
"header": {
"header_base": "//foundation/aafwk/standard/common/task_dispatcher/include",
"header_files": [
"dispatcher/parallel_task_dispatcher.h",
"dispatcher/task_dispatcher_context.h",
"threading/runnable.h",
"task/task.h"
]
},
"name": "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher"
}
],
"test": []

250
ohos.build
View File

@ -1,250 +0,0 @@
{
"parts": {
"ability_runtime": {
"module_list": [
"//foundation/aafwk/standard/services:services_target",
"//foundation/aafwk/standard/interfaces/innerkits:innerkits_target",
"//foundation/aafwk/standard/frameworks/kits/ability/native:datashare_ext_ability_module",
"//foundation/aafwk/standard/frameworks/kits/ability/native:static_subscriber_ipc",
"//foundation/aafwk/standard/frameworks/kits/ability/native:service_extension_module",
"//foundation/aafwk/standard/sa_profile:aafwk_sa_profile",
"//foundation/aafwk/standard/interfaces/kits/napi:napi_packages",
"//foundation/aafwk/standard/frameworks/kits/ability/ability_runtime:ability_context_native",
"//foundation/aafwk/standard/common:common_target",
"//foundation/aafwk/standard/frameworks/kits/appkit:app_context",
"//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native",
"//foundation/aafwk/standard/frameworks/kits/wantagent:native_wantagent",
"//foundation/aafwk/standard/frameworks/kits/appkit:appexec",
"//foundation/aafwk/standard/test/resource/amssystemtestability/abilitySrc:ams_system_test_app"
],
"inner_kits": [
{
"header": {
"header_base": "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include",
"header_files": [
"ability_connect_callback_interface.h",
"ability_connect_callback_stub.h",
"ability_manager_client.h",
"ability_manager_errors.h",
"ability_manager_interface.h",
"ability_scheduler_interface.h",
"stop_user_callback.h",
"stop_user_callback_stub.h"
]
},
"name": "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager"
},
{
"header": {
"header_base": "//foundation/aafwk/standard/frameworks/kits/ability/ability_runtime/include",
"header_files": [
"ability_context.h"
]
},
"name": "//foundation/aafwk/standard/frameworks/kits/ability/ability_runtime:ability_context_native"
},
{
"header": {
"header_base": "//foundation/aafwk/standard/interfaces/innerkits/runtime/include/",
"header_files": [
"js_runtime.h",
"runtime.h"
]
},
"name": "//foundation/aafwk/standard/interfaces/innerkits/runtime:runtime"
},
{
"header": {
"header_base": "//foundation/aafwk/standard/interfaces/innerkits/napi_base_context/include",
"header_files": [
"napi_base_context.h"
]
},
"name": "//foundation/aafwk/standard/interfaces/innerkits/napi_base_context:napi_base_context"
},
{
"header": {
"header_base": "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include",
"header_files": [
"appmgr/app_mgr_client.h",
"appmgr/iapp_state_callback.h",
"appmgr/app_state_callback_host.h",
"appmgr/app_mgr_constants.h",
"appmgr/app_process_data.h",
"appmgr/irender_scheduler.h",
"appmgr/render_scheduler_host.h"
]
},
"name": "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager"
},
{
"header": {
"header_base": "//foundation/aafwk/standard/frameworks/kits/ability/native/include/",
"header_files": [
"extension_base.h",
"extension_context.h",
"extension_module_loader.h",
"service_extension.h",
"service_extension_context.h"
]
},
"name": "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native"
},
{
"header": {
"header_base": "//foundation/aafwk/standard/common/task_dispatcher/include",
"header_files": [
"dispatcher/parallel_task_dispatcher.h",
"dispatcher/task_dispatcher_context.h",
"threading/runnable.h",
"task/task.h"
]
},
"name": "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher"
}
],
"test_list": [
"//foundation/aafwk/standard/frameworks/kits/content/cpp/test:unittest",
"//foundation/aafwk/standard/frameworks/kits/ability/native/test:unittest",
"//foundation/aafwk/standard/frameworks/kits/ability/ability_runtime/test/moduletest:moduletest",
"//foundation/aafwk/standard/frameworks/kits/ability/ability_runtime/test/unittest:unittest",
"//foundation/aafwk/standard/frameworks/kits/test:moduletest",
"//foundation/aafwk/standard/services/test:moduletest",
"//foundation/aafwk/standard/services:unittest",
"//foundation/aafwk/standard/common/task_dispatcher/test:unittest",
"//foundation/aafwk/standard/common/test:moduletest",
"//foundation/aafwk/standard/frameworks/kits/appkit/native/test:unittest",
"//foundation/aafwk/standard/frameworks/kits/appkit/test:moduletest",
"//foundation/aafwk/standard/services/appmgr/test:unittest"
]
},
"ability_tools": {
"module_list": [
"//foundation/aafwk/standard/tools:tools_target"
],
"inner_kits": [
],
"test_list": [
"//foundation/aafwk/standard/tools/test:systemtest",
"//foundation/aafwk/standard/tools/test:moduletest",
"//foundation/aafwk/standard/tools/test:unittest"
]
},
"form_runtime": {
"module_list": [
"//foundation/aafwk/standard/sa_profile:form_sa_profile",
"//foundation/aafwk/standard/services:fms_services_target",
"//foundation/aafwk/standard/interfaces/innerkits:fms_innerkits_target",
"//foundation/aafwk/standard/frameworks/kits/fmskit:fmskit_native",
"//foundation/aafwk/standard/interfaces/kits/napi:form_napi_packages",
"//foundation/aafwk/standard/test/resource/formsystemtestability:fms_system_test_app"
],
"inner_kits": [
{
"header": {
"header_base": "//foundation/aafwk/standard/interfaces/innerkits/form_manager/include",
"header_files": [
"form_death_callback.h",
"form_host_interface.h",
"form_host_stub.h",
"form_js_info.h",
"form_mgr_interface.h",
"form_mgr_stub.h",
"form_provider_data.h",
"form_provider_interface.h",
"form_provider_stub.h",
"form_supply_interface.h",
"form_supply_stub.h",
"provider_connect_stub.h",
"form_constants.h",
"form_js_info.h"
]
},
"name": "//foundation/aafwk/standard/interfaces/innerkits/form_manager:form_manager"
},
{
"header": {
"header_base": "//foundation/aafwk/standard/frameworks/kits/fmskit/native/include",
"header_files": [
"form_callback_interface.h",
"form_host_client.h",
"form_mgr.h"
]
},
"name": "//foundation/aafwk/standard/frameworks/kits/fmskit:fmskit_native"
}
],
"test_list": [
"//foundation/aafwk/standard/services/formmgr/test:unittest",
"//foundation/aafwk/standard/test/systemtest:systemtest"
]
},
"ability_base": {
"module_list": [
"//foundation/aafwk/standard/interfaces/innerkits:base_innerkits_target"
],
"inner_kits": [
{
"header": {
"header_base": "//foundation/aafwk/standard/interfaces/innerkits/base/include/",
"header_files": [
"ohos/aafwk/base/array_wrapper.h",
"ohos/aafwk/base/base_def.h",
"ohos/aafwk/base/base_interfaces.h",
"ohos/aafwk/base/base_object.h",
"ohos/aafwk/base/base_types.h",
"ohos/aafwk/base/bool_wrapper.h",
"ohos/aafwk/base/byte_wrapper.h",
"ohos/aafwk/base/double_wrapper.h",
"ohos/aafwk/base/float_wrapper.h",
"ohos/aafwk/base/int_wrapper.h",
"ohos/aafwk/base/light_refbase.h",
"ohos/aafwk/base/long_wrapper.h",
"ohos/aafwk/base/short_wrapper.h",
"ohos/aafwk/base/string_wrapper.h"
]
},
"name": "//foundation/aafwk/standard/interfaces/innerkits/base:base"
},
{
"header": {
"header_base": "//foundation/aafwk/standard/interfaces/innerkits/want/include/",
"header_files": [
"ohos/aafwk/content/want.h",
"ohos/aafwk/content/skills.h",
"ohos/aafwk/content/want_params.h",
"ohos/aafwk/content/match_type.h",
"ohos/aafwk/content/operation.h",
"ohos/aafwk/content/patterns_matcher.h",
"ohos/aafwk/content/pac_map.h"
]
},
"name": "//foundation/aafwk/standard/interfaces/innerkits/want:want"
},
{
"header": {
"header_base": "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr",
"header_files": [
"configuration.h",
"global_configuration_key.h"
]
},
"name": "//foundation/aafwk/standard/interfaces/innerkits/app_manager:configuration"
},
{
"header": {
"header_base": "//foundation/aafwk/standard/interfaces/innerkits/uri/include",
"header_files": [
"uri.h"
]
},
"name": "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri"
}
],
"test_list": [
]
}
},
"subsystem": "aafwk"
}