Merge branch 'master' of gitee.com:goldenroz/resourceschedule_ffrt into master

This commit is contained in:
goldenroz 2024-07-20 09:17:40 +08:00
commit 26a95c19bf
3 changed files with 7 additions and 7 deletions

View File

@ -222,16 +222,16 @@ ohos_shared_library("libffrt") {
ohos_prebuilt_etc("blacklist_cfg") { ohos_prebuilt_etc("blacklist_cfg") {
relative_install_dir = "ffrt" relative_install_dir = "ffrt"
source = "blacklist.conf" source = "worker_monitor.conf"
part_name = "ffrt" part_name = "ffrt"
subsystem_name = "resourceschedule" subsystem_name = "resourceschedule"
install_enable = true install_enable = true
install_images = [ install_images = [ "system" ]
"system"
]
} }
group("ffrt_ndk") { group("ffrt_ndk") {
deps = [ ":libffrt", deps = [
":blacklist_cfg" ] ":libffrt",
":blacklist_cfg",
]
} }

View File

@ -44,7 +44,7 @@ namespace ffrt {
WorkerMonitor::WorkerMonitor() WorkerMonitor::WorkerMonitor()
{ {
// 从配置文件读取黑名单 // 从配置文件读取黑名单
std::string filename = "/etc/ffrt/blacklist.conf"; std::string filename = "/etc/ffrt/worker_monitor.conf";
std::ifstream file(filename); std::ifstream file(filename);
std::string skipProcess; std::string skipProcess;