From a3f5a129e05331d86fc8835d23a2b8281625d3f6 Mon Sep 17 00:00:00 2001 From: huangyuxin2023 Date: Mon, 16 Oct 2023 17:17:21 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E5=88=A0=E9=99=A4prebuild.sh=E4=B8=AD?= =?UTF-8?q?=E5=AF=B9ft=5Fengine=5Fprebuild/devel=5Finc=E7=9A=84=E4=BE=9D?= =?UTF-8?q?=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/configs/system_deps.toml | 1 + build/prebuild.sh | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/build/configs/system_deps.toml b/build/configs/system_deps.toml index 0da4ad0..ba485b1 100755 --- a/build/configs/system_deps.toml +++ b/build/configs/system_deps.toml @@ -42,4 +42,5 @@ package_deps = [ "cjson-devel", # GPU render "openssl-devel", + "distributed-utils", ] diff --git a/build/prebuild.sh b/build/prebuild.sh index 0c8ead3..cde2c03 100755 --- a/build/prebuild.sh +++ b/build/prebuild.sh @@ -76,23 +76,23 @@ cd ${PREBUILD_DIR} FT_PREBUILD_DIR=$(pwd) # install prebuild library -if [ ! -d ${FT_PREBUILD_DIR}/libs ]; then -git clone https://gitee.com/yanansong/ft_engine_prebuild.git -b rpms ${FT_PREBUILD_DIR}/libs -fi +# if [ ! -d ${FT_PREBUILD_DIR}/libs ]; then +# git clone https://gitee.com/yanansong/ft_engine_prebuild.git -b rpms ${FT_PREBUILD_DIR}/libs +# fi ARCHNAME=`uname -m` -cd ${FT_PREBUILD_DIR}/libs/rpms/${ARCHNAME} -sudo ./installRPM +# cd ${FT_PREBUILD_DIR}/libs/rpms/${ARCHNAME} +# sudo ./installRPM # install prebuild include. -if [ ! -d ${FT_PREBUILD_DIR}/inc ]; then -git clone https://gitee.com/yanansong/devel_inc.git ${FT_PREBUILD_DIR}/inc -fi +# if [ ! -d ${FT_PREBUILD_DIR}/inc ]; then +# git clone https://gitee.com/yanansong/devel_inc.git ${FT_PREBUILD_DIR}/inc +# fi # copy include files to /usr/include. -cd ${FT_PREBUILD_DIR}/inc -sudo cp -fr * /usr/local/include +# cd ${FT_PREBUILD_DIR}/inc +# sudo cp -fr * /usr/local/include # install mesa_fangtian if [ ! -d ${FT_PREBUILD_DIR}/rpm/binary ]; then -- Gitee From 4958594a8fcc3e3772153847bfcdc52e8ea1d39d Mon Sep 17 00:00:00 2001 From: huangyuxin2023 Date: Mon, 16 Oct 2023 17:31:24 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E6=9A=82=E6=97=B6=E4=BF=AE=E6=94=B9git?= =?UTF-8?q?=20clone=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/prebuild.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/prebuild.sh b/build/prebuild.sh index cde2c03..0a7e4ec 100755 --- a/build/prebuild.sh +++ b/build/prebuild.sh @@ -118,21 +118,21 @@ sudo cp ${PROJECT_DIR}/window_manager/resources/config/other/window_manager_conf # ============================================================================= if [ ! -d ${PROJECT_DIR}/third_party/ft_flutter ]; then -git clone https://gitee.com/openeuler/ft_flutter.git ${PROJECT_DIR}/third_party/ft_flutter +git clone https://gitee.com/huangyuxin2023/ft_flutter.git ${PROJECT_DIR}/third_party/ft_flutter fi cd ${PROJECT_DIR}/third_party/ft_flutter ./project_build/prebuild.sh ./build.sh $* if [ ! -d ${PROJECT_DIR}/third_party/ft_multimedia ]; then -git clone https://gitee.com/openeuler/ft_multimedia.git ${PROJECT_DIR}/third_party/ft_multimedia +git clone https://gitee.com/huangyuxin2023/ft_multimedia.git ${PROJECT_DIR}/third_party/ft_multimedia fi cd ${PROJECT_DIR}/third_party/ft_multimedia ./build/prebuild.sh $* ./build.sh $* if [ ! -d ${PROJECT_DIR}/third_party/ft_mmi ]; then -git clone https://gitee.com/openeuler/ft_mmi.git ${PROJECT_DIR}/third_party/ft_mmi +git clone https://gitee.com/huangyuxin2023/ft_mmi.git ${PROJECT_DIR}/third_party/ft_mmi fi cd ${PROJECT_DIR}/third_party/ft_mmi ./build/prebuild.sh -- Gitee From 59fa75106f7714b47b43ddc603d47eac3bbc6d9f Mon Sep 17 00:00:00 2001 From: huangyuxin2023 Date: Tue, 17 Oct 2023 21:05:32 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E6=9A=82=E6=97=B6=E4=BF=AE=E6=94=B9git?= =?UTF-8?q?=20clone=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/prebuild.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/prebuild.sh b/build/prebuild.sh index 0a7e4ec..b3950aa 100755 --- a/build/prebuild.sh +++ b/build/prebuild.sh @@ -96,7 +96,7 @@ ARCHNAME=`uname -m` # install mesa_fangtian if [ ! -d ${FT_PREBUILD_DIR}/rpm/binary ]; then - git clone https://gitee.com/ShaoboFeng/rpm-fangtian.git ${FT_PREBUILD_DIR}/rpm/binary + git clone https://gitee.com/huangyuxin2023/rpm-fangtian.git ${FT_PREBUILD_DIR}/rpm/binary fi cd ${FT_PREBUILD_DIR}/rpm/binary ./install.sh -- Gitee From 1fe6384d77e0d8f304064c5e4c50522591230ea9 Mon Sep 17 00:00:00 2001 From: huangyuxin2023 Date: Tue, 17 Oct 2023 23:48:25 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=B4=E6=96=87?= =?UTF-8?q?=E4=BB=B6unique=5Ffd.h=E4=B8=BA=E5=B0=96=E6=8B=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drivers/hal/base/includes/event_loop/event_poller.h | 2 +- .../drivers/hal/base/includes/event_loop/timer_queue.h | 2 +- .../drivers/hal/drm_backend/display_device/drm_device.h | 2 +- .../drivers/hal/drm_backend/display_device/hdi_layer.h | 2 +- .../test/systemtest/rs_interfaces_test_utils.h | 2 +- window_manager/test/systemtest/dms/display_test_utils.h | 2 +- window_manager/utils/src/surface_reader.cpp | 2 +- window_manager/wmserver/src/window_dumper.cpp | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/display_server/drivers/hal/base/includes/event_loop/event_poller.h b/display_server/drivers/hal/base/includes/event_loop/event_poller.h index 3ac2e4c..9b27e47 100644 --- a/display_server/drivers/hal/base/includes/event_loop/event_poller.h +++ b/display_server/drivers/hal/base/includes/event_loop/event_poller.h @@ -18,7 +18,7 @@ #include #include -#include "unique_fd.h" +#include #include "event_channel.h" namespace FT { diff --git a/display_server/drivers/hal/base/includes/event_loop/timer_queue.h b/display_server/drivers/hal/base/includes/event_loop/timer_queue.h index 43c95bc..575ca3f 100644 --- a/display_server/drivers/hal/base/includes/event_loop/timer_queue.h +++ b/display_server/drivers/hal/base/includes/event_loop/timer_queue.h @@ -19,7 +19,7 @@ #include #include -#include "unique_fd.h" +#include #include "event_channel.h" #include "timer.h" diff --git a/display_server/drivers/hal/drm_backend/display_device/drm_device.h b/display_server/drivers/hal/drm_backend/display_device/drm_device.h index e3ac8b2..5eca79e 100644 --- a/display_server/drivers/hal/drm_backend/display_device/drm_device.h +++ b/display_server/drivers/hal/drm_backend/display_device/drm_device.h @@ -23,7 +23,7 @@ #endif // DRM_BACKEND_USE_GBM #include "hdi_display.h" -#include "unique_fd.h" +#include #include "drm_crtc.h" #include "drm_connector.h" #include "drm_encoder.h" diff --git a/display_server/drivers/hal/drm_backend/display_device/hdi_layer.h b/display_server/drivers/hal/drm_backend/display_device/hdi_layer.h index 36f96f3..7bd863d 100644 --- a/display_server/drivers/hal/drm_backend/display_device/hdi_layer.h +++ b/display_server/drivers/hal/drm_backend/display_device/hdi_layer.h @@ -18,7 +18,7 @@ #include #include -#include "unique_fd.h" +#include #include "display_type.h" #include "noncopyable_hal.h" diff --git a/display_server/rosen/modules/render_service_client/test/systemtest/rs_interfaces_test_utils.h b/display_server/rosen/modules/render_service_client/test/systemtest/rs_interfaces_test_utils.h index b63ebaf..ca6bb7b 100644 --- a/display_server/rosen/modules/render_service_client/test/systemtest/rs_interfaces_test_utils.h +++ b/display_server/rosen/modules/render_service_client/test/systemtest/rs_interfaces_test_utils.h @@ -29,7 +29,7 @@ #include "ui/rs_root_node.h" #include "ui/rs_surface_node.h" #include "ui/rs_ui_director.h" -#include "unique_fd.h" +#include #include "window.h" #include "window_manager_hilog.h" #include "window_option.h" diff --git a/window_manager/test/systemtest/dms/display_test_utils.h b/window_manager/test/systemtest/dms/display_test_utils.h index 7d95d69..e70d035 100644 --- a/window_manager/test/systemtest/dms/display_test_utils.h +++ b/window_manager/test/systemtest/dms/display_test_utils.h @@ -27,7 +27,7 @@ #include "wm_common.h" #include "dm_common.h" #include "window_manager_hilog.h" -#include "unique_fd.h" +#include #include "ui/rs_surface_node.h" #include "ui/rs_display_node.h" diff --git a/window_manager/utils/src/surface_reader.cpp b/window_manager/utils/src/surface_reader.cpp index 9cf1cd1..dddbd9b 100644 --- a/window_manager/utils/src/surface_reader.cpp +++ b/window_manager/utils/src/surface_reader.cpp @@ -15,7 +15,7 @@ #include "surface_reader.h" #include "window_manager_hilog.h" -#include "unique_fd.h" +#include #include diff --git a/window_manager/wmserver/src/window_dumper.cpp b/window_manager/wmserver/src/window_dumper.cpp index 9dc301f..1ee54b2 100644 --- a/window_manager/wmserver/src/window_dumper.cpp +++ b/window_manager/wmserver/src/window_dumper.cpp @@ -23,7 +23,7 @@ #include "display_manager_service_inner.h" #include "string_ex.h" -#include "unique_fd.h" +#include #include "window_manager_hilog.h" #include "window_manager_service.h" #include "wm_common.h" -- Gitee From 3075e5542140ecbbcd057d4a8d96def860292de4 Mon Sep 17 00:00:00 2001 From: huangyuxin2023 Date: Fri, 20 Oct 2023 13:20:02 +0800 Subject: [PATCH 05/16] =?UTF-8?q?Revert=20"=E4=BF=AE=E6=94=B9=E5=A4=B4?= =?UTF-8?q?=E6=96=87=E4=BB=B6unique=5Ffd.h=E4=B8=BA=E5=B0=96=E6=8B=AC?= =?UTF-8?q?=E5=8F=B7"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 1fe6384d77e0d8f304064c5e4c50522591230ea9. --- .../drivers/hal/base/includes/event_loop/event_poller.h | 2 +- .../drivers/hal/base/includes/event_loop/timer_queue.h | 2 +- .../drivers/hal/drm_backend/display_device/drm_device.h | 2 +- .../drivers/hal/drm_backend/display_device/hdi_layer.h | 2 +- .../test/systemtest/rs_interfaces_test_utils.h | 2 +- window_manager/test/systemtest/dms/display_test_utils.h | 2 +- window_manager/utils/src/surface_reader.cpp | 2 +- window_manager/wmserver/src/window_dumper.cpp | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/display_server/drivers/hal/base/includes/event_loop/event_poller.h b/display_server/drivers/hal/base/includes/event_loop/event_poller.h index 9b27e47..3ac2e4c 100644 --- a/display_server/drivers/hal/base/includes/event_loop/event_poller.h +++ b/display_server/drivers/hal/base/includes/event_loop/event_poller.h @@ -18,7 +18,7 @@ #include #include -#include +#include "unique_fd.h" #include "event_channel.h" namespace FT { diff --git a/display_server/drivers/hal/base/includes/event_loop/timer_queue.h b/display_server/drivers/hal/base/includes/event_loop/timer_queue.h index 575ca3f..43c95bc 100644 --- a/display_server/drivers/hal/base/includes/event_loop/timer_queue.h +++ b/display_server/drivers/hal/base/includes/event_loop/timer_queue.h @@ -19,7 +19,7 @@ #include #include -#include +#include "unique_fd.h" #include "event_channel.h" #include "timer.h" diff --git a/display_server/drivers/hal/drm_backend/display_device/drm_device.h b/display_server/drivers/hal/drm_backend/display_device/drm_device.h index 5eca79e..e3ac8b2 100644 --- a/display_server/drivers/hal/drm_backend/display_device/drm_device.h +++ b/display_server/drivers/hal/drm_backend/display_device/drm_device.h @@ -23,7 +23,7 @@ #endif // DRM_BACKEND_USE_GBM #include "hdi_display.h" -#include +#include "unique_fd.h" #include "drm_crtc.h" #include "drm_connector.h" #include "drm_encoder.h" diff --git a/display_server/drivers/hal/drm_backend/display_device/hdi_layer.h b/display_server/drivers/hal/drm_backend/display_device/hdi_layer.h index 7bd863d..36f96f3 100644 --- a/display_server/drivers/hal/drm_backend/display_device/hdi_layer.h +++ b/display_server/drivers/hal/drm_backend/display_device/hdi_layer.h @@ -18,7 +18,7 @@ #include #include -#include +#include "unique_fd.h" #include "display_type.h" #include "noncopyable_hal.h" diff --git a/display_server/rosen/modules/render_service_client/test/systemtest/rs_interfaces_test_utils.h b/display_server/rosen/modules/render_service_client/test/systemtest/rs_interfaces_test_utils.h index ca6bb7b..b63ebaf 100644 --- a/display_server/rosen/modules/render_service_client/test/systemtest/rs_interfaces_test_utils.h +++ b/display_server/rosen/modules/render_service_client/test/systemtest/rs_interfaces_test_utils.h @@ -29,7 +29,7 @@ #include "ui/rs_root_node.h" #include "ui/rs_surface_node.h" #include "ui/rs_ui_director.h" -#include +#include "unique_fd.h" #include "window.h" #include "window_manager_hilog.h" #include "window_option.h" diff --git a/window_manager/test/systemtest/dms/display_test_utils.h b/window_manager/test/systemtest/dms/display_test_utils.h index e70d035..7d95d69 100644 --- a/window_manager/test/systemtest/dms/display_test_utils.h +++ b/window_manager/test/systemtest/dms/display_test_utils.h @@ -27,7 +27,7 @@ #include "wm_common.h" #include "dm_common.h" #include "window_manager_hilog.h" -#include +#include "unique_fd.h" #include "ui/rs_surface_node.h" #include "ui/rs_display_node.h" diff --git a/window_manager/utils/src/surface_reader.cpp b/window_manager/utils/src/surface_reader.cpp index dddbd9b..9cf1cd1 100644 --- a/window_manager/utils/src/surface_reader.cpp +++ b/window_manager/utils/src/surface_reader.cpp @@ -15,7 +15,7 @@ #include "surface_reader.h" #include "window_manager_hilog.h" -#include +#include "unique_fd.h" #include diff --git a/window_manager/wmserver/src/window_dumper.cpp b/window_manager/wmserver/src/window_dumper.cpp index 1ee54b2..9dc301f 100644 --- a/window_manager/wmserver/src/window_dumper.cpp +++ b/window_manager/wmserver/src/window_dumper.cpp @@ -23,7 +23,7 @@ #include "display_manager_service_inner.h" #include "string_ex.h" -#include +#include "unique_fd.h" #include "window_manager_hilog.h" #include "window_manager_service.h" #include "wm_common.h" -- Gitee From d33cda1241d07aa4bbddb4c50cf4cda40fb0e211 Mon Sep 17 00:00:00 2001 From: huangyuxin2023 Date: Fri, 20 Oct 2023 17:58:45 +0800 Subject: [PATCH 06/16] Update BUILD.gn --- build/gn/configs/system_libs/BUILD.gn | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/build/gn/configs/system_libs/BUILD.gn b/build/gn/configs/system_libs/BUILD.gn index 235c4f6..3d24196 100644 --- a/build/gn/configs/system_libs/BUILD.gn +++ b/build/gn/configs/system_libs/BUILD.gn @@ -14,36 +14,36 @@ config("c_utils_config") { visibility = [ ":*" ] - include_dirs = [ "${sys_inc}/c_utils" ] - libs = [ "utils", "sec_shared" ] + # include_dirs = [ "${sys_inc}/c_utils" ] + libs = [ "utils.z", "boundscheck" ] } config("ipc_core_config") { visibility = [ ":*" ] - include_dirs = [ "${sys_inc}/ipc_core" ] - libs = [ "ipc_core" ] + # include_dirs = [ "${sys_inc}/ipc" ] + libs = [ "ipc_core.z" ] } config("hilog_config") { visibility = [ ":*" ] - include_dirs = [ "${sys_inc}/hilog" ] - libs = [ "hilog" ] + # include_dirs = [ "${sys_inc}/hilog" ] + libs = [ "hilog.z" ] } config("hitrace_meter_config") { visibility = [ ":*" ] - include_dirs = [ "${sys_inc}/hitrace_meter" ] + # include_dirs = [ "${sys_inc}/hitrace_meter" ] libs = [ "hitrace_meter" ] } config("eventhandler_config") { visibility = [ ":*" ] - include_dirs = [ "${sys_inc}/eventhandler" ] - libs = [ "eventhandler" ] + # include_dirs = [ "${sys_inc}/eventhandler" ] + libs = [ "eventhandler.z" ] } config("skia_config") { -- Gitee From 013de77f75d4a1f332095b53644c013acfa1057e Mon Sep 17 00:00:00 2001 From: huangyuxin2023 Date: Fri, 20 Oct 2023 18:17:20 +0800 Subject: [PATCH 07/16] Update BUILD.gn --- build/gn/configs/system_libs/BUILD.gn | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/build/gn/configs/system_libs/BUILD.gn b/build/gn/configs/system_libs/BUILD.gn index 3d24196..a31b5ac 100644 --- a/build/gn/configs/system_libs/BUILD.gn +++ b/build/gn/configs/system_libs/BUILD.gn @@ -14,35 +14,41 @@ config("c_utils_config") { visibility = [ ":*" ] - # include_dirs = [ "${sys_inc}/c_utils" ] - libs = [ "utils.z", "boundscheck" ] + include_dirs = [ "${sys_inc}/c_utils" ] + libs = [ "utils", "sec_shared" ] +} + +config("boundscheck_config") { + visibility = [ ":*" ] + + libs = [ "boundscheck" ] } config("ipc_core_config") { visibility = [ ":*" ] - # include_dirs = [ "${sys_inc}/ipc" ] + include_dirs = [ "${sys_inc}/ipc" ] libs = [ "ipc_core.z" ] } config("hilog_config") { visibility = [ ":*" ] - # include_dirs = [ "${sys_inc}/hilog" ] + include_dirs = [ "${sys_inc}/hilog" ] libs = [ "hilog.z" ] } config("hitrace_meter_config") { visibility = [ ":*" ] - # include_dirs = [ "${sys_inc}/hitrace_meter" ] + include_dirs = [ "${sys_inc}/hitrace_meter" ] libs = [ "hitrace_meter" ] } config("eventhandler_config") { visibility = [ ":*" ] - # include_dirs = [ "${sys_inc}/eventhandler" ] + include_dirs = [ "${sys_inc}/eventhandler" ] libs = [ "eventhandler.z" ] } -- Gitee From 341f90060b82bf59db7d3def32d0ff44fccfc8c6 Mon Sep 17 00:00:00 2001 From: huang yuxin Date: Fri, 20 Oct 2023 10:31:17 +0000 Subject: [PATCH 08/16] update build/prebuild.sh. Signed-off-by: huang yuxin --- build/prebuild.sh | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/build/prebuild.sh b/build/prebuild.sh index 0c8ead3..73c7087 100755 --- a/build/prebuild.sh +++ b/build/prebuild.sh @@ -75,28 +75,11 @@ fi cd ${PREBUILD_DIR} FT_PREBUILD_DIR=$(pwd) -# install prebuild library -if [ ! -d ${FT_PREBUILD_DIR}/libs ]; then -git clone https://gitee.com/yanansong/ft_engine_prebuild.git -b rpms ${FT_PREBUILD_DIR}/libs -fi - ARCHNAME=`uname -m` -cd ${FT_PREBUILD_DIR}/libs/rpms/${ARCHNAME} -sudo ./installRPM - -# install prebuild include. -if [ ! -d ${FT_PREBUILD_DIR}/inc ]; then -git clone https://gitee.com/yanansong/devel_inc.git ${FT_PREBUILD_DIR}/inc -fi - -# copy include files to /usr/include. -cd ${FT_PREBUILD_DIR}/inc -sudo cp -fr * /usr/local/include - # install mesa_fangtian if [ ! -d ${FT_PREBUILD_DIR}/rpm/binary ]; then - git clone https://gitee.com/ShaoboFeng/rpm-fangtian.git ${FT_PREBUILD_DIR}/rpm/binary + git clone https://gitee.com/huangyuxin2023/rpm-fangtian.git ${FT_PREBUILD_DIR}/rpm/binary fi cd ${FT_PREBUILD_DIR}/rpm/binary ./install.sh @@ -118,21 +101,21 @@ sudo cp ${PROJECT_DIR}/window_manager/resources/config/other/window_manager_conf # ============================================================================= if [ ! -d ${PROJECT_DIR}/third_party/ft_flutter ]; then -git clone https://gitee.com/openeuler/ft_flutter.git ${PROJECT_DIR}/third_party/ft_flutter +git clone https://gitee.com/huangyuxin2023/ft_flutter.git ${PROJECT_DIR}/third_party/ft_flutter fi cd ${PROJECT_DIR}/third_party/ft_flutter ./project_build/prebuild.sh ./build.sh $* if [ ! -d ${PROJECT_DIR}/third_party/ft_multimedia ]; then -git clone https://gitee.com/openeuler/ft_multimedia.git ${PROJECT_DIR}/third_party/ft_multimedia +git clone https://gitee.com/huangyuxin2023/ft_multimedia.git ${PROJECT_DIR}/third_party/ft_multimedia fi cd ${PROJECT_DIR}/third_party/ft_multimedia ./build/prebuild.sh $* ./build.sh $* if [ ! -d ${PROJECT_DIR}/third_party/ft_mmi ]; then -git clone https://gitee.com/openeuler/ft_mmi.git ${PROJECT_DIR}/third_party/ft_mmi +git clone https://gitee.com/huangyuxin2023/ft_mmi.git ${PROJECT_DIR}/third_party/ft_mmi fi cd ${PROJECT_DIR}/third_party/ft_mmi ./build/prebuild.sh -- Gitee From 23ec60ddb6354bb66ce75de873a1e0169af033f3 Mon Sep 17 00:00:00 2001 From: huang yuxin Date: Fri, 20 Oct 2023 10:33:37 +0000 Subject: [PATCH 09/16] update build/configs/system_deps.toml. Signed-off-by: huang yuxin --- build/configs/system_deps.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/build/configs/system_deps.toml b/build/configs/system_deps.toml index 7ed642c..167192e 100755 --- a/build/configs/system_deps.toml +++ b/build/configs/system_deps.toml @@ -43,4 +43,5 @@ package_deps = [ "cjson-devel", # GPU render "openssl-devel", + "distributed-utils", ] -- Gitee From fcf7ea9ce39333a919c81295866e51e1b8c72854 Mon Sep 17 00:00:00 2001 From: huangyuxin2023 Date: Sun, 22 Oct 2023 17:43:29 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=B4=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=92=8Cso=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/gn/configs/system_libs/BUILD.gn | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/build/gn/configs/system_libs/BUILD.gn b/build/gn/configs/system_libs/BUILD.gn index 30f2a02..9420df6 100644 --- a/build/gn/configs/system_libs/BUILD.gn +++ b/build/gn/configs/system_libs/BUILD.gn @@ -14,35 +14,29 @@ config("c_utils_config") { visibility = [ ":*" ] - include_dirs = [ "${sys_inc}/c_utils" ] - libs = [ "utils", "sec_shared" ] -} - -config("boundscheck_config") { - visibility = [ ":*" ] - - libs = [ "boundscheck" ] + include_dirs = [ "${usr_inc}/c_utils" ] + libs = [ "utils.z", "boundscheck" ] } config("ipc_core_config") { visibility = [ ":*" ] - include_dirs = [ "${sys_inc}/ipc" ] + include_dirs = [ "//display_server/rosen/modules/platform/ipc_core" ] libs = [ "ipc_core.z" ] } config("hilog_config") { visibility = [ ":*" ] - include_dirs = [ "${sys_inc}/hilog" ] + include_dirs = [ "${usr_inc}/hilog" ] libs = [ "hilog.z" ] } config("hitrace_meter_config") { visibility = [ ":*" ] - include_dirs = [ "${sys_inc}/hitrace_meter" ] - libs = [ "hitrace_meter" ] + include_dirs = [ "//third_party/ft_multimedia/image_framework/mock/native/include" ] + # libs = [ "hitrace_meter" ] } config("eventhandler_config") { -- Gitee From 3a6c99919b0aa928c66ab098b1807029a0f55a68 Mon Sep 17 00:00:00 2001 From: huangyuxin2023 Date: Mon, 23 Oct 2023 11:49:52 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89hitrace?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/configs/system_deps.toml | 1 + build/gn/BUILDCONFIG.gn | 3 +-- build/gn/configs/system_libs/BUILD.gn | 27 ++++++++++--------- build/prebuild.sh | 12 ++++++--- .../hal/drm_backend/display_gralloc/BUILD.gn | 2 +- .../bootanimation/src/boot_animation.cpp | 20 +++++++------- .../frameworks/surface/ft_build/BUILD.gn | 4 +-- .../modules/effect/effectChain/src/filter.cpp | 4 +-- .../skia_effectChain/src/sk_image_chain.cpp | 4 +-- .../modules/frame_analyzer/ft_build/BUILD.gn | 2 +- .../core/pipeline/rs_cold_start_thread.cpp | 4 +-- .../core/pipeline/rs_main_thread.cpp | 12 ++++----- .../pipeline/rs_render_service_connection.cpp | 4 +-- .../core/pipeline/rs_uni_render_visitor.cpp | 12 ++++----- .../modules/render_service/ft_build/BUILD.gn | 2 +- .../render_service_base/ft_build/BUILD.gn | 2 +- .../src/platform/fangtian/BUILD.gn | 2 +- .../rs_render_service_connection_proxy.cpp | 4 +-- .../rs_render_service_connection_proxy.cpp | 4 +-- .../src/property/rs_property_trace.cpp | 4 +-- .../core/pipeline/rs_render_thread.cpp | 24 ++++++++--------- .../pipeline/rs_render_thread_visitor.cpp | 16 +++++------ .../core/ui/rs_ui_director.cpp | 4 +-- .../render_service_client/ft_build/BUILD.gn | 2 +- .../utils/buffer_handle/ft_build/BUILD.gn | 2 +- display_server/utils/log/rs_trace.h | 10 +++---- .../utils/scoped_bytrace/ft_build/BUILD.gn | 5 ++-- .../scoped_bytrace/src/scoped_bytrace.cpp | 8 +++--- .../utils/sync_fence/ft_build/BUILD.gn | 2 +- window_manager/dmserver/ft_build/BUILD.gn | 2 +- .../wmserver/src/window_node_container.cpp | 6 ++--- 31 files changed, 109 insertions(+), 101 deletions(-) diff --git a/build/configs/system_deps.toml b/build/configs/system_deps.toml index 167192e..02c834b 100755 --- a/build/configs/system_deps.toml +++ b/build/configs/system_deps.toml @@ -44,4 +44,5 @@ package_deps = [ # GPU render "openssl-devel", "distributed-utils", + "distributed-build", ] diff --git a/build/gn/BUILDCONFIG.gn b/build/gn/BUILDCONFIG.gn index 1f2244a..4fd86e0 100644 --- a/build/gn/BUILDCONFIG.gn +++ b/build/gn/BUILDCONFIG.gn @@ -75,8 +75,7 @@ declare_args() { is_ft_build = current_os == "linux" - sys_inc = "/usr/local/include" - usr_inc = "/usr/include" + sys_inc = "/usr/include" } if (use_musl_oh == true) { diff --git a/build/gn/configs/system_libs/BUILD.gn b/build/gn/configs/system_libs/BUILD.gn index 9420df6..5a46c60 100644 --- a/build/gn/configs/system_libs/BUILD.gn +++ b/build/gn/configs/system_libs/BUILD.gn @@ -13,8 +13,9 @@ config("c_utils_config") { visibility = [ ":*" ] - - include_dirs = [ "${usr_inc}/c_utils" ] + + include_dirs = [ "/opt/distributed-middleware-build/openeuler/compiler_include" ] + include_dirs += [ "${sys_inc}/c_utils" ] libs = [ "utils.z", "boundscheck" ] } @@ -28,16 +29,16 @@ config("ipc_core_config") { config("hilog_config") { visibility = [ ":*" ] - include_dirs = [ "${usr_inc}/hilog" ] + include_dirs = [ "${sys_inc}/hilog" ] libs = [ "hilog.z" ] } -config("hitrace_meter_config") { - visibility = [ ":*" ] +# config("hitrace_meter_config") { + # visibility = [ ":*" ] - include_dirs = [ "//third_party/ft_multimedia/image_framework/mock/native/include" ] + # include_dirs = [ "${sys_inc}/hitrace_meter" ] # libs = [ "hitrace_meter" ] -} +# } config("eventhandler_config") { visibility = [ ":*" ] @@ -108,7 +109,7 @@ config("gtest_config") { config("harfbuzz_config") { visibility = [ ":*" ] - include_dirs = [ "/usr/include/harfbuzz" ] + include_dirs = [ "${sys_inc}/harfbuzz" ] libs = ["harfbuzz"] } @@ -133,10 +134,10 @@ group("eventhandler") { public_configs = [ ":eventhandler_config" ] } -group("hitrace_meter") { - public_deps = [ ":c_utils" ] - public_configs = [ ":hitrace_meter_config" ] -} +# group("hitrace_meter") { +# public_deps = [ ":c_utils" ] +# public_configs = [ ":hitrace_meter_config" ] +# } group("samgr") { public_deps = [ ":c_utils" ] @@ -146,7 +147,7 @@ group("samgr") { group("image") { public_deps = [ ":hilog", - ":hitrace_meter", + # ":hitrace_meter", ":c_utils", ":ipc_core", ] diff --git a/build/prebuild.sh b/build/prebuild.sh index 73c7087..a83df4e 100644 --- a/build/prebuild.sh +++ b/build/prebuild.sh @@ -101,23 +101,29 @@ sudo cp ${PROJECT_DIR}/window_manager/resources/config/other/window_manager_conf # ============================================================================= if [ ! -d ${PROJECT_DIR}/third_party/ft_flutter ]; then -git clone https://gitee.com/huangyuxin2023/ft_flutter.git ${PROJECT_DIR}/third_party/ft_flutter +git clone -b 2203sp2_20231023 https://gitee.com/openeuler/ft_flutter.git ${PROJECT_DIR}/third_party/ft_flutter fi cd ${PROJECT_DIR}/third_party/ft_flutter +git fetch https://gitee.com/openeuler/ft_flutter.git pull/24/head:pr_24 +git checkout pr_24 ./project_build/prebuild.sh ./build.sh $* if [ ! -d ${PROJECT_DIR}/third_party/ft_multimedia ]; then -git clone https://gitee.com/huangyuxin2023/ft_multimedia.git ${PROJECT_DIR}/third_party/ft_multimedia +git clone -b 2203sp2_20231023 https://gitee.com/openeuler/ft_multimedia.git ${PROJECT_DIR}/third_party/ft_multimedia fi cd ${PROJECT_DIR}/third_party/ft_multimedia +git fetch https://gitee.com/openeuler/ft_multimedia.git pull/24/head:pr_24 +git checkout pr_24 ./build/prebuild.sh $* ./build.sh $* if [ ! -d ${PROJECT_DIR}/third_party/ft_mmi ]; then -git clone https://gitee.com/huangyuxin2023/ft_mmi.git ${PROJECT_DIR}/third_party/ft_mmi +git clone -b 2203sp2_20231023 https://gitee.com/openeuler/ft_mmi.git ${PROJECT_DIR}/third_party/ft_mmi fi cd ${PROJECT_DIR}/third_party/ft_mmi +git fetch https://gitee.com/openeuler/ft_mmi.git pull/35/head:pr_35 +git checkout pr_35 ./build/prebuild.sh ./build.sh $* diff --git a/display_server/drivers/hal/drm_backend/display_gralloc/BUILD.gn b/display_server/drivers/hal/drm_backend/display_gralloc/BUILD.gn index eb6310f..b2b7627 100644 --- a/display_server/drivers/hal/drm_backend/display_gralloc/BUILD.gn +++ b/display_server/drivers/hal/drm_backend/display_gralloc/BUILD.gn @@ -19,7 +19,7 @@ config("display_gralloc_public_config") { "//display_server/drivers/hal/drm_backend/include", "//display_server/drivers/interfaces", "//display_server/drivers/base", - "${usr_inc}/ftsurface", + "${sys_inc}/ftsurface", ] } diff --git a/display_server/frameworks/bootanimation/src/boot_animation.cpp b/display_server/frameworks/bootanimation/src/boot_animation.cpp index 158469f..4de5800 100644 --- a/display_server/frameworks/bootanimation/src/boot_animation.cpp +++ b/display_server/frameworks/bootanimation/src/boot_animation.cpp @@ -35,17 +35,17 @@ void BootAnimation::OnDraw(SkCanvas* canvas, int32_t curNo) std::shared_ptr imgstruct = imageVector_[curNo]; sk_sp image = imgstruct->imageData; - ROSEN_TRACE_BEGIN(HITRACE_TAG_GRAPHIC_AGP, "BootAnimation::OnDraw in drawRect"); + // ROSEN_TRACE_BEGIN(HITRACE_TAG_GRAPHIC_AGP, "BootAnimation::OnDraw in drawRect"); SkPaint backPaint; backPaint.setColor(SK_ColorBLACK); canvas->drawRect(SkRect::MakeXYWH(0.0, 0.0, windowWidth_, windowHeight_), backPaint); - ROSEN_TRACE_END(HITRACE_TAG_GRAPHIC_AGP); - ROSEN_TRACE_BEGIN(HITRACE_TAG_GRAPHIC_AGP, "BootAnimation::OnDraw in drawImageRect"); + // ROSEN_TRACE_END(HITRACE_TAG_GRAPHIC_AGP); + // ROSEN_TRACE_BEGIN(HITRACE_TAG_GRAPHIC_AGP, "BootAnimation::OnDraw in drawImageRect"); SkPaint paint; SkRect rect; rect.setXYWH(pointX_, pointY_, realWidth_, realHeight_); canvas->drawImageRect(image.get(), rect, &paint); - ROSEN_TRACE_END(HITRACE_TAG_GRAPHIC_AGP); + // ROSEN_TRACE_END(HITRACE_TAG_GRAPHIC_AGP); } void BootAnimation::Draw() @@ -56,19 +56,19 @@ void BootAnimation::Draw() CheckExitAnimation(); return; } - ROSEN_TRACE_BEGIN(HITRACE_TAG_GRAPHIC_AGP, "BootAnimation::Draw RequestFrame"); + // ROSEN_TRACE_BEGIN(HITRACE_TAG_GRAPHIC_AGP, "BootAnimation::Draw RequestFrame"); auto frame = rsSurface_->RequestFrame(windowWidth_, windowHeight_); if (frame == nullptr) { LOGE("Draw frame is nullptr"); return; } - ROSEN_TRACE_END(HITRACE_TAG_GRAPHIC_AGP); + // ROSEN_TRACE_END(HITRACE_TAG_GRAPHIC_AGP); framePtr_ = std::move(frame); auto canvas = framePtr_->GetCanvas(); OnDraw(canvas, picCurNo_); - ROSEN_TRACE_BEGIN(HITRACE_TAG_GRAPHIC_AGP, "BootAnimation::Draw FlushFrame"); + // ROSEN_TRACE_BEGIN(HITRACE_TAG_GRAPHIC_AGP, "BootAnimation::Draw FlushFrame"); rsSurface_->FlushFrame(framePtr_); - ROSEN_TRACE_END(HITRACE_TAG_GRAPHIC_AGP); + // ROSEN_TRACE_END(HITRACE_TAG_GRAPHIC_AGP); } bool BootAnimation::CheckFrameRateValid(int32_t ratevalue) @@ -101,7 +101,7 @@ void BootAnimation::Init(int32_t width, int32_t height) InitBootWindow(); InitRsSurface(); InitPicCoordinates(); - ROSEN_TRACE_BEGIN(HITRACE_TAG_GRAPHIC_AGP, "BootAnimation::preload"); + // ROSEN_TRACE_BEGIN(HITRACE_TAG_GRAPHIC_AGP, "BootAnimation::preload"); BootAniConfig jsonConfig; ReadZipFile(BOOT_PIC_ZIP, imageVector_, jsonConfig); imgVecSize_ = static_cast(imageVector_.size()); @@ -117,7 +117,7 @@ void BootAnimation::Init(int32_t width, int32_t height) LOGI("Only Support 30, 60 frame rate: %{public}d", jsonConfig.frameRate); } LOGI("end to Readzip pics freq: %{public}d totalPicNum: %{public}d", freq_, imgVecSize_); - ROSEN_TRACE_END(HITRACE_TAG_GRAPHIC_AGP); + // ROSEN_TRACE_END(HITRACE_TAG_GRAPHIC_AGP); OHOS::Rosen::VSyncReceiver::FrameCallback fcb = { .userData_ = this, diff --git a/display_server/frameworks/surface/ft_build/BUILD.gn b/display_server/frameworks/surface/ft_build/BUILD.gn index 3db9c95..686658e 100644 --- a/display_server/frameworks/surface/ft_build/BUILD.gn +++ b/display_server/frameworks/surface/ft_build/BUILD.gn @@ -33,7 +33,7 @@ config("surface_public_config") { "$display_server_root/interfaces/inner_api/common", "$display_server_root/utils/sandbox", "$display_server_root/utils/buffer_handle/export", - "${usr_inc}/ftsurface", + "${sys_inc}/ftsurface", ] defines = gpu_defines @@ -67,7 +67,7 @@ ft_shared_library("surface") { deps = [ "//build/gn/configs/system_libs:ipc_core", "//build/gn/configs/system_libs:hilog", - "//build/gn/configs/system_libs:hitrace_meter", + # "//build/gn/configs/system_libs:hitrace_meter", ] public_deps = [ "$display_server_root/utils/ft_build:libgraphic_utils", diff --git a/display_server/rosen/modules/effect/effectChain/src/filter.cpp b/display_server/rosen/modules/effect/effectChain/src/filter.cpp index 1ea1c05..98e7590 100644 --- a/display_server/rosen/modules/effect/effectChain/src/filter.cpp +++ b/display_server/rosen/modules/effect/effectChain/src/filter.cpp @@ -20,9 +20,9 @@ namespace OHOS { namespace Rosen { bool Filter::Process(ProcessData& data) { - ROSEN_TRACE_BEGIN(HITRACE_TAG_GRAPHIC_AGP, "Filter::DoProcess"); + // ROSEN_TRACE_BEGIN(HITRACE_TAG_GRAPHIC_AGP, "Filter::DoProcess"); DoProcess(data); - ROSEN_TRACE_END(HITRACE_TAG_GRAPHIC_AGP); + // ROSEN_TRACE_END(HITRACE_TAG_GRAPHIC_AGP); if (this->GetFilterType() == FILTER_TYPE::ALGOFILTER) { std::swap(data.srcTextureID, data.dstTextureID); } diff --git a/display_server/rosen/modules/effect/skia_effectChain/src/sk_image_chain.cpp b/display_server/rosen/modules/effect/skia_effectChain/src/sk_image_chain.cpp index 5081a40..2e9b2a1 100644 --- a/display_server/rosen/modules/effect/skia_effectChain/src/sk_image_chain.cpp +++ b/display_server/rosen/modules/effect/skia_effectChain/src/sk_image_chain.cpp @@ -160,7 +160,7 @@ void SKImageChain::Draw() LOGE("The image_ is nullptr, nothing to draw."); return; } - ROSEN_TRACE_BEGIN(HITRACE_TAG_GRAPHIC_AGP, "SKImageChain::Draw"); + // ROSEN_TRACE_BEGIN(HITRACE_TAG_GRAPHIC_AGP, "SKImageChain::Draw"); SkPaint paint; paint.setAntiAlias(true); paint.setBlendMode(SkBlendMode::kSrc); @@ -181,7 +181,7 @@ void SKImageChain::Draw() } } canvas_->restore(); - ROSEN_TRACE_END(HITRACE_TAG_GRAPHIC_AGP); + // ROSEN_TRACE_END(HITRACE_TAG_GRAPHIC_AGP); } SkColorType SKImageChain::PixelFormatConvert(const Media::PixelFormat& pixelFormat) diff --git a/display_server/rosen/modules/frame_analyzer/ft_build/BUILD.gn b/display_server/rosen/modules/frame_analyzer/ft_build/BUILD.gn index 716d503..471559b 100644 --- a/display_server/rosen/modules/frame_analyzer/ft_build/BUILD.gn +++ b/display_server/rosen/modules/frame_analyzer/ft_build/BUILD.gn @@ -44,7 +44,7 @@ ft_shared_library("libframe_analyzer") { deps = [ "$display_server_root/utils/sandbox/ft_build:sandbox_utils", - "//build/gn/configs/system_libs:hitrace_meter", + # "//build/gn/configs/system_libs:hitrace_meter", "//build/gn/configs/system_libs:hilog", "//build/gn/configs/system_libs:c_utils", "//build/gn/configs/system_libs:skia", diff --git a/display_server/rosen/modules/render_service/core/pipeline/rs_cold_start_thread.cpp b/display_server/rosen/modules/render_service/core/pipeline/rs_cold_start_thread.cpp index 9b503f5..c0520bb 100644 --- a/display_server/rosen/modules/render_service/core/pipeline/rs_cold_start_thread.cpp +++ b/display_server/rosen/modules/render_service/core/pipeline/rs_cold_start_thread.cpp @@ -191,13 +191,13 @@ void RSColdStartThread::PostPlayBackTask(std::shared_ptr drawCmdLis canvas->clear(SK_ColorTRANSPARENT); drawCmdList->Playback(*canvas); - RS_TRACE_BEGIN("flush"); + // RS_TRACE_BEGIN("flush"); skSurface_->flush(); #ifdef RS_ENABLE_GL glFinish(); #endif sk_sp image = skSurface_->makeImageSnapshot(); - RS_TRACE_END(); + // RS_TRACE_END(); if (node->GetCachedImage() == nullptr) { node->NotifyUIBufferAvailable(); diff --git a/display_server/rosen/modules/render_service/core/pipeline/rs_main_thread.cpp b/display_server/rosen/modules/render_service/core/pipeline/rs_main_thread.cpp index 802201c..84f62d2 100644 --- a/display_server/rosen/modules/render_service/core/pipeline/rs_main_thread.cpp +++ b/display_server/rosen/modules/render_service/core/pipeline/rs_main_thread.cpp @@ -156,7 +156,7 @@ void RSMainThread::Init() PerfMultiWindow(); RenderFrameTrace::GetInstance().RenderStartFrameTrace(RS_INTERVAL_NAME); SetRSEventDetectorLoopStartTag(); - ROSEN_TRACE_BEGIN(HITRACE_TAG_GRAPHIC_AGP, "RSMainThread::DoComposition"); + // ROSEN_TRACE_BEGIN(HITRACE_TAG_GRAPHIC_AGP, "RSMainThread::DoComposition"); ConsumeAndUpdateAllNodes(); WaitUntilUnmarshallingTaskFinished(); ProcessCommand(); @@ -166,7 +166,7 @@ void RSMainThread::Init() Render(); ReleaseAllNodesBuffer(); SendCommands(); - ROSEN_TRACE_END(HITRACE_TAG_GRAPHIC_AGP); + // ROSEN_TRACE_END(HITRACE_TAG_GRAPHIC_AGP); SetRSEventDetectorLoopFinishTag(); rsEventManager_.UpdateParam(); RS_LOGD("RsDebug mainLoop end"); @@ -371,7 +371,7 @@ void RSMainThread::ProcessCommandForUniRender() void RSMainThread::ProcessCommandForDividedRender() { const auto& nodeMap = context_->GetNodeMap(); - RS_TRACE_BEGIN("RSMainThread::ProcessCommand"); + // RS_TRACE_BEGIN("RSMainThread::ProcessCommand"); { std::lock_guard lock(transitionDataMutex_); if (!pendingEffectiveCommands_.empty()) { @@ -414,7 +414,7 @@ void RSMainThread::ProcessCommandForDividedRender() } } effectiveCommands_.clear(); - RS_TRACE_END(); + // RS_TRACE_END(); } void RSMainThread::ConsumeAndUpdateAllNodes() @@ -806,7 +806,7 @@ void RSMainThread::RequestNextVSync() void RSMainThread::OnVsync(uint64_t timestamp, void* data) { - ROSEN_TRACE_BEGIN(HITRACE_TAG_GRAPHIC_AGP, "RSMainThread::OnVsync"); + // ROSEN_TRACE_BEGIN(HITRACE_TAG_GRAPHIC_AGP, "RSMainThread::OnVsync"); timestamp_ = timestamp; requestNextVsyncNum_ = 0; if (isUniRender_) { @@ -820,7 +820,7 @@ void RSMainThread::OnVsync(uint64_t timestamp, void* data) PostTask([=]() { screenManager_->ProcessScreenHotPlugEvents(); }); } } - ROSEN_TRACE_END(HITRACE_TAG_GRAPHIC_AGP); + // ROSEN_TRACE_END(HITRACE_TAG_GRAPHIC_AGP); } void RSMainThread::Animate(uint64_t timestamp) diff --git a/display_server/rosen/modules/render_service/core/pipeline/rs_render_service_connection.cpp b/display_server/rosen/modules/render_service/core/pipeline/rs_render_service_connection.cpp index ea7fa73..af795f5 100644 --- a/display_server/rosen/modules/render_service/core/pipeline/rs_render_service_connection.cpp +++ b/display_server/rosen/modules/render_service/core/pipeline/rs_render_service_connection.cpp @@ -357,11 +357,11 @@ void RSRenderServiceConnection::TakeSurfaceCapture(NodeId id, sptr captureTask = [scaleY, scaleX, callback, id]() -> void { RS_LOGD("RSRenderService::TakeSurfaceCapture callback->OnSurfaceCapture nodeId:[%" PRIu64 "]", id); - ROSEN_TRACE_BEGIN(HITRACE_TAG_GRAPHIC_AGP, "RSRenderService::TakeSurfaceCapture"); + // ROSEN_TRACE_BEGIN(HITRACE_TAG_GRAPHIC_AGP, "RSRenderService::TakeSurfaceCapture"); RSSurfaceCaptureTask task(id, scaleX, scaleY); std::unique_ptr pixelmap = task.Run(); callback->OnSurfaceCapture(id, pixelmap.release()); - ROSEN_TRACE_END(HITRACE_TAG_GRAPHIC_AGP); + // ROSEN_TRACE_END(HITRACE_TAG_GRAPHIC_AGP); }; mainThread_->PostTask(captureTask); } diff --git a/display_server/rosen/modules/render_service/core/pipeline/rs_uni_render_visitor.cpp b/display_server/rosen/modules/render_service/core/pipeline/rs_uni_render_visitor.cpp index 6b0d8bf..6b81027 100644 --- a/display_server/rosen/modules/render_service/core/pipeline/rs_uni_render_visitor.cpp +++ b/display_server/rosen/modules/render_service/core/pipeline/rs_uni_render_visitor.cpp @@ -569,10 +569,10 @@ void RSUniRenderVisitor::ProcessDisplayRenderNode(RSDisplayRenderNode& node) } rsSurface->SetColorSpace(newColorSpace_); // we should request a framebuffer whose size is equals to the physical screen size. - RS_TRACE_BEGIN("RSUniRender:RequestFrame"); + // RS_TRACE_BEGIN("RSUniRender:RequestFrame"); auto renderFrame = renderEngine_->RequestFrame(std::static_pointer_cast(rsSurface), RSBaseRenderUtil::GetFrameBufferRequestConfig(screenInfo_, true)); - RS_TRACE_END(); + // RS_TRACE_END(); if (renderFrame == nullptr) { RS_LOGE("RSUniRenderVisitor Request Frame Failed"); return; @@ -671,12 +671,12 @@ void RSUniRenderVisitor::ProcessDisplayRenderNode(RSDisplayRenderNode& node) DrawTargetSurfaceDirtyRegionForDFX(node); } } - RS_TRACE_BEGIN("RSUniRender:FlushFrame"); + // RS_TRACE_BEGIN("RSUniRender:FlushFrame"); renderFrame->Flush(); - RS_TRACE_END(); - RS_TRACE_BEGIN("RSUniRender:WaitUtilUniRenderFinished"); + // RS_TRACE_END(); + // RS_TRACE_BEGIN("RSUniRender:WaitUtilUniRenderFinished"); RSMainThread::Instance()->WaitUtilUniRenderFinished(); - RS_TRACE_END(); + // RS_TRACE_END(); processor_->ProcessDisplaySurface(node); } processor_->PostProcess(); diff --git a/display_server/rosen/modules/render_service/ft_build/BUILD.gn b/display_server/rosen/modules/render_service/ft_build/BUILD.gn index 0a29656..821cf63 100644 --- a/display_server/rosen/modules/render_service/ft_build/BUILD.gn +++ b/display_server/rosen/modules/render_service/ft_build/BUILD.gn @@ -90,7 +90,7 @@ ft_shared_library("librender_service") { public_deps = [ "//build/gn/configs/system_libs:samgr", - "//build/gn/configs/system_libs:hitrace_meter", + # "//build/gn/configs/system_libs:hitrace_meter", "//build/gn/configs/system_libs:skia", "//build/gn/configs/system_libs:syspara", "//build/gn/configs/system_libs:safwk", diff --git a/display_server/rosen/modules/render_service_base/ft_build/BUILD.gn b/display_server/rosen/modules/render_service_base/ft_build/BUILD.gn index 157e5ba..0e3c3ba 100644 --- a/display_server/rosen/modules/render_service_base/ft_build/BUILD.gn +++ b/display_server/rosen/modules/render_service_base/ft_build/BUILD.gn @@ -185,7 +185,7 @@ ft_source_set("render_service_base_src") { deps = [ "//build/gn/configs/system_libs:c_utils", "//build/gn/configs/system_libs:ipc_core", - "//build/gn/configs/system_libs:hitrace_meter", + # "//build/gn/configs/system_libs:hitrace_meter", "//build/gn/configs/system_libs:eventhandler", "//build/gn/configs/system_libs:skia", "//build/gn/configs/system_libs:image", diff --git a/display_server/rosen/modules/render_service_base/src/platform/fangtian/BUILD.gn b/display_server/rosen/modules/render_service_base/src/platform/fangtian/BUILD.gn index 96f2cd4..c987116 100644 --- a/display_server/rosen/modules/render_service_base/src/platform/fangtian/BUILD.gn +++ b/display_server/rosen/modules/render_service_base/src/platform/fangtian/BUILD.gn @@ -100,7 +100,7 @@ ft_source_set("rosen_fangtian_sources") { deps = [ "//build/gn/configs/system_libs:hilog", "//build/gn/configs/system_libs:ipc_core", - "//build/gn/configs/system_libs:hitrace_meter", + # "//build/gn/configs/system_libs:hitrace_meter", "//build/gn/configs/system_libs:eventhandler", "//build/gn/configs/system_libs:skia", "//build/gn/configs/system_libs:samgr", diff --git a/display_server/rosen/modules/render_service_base/src/platform/fangtian/rs_render_service_connection_proxy.cpp b/display_server/rosen/modules/render_service_base/src/platform/fangtian/rs_render_service_connection_proxy.cpp index cffe922..ec176de 100644 --- a/display_server/rosen/modules/render_service_base/src/platform/fangtian/rs_render_service_connection_proxy.cpp +++ b/display_server/rosen/modules/render_service_base/src/platform/fangtian/rs_render_service_connection_proxy.cpp @@ -81,11 +81,11 @@ bool RSRenderServiceConnectionProxy::FillParcelWithTransactionData( data->WriteInt32(0); // 1. marshalling RSTransactionData - RS_TRACE_BEGIN("Marsh RSTransactionData: cmd count:" + std::to_string(transactionData->GetCommandCount()) + + // RS_TRACE_BEGIN("Marsh RSTransactionData: cmd count:" + std::to_string(transactionData->GetCommandCount()) + " transactionFlag:[" + std::to_string(pid_) + ", " + std::to_string(transactionData->GetIndex()) + "],isUni:" + std::to_string(transactionData->GetUniRender())); bool success = data->WriteParcelable(transactionData.get()); - RS_TRACE_END(); + // RS_TRACE_END(); if (!success) { ROSEN_LOGE("FillParcelWithTransactionData data.WriteParcelable failed!"); return false; diff --git a/display_server/rosen/modules/render_service_base/src/platform/ohos/rs_render_service_connection_proxy.cpp b/display_server/rosen/modules/render_service_base/src/platform/ohos/rs_render_service_connection_proxy.cpp index a2a0d19..d206e7f 100644 --- a/display_server/rosen/modules/render_service_base/src/platform/ohos/rs_render_service_connection_proxy.cpp +++ b/display_server/rosen/modules/render_service_base/src/platform/ohos/rs_render_service_connection_proxy.cpp @@ -81,11 +81,11 @@ bool RSRenderServiceConnectionProxy::FillParcelWithTransactionData( data->WriteInt32(0); // 1. marshalling RSTransactionData - RS_TRACE_BEGIN("Marsh RSTransactionData: cmd count:" + std::to_string(transactionData->GetCommandCount()) + + // RS_TRACE_BEGIN("Marsh RSTransactionData: cmd count:" + std::to_string(transactionData->GetCommandCount()) + " transactionFlag:[" + std::to_string(pid_) + ", " + std::to_string(transactionData->GetIndex()) + "],isUni:" + std::to_string(transactionData->GetUniRender())); bool success = data->WriteParcelable(transactionData.get()); - RS_TRACE_END(); + // RS_TRACE_END(); if (!success) { ROSEN_LOGE("FillParcelWithTransactionData data.WriteParcelable failed!"); return false; diff --git a/display_server/rosen/modules/render_service_base/src/property/rs_property_trace.cpp b/display_server/rosen/modules/render_service_base/src/property/rs_property_trace.cpp index d5fbe5c..59cae48 100644 --- a/display_server/rosen/modules/render_service_base/src/property/rs_property_trace.cpp +++ b/display_server/rosen/modules/render_service_base/src/property/rs_property_trace.cpp @@ -55,8 +55,8 @@ void RSPropertyTrace::RefreshNodeTraceInfo() void RSPropertyTrace::AddTraceFlag(const std::string& str) { - ROSEN_TRACE_BEGIN(HITRACE_TAG_GRAPHIC_AGP, str.c_str()); - ROSEN_TRACE_END(HITRACE_TAG_GRAPHIC_AGP); + // ROSEN_TRACE_BEGIN(HITRACE_TAG_GRAPHIC_AGP, str.c_str()); + // ROSEN_TRACE_END(HITRACE_TAG_GRAPHIC_AGP); } std::vector SplitStringBySeparator(const std::string& str, diff --git a/display_server/rosen/modules/render_service_client/core/pipeline/rs_render_thread.cpp b/display_server/rosen/modules/render_service_client/core/pipeline/rs_render_thread.cpp index 8627675..fab8e85 100644 --- a/display_server/rosen/modules/render_service_client/core/pipeline/rs_render_thread.cpp +++ b/display_server/rosen/modules/render_service_client/core/pipeline/rs_render_thread.cpp @@ -89,7 +89,7 @@ RSRenderThread::RSRenderThread() if (needRender_) { renderStartTimeStamp = jankDetector_->GetSysTimeNs(); } - RS_TRACE_BEGIN("RSRenderThread DrawFrame: " + std::to_string(timestamp_)); + // RS_TRACE_BEGIN("RSRenderThread DrawFrame: " + std::to_string(timestamp_)); #ifdef ROSEN_OHOS FRAME_TRACE::RenderFrameTrace::GetInstance().RenderStartFrameTrace(RT_INTERVAL_NAME); #endif @@ -105,7 +105,7 @@ RSRenderThread::RSRenderThread() if (needRender_) { jankDetector_->CalculateSkippedFrame(renderStartTimeStamp, jankDetector_->GetSysTimeNs()); } - RS_TRACE_END(); + // RS_TRACE_END(); }; context_ = std::make_shared(); @@ -165,9 +165,9 @@ void RSRenderThread::RecvTransactionData(std::unique_ptr& tra std::unique_lock cmdLock(cmdMutex_); std::string str = "RecvCommands ptr:" + std::to_string(reinterpret_cast(transactionData.get())); commandTimestamp_ = transactionData->GetTimestamp(); - ROSEN_TRACE_BEGIN(HITRACE_TAG_GRAPHIC_AGP, str.c_str()); + // ROSEN_TRACE_BEGIN(HITRACE_TAG_GRAPHIC_AGP, str.c_str()); cmds_.emplace_back(std::move(transactionData)); - ROSEN_TRACE_END(HITRACE_TAG_GRAPHIC_AGP); + // ROSEN_TRACE_END(HITRACE_TAG_GRAPHIC_AGP); } // [PLANNING]: process in next vsync (temporarily) RSRenderThread::Instance().RequestNextVSync(); @@ -267,7 +267,7 @@ void RSRenderThread::RenderLoop() void RSRenderThread::OnVsync(uint64_t timestamp) { - ROSEN_TRACE_BEGIN(HITRACE_TAG_GRAPHIC_AGP, "RSRenderThread::OnVsync"); + // ROSEN_TRACE_BEGIN(HITRACE_TAG_GRAPHIC_AGP, "RSRenderThread::OnVsync"); SendFrameEvent(false); mValue = (mValue + 1) % 2; // 1 and 2 is Calculated parameters RS_TRACE_INT("Vsync-client", mValue); @@ -276,7 +276,7 @@ void RSRenderThread::OnVsync(uint64_t timestamp) (needRender_ || (timestamp_ - prevTimestamp_) / REFRESH_PERIOD >= REFRESH_FREQ_IN_UNI_RENDER)) { mainFunc_(); // start render-loop now } - ROSEN_TRACE_END(HITRACE_TAG_GRAPHIC_AGP); + // ROSEN_TRACE_END(HITRACE_TAG_GRAPHIC_AGP); } void RSRenderThread::UpdateWindowStatus(bool active) @@ -436,14 +436,14 @@ void RSRenderThread::ProcessCommands() } for (auto& cmdData : cmds) { std::string str = "ProcessCommands ptr:" + std::to_string(reinterpret_cast(cmdData.get())); - ROSEN_TRACE_BEGIN(HITRACE_TAG_GRAPHIC_AGP, str.c_str()); + // ROSEN_TRACE_BEGIN(HITRACE_TAG_GRAPHIC_AGP, str.c_str()); // only set transactionTimestamp_ in UniRender mode context_->transactionTimestamp_ = RSSystemProperties::GetUniRenderEnabled() ? cmdData->GetTimestamp() : 0; cmdData->Process(*context_); if (needRender_) { jankDetector_->UpdateUiDrawFrameMsg(cmdData->GetTimestamp(), uiEndTimeStamp, cmdData->GetAbilityName()); } - ROSEN_TRACE_END(HITRACE_TAG_GRAPHIC_AGP); + // ROSEN_TRACE_END(HITRACE_TAG_GRAPHIC_AGP); } } @@ -491,7 +491,7 @@ void RSRenderThread::Render() if (RSSystemProperties::GetRenderNodeTraceEnabled()) { RSPropertyTrace::GetInstance().RefreshNodeTraceInfo(); } - ROSEN_TRACE_BEGIN(HITRACE_TAG_GRAPHIC_AGP, "RSRenderThread::Render"); + // ROSEN_TRACE_BEGIN(HITRACE_TAG_GRAPHIC_AGP, "RSRenderThread::Render"); if (RsFrameReport::GetInstance().GetEnable()) { RsFrameReport::GetInstance().RenderStart(); } @@ -509,18 +509,18 @@ void RSRenderThread::Render() visitor_->SetPartialRenderStatus(RSSystemProperties::GetPartialRenderEnabled(), isRTRenderForced_); rootNode->Prepare(visitor_); rootNode->Process(visitor_); - ROSEN_TRACE_END(HITRACE_TAG_GRAPHIC_AGP); + // ROSEN_TRACE_END(HITRACE_TAG_GRAPHIC_AGP); } void RSRenderThread::SendCommands() { - ROSEN_TRACE_BEGIN(HITRACE_TAG_GRAPHIC_AGP, "RSRenderThread::SendCommands"); + // ROSEN_TRACE_BEGIN(HITRACE_TAG_GRAPHIC_AGP, "RSRenderThread::SendCommands"); if (RsFrameReport::GetInstance().GetEnable() && needRender_) { RsFrameReport::GetInstance().SendCommandsStart(); } RSUIDirector::RecvMessages(needRender_); - ROSEN_TRACE_END(HITRACE_TAG_GRAPHIC_AGP); + // ROSEN_TRACE_END(HITRACE_TAG_GRAPHIC_AGP); } void RSRenderThread::Detach(NodeId id) diff --git a/display_server/rosen/modules/render_service_client/core/pipeline/rs_render_thread_visitor.cpp b/display_server/rosen/modules/render_service_client/core/pipeline/rs_render_thread_visitor.cpp index 282879e..0b2d82d 100644 --- a/display_server/rosen/modules/render_service_client/core/pipeline/rs_render_thread_visitor.cpp +++ b/display_server/rosen/modules/render_service_client/core/pipeline/rs_render_thread_visitor.cpp @@ -239,7 +239,7 @@ void RSRenderThreadVisitor::DrawDirtyRegion() void RSRenderThreadVisitor::UpdateDirtyAndSetEGLDamageRegion(std::unique_ptr& surfaceFrame) { - RS_TRACE_BEGIN("UpdateDirtyAndSetEGLDamageRegion"); + // RS_TRACE_BEGIN("UpdateDirtyAndSetEGLDamageRegion"); #ifdef RS_ENABLE_EGLQUERYSURFACE if (isEglSetDamageRegion_) { // get and update valid buffer age(>0) to merge history @@ -275,7 +275,7 @@ void RSRenderThreadVisitor::UpdateDirtyAndSetEGLDamageRegion(std::unique_ptrSetRenderContext(rc); #endif uiTimestamp_ = RSRenderThread::Instance().GetUITimestamp(); - RS_TRACE_BEGIN(ptr->GetName() + " rsSurface->RequestFrame"); + // RS_TRACE_BEGIN(ptr->GetName() + " rsSurface->RequestFrame"); #ifdef ROSEN_OHOS FrameCollector::GetInstance().MarkFrameEvent(FrameEventType::ReleaseStart); #endif @@ -335,7 +335,7 @@ void RSRenderThreadVisitor::ProcessRootRenderNode(RSRootRenderNode& node) #else auto surfaceFrame = rsSurface->RequestFrame(std::round(bufferWidth), std::round(bufferHeight), uiTimestamp_); #endif - RS_TRACE_END(); + // RS_TRACE_END(); if (surfaceFrame == nullptr) { ROSEN_LOGI("ProcessRoot %s: Request Frame Failed", ptr->GetName().c_str()); #ifdef ROSEN_OHOS @@ -416,7 +416,7 @@ void RSRenderThreadVisitor::ProcessRootRenderNode(RSRootRenderNode& node) canvas_->concat(gravityMatrix); parentSurfaceNodeMatrix_ = gravityMatrix; - RS_TRACE_BEGIN("ProcessRenderNodes"); + // RS_TRACE_BEGIN("ProcessRenderNodes"); needUpdateSurfaceNode_ = node.GetNeedUpdateSurfaceNode(); ProcessCanvasRenderNode(node); @@ -432,7 +432,7 @@ void RSRenderThreadVisitor::ProcessRootRenderNode(RSRootRenderNode& node) } needUpdateSurfaceNode_ = false; node.SetNeedUpdateSurfaceNode(false); - RS_TRACE_END(); + //RS_TRACE_END(); auto transactionProxy = RSTransactionProxy::GetInstance(); if (transactionProxy != nullptr) { @@ -456,14 +456,14 @@ void RSRenderThreadVisitor::ProcessRootRenderNode(RSRootRenderNode& node) FrameCollector::GetInstance().MarkFrameEvent(FrameEventType::FlushStart); #endif - RS_TRACE_BEGIN(ptr->GetName() + " rsSurface->FlushFrame"); + // RS_TRACE_BEGIN(ptr->GetName() + " rsSurface->FlushFrame"); ROSEN_LOGD("RSRenderThreadVisitor FlushFrame surfaceNodeId = %" PRIu64 ", uiTimestamp = %" PRIu64, node.GetRSSurfaceNodeId(), uiTimestamp_); rsSurface->FlushFrame(surfaceFrame, uiTimestamp_); #ifdef ROSEN_OHOS FrameCollector::GetInstance().MarkFrameEvent(FrameEventType::FlushEnd); #endif - RS_TRACE_END(); + // RS_TRACE_END(); canvas_ = nullptr; isIdle_ = true; diff --git a/display_server/rosen/modules/render_service_client/core/ui/rs_ui_director.cpp b/display_server/rosen/modules/render_service_client/core/ui/rs_ui_director.cpp index 8e713b8..73e1dee 100644 --- a/display_server/rosen/modules/render_service_client/core/ui/rs_ui_director.cpp +++ b/display_server/rosen/modules/render_service_client/core/ui/rs_ui_director.cpp @@ -228,12 +228,12 @@ void RSUIDirector::SetUITaskRunner(const TaskRunner& uiTaskRunner) void RSUIDirector::SendMessages() { - ROSEN_TRACE_BEGIN(HITRACE_TAG_GRAPHIC_AGP, "SendCommands"); + // ROSEN_TRACE_BEGIN(HITRACE_TAG_GRAPHIC_AGP, "SendCommands"); auto transactionProxy = RSTransactionProxy::GetInstance(); if (transactionProxy != nullptr) { transactionProxy->FlushImplicitTransaction(timeStamp_, abilityName_); } - ROSEN_TRACE_END(HITRACE_TAG_GRAPHIC_AGP); + // ROSEN_TRACE_END(HITRACE_TAG_GRAPHIC_AGP); } void RSUIDirector::RecvMessages(bool needProcess) diff --git a/display_server/rosen/modules/render_service_client/ft_build/BUILD.gn b/display_server/rosen/modules/render_service_client/ft_build/BUILD.gn index 919410a..828ff36 100644 --- a/display_server/rosen/modules/render_service_client/ft_build/BUILD.gn +++ b/display_server/rosen/modules/render_service_client/ft_build/BUILD.gn @@ -119,7 +119,7 @@ ft_source_set("render_service_client_src") { "//build/gn/configs/system_libs:eventhandler", "//build/gn/configs/system_libs:ipc_core", "//build/gn/configs/system_libs:skia", - "//build/gn/configs/system_libs:hitrace_meter", + # "//build/gn/configs/system_libs:hitrace_meter", "//build/gn/configs/system_libs:image", ] diff --git a/display_server/utils/buffer_handle/ft_build/BUILD.gn b/display_server/utils/buffer_handle/ft_build/BUILD.gn index 443b947..3c82b68 100644 --- a/display_server/utils/buffer_handle/ft_build/BUILD.gn +++ b/display_server/utils/buffer_handle/ft_build/BUILD.gn @@ -24,7 +24,7 @@ ft_static_library("buffer_handle") { "${sys_inc}/c_utils", "${sys_inc}/ipc_core", "${sys_inc}/hilog", - "${usr_inc}/ftsurface", + "${sys_inc}/ftsurface", ] public_configs = [ ":buffer_handle_public" ] diff --git a/display_server/utils/log/rs_trace.h b/display_server/utils/log/rs_trace.h index ad04a7a..32475aa 100644 --- a/display_server/utils/log/rs_trace.h +++ b/display_server/utils/log/rs_trace.h @@ -17,11 +17,11 @@ #define GRAPHIC_RS_TRACE_H #ifndef ROSEN_TRACE_DISABLE -#include "hitrace_meter.h" -#define ROSEN_TRACE_BEGIN(tag, name) StartTrace(tag, name) -#define RS_TRACE_BEGIN(name) ROSEN_TRACE_BEGIN(HITRACE_TAG_GRAPHIC_AGP, name) -#define ROSEN_TRACE_END(tag) FinishTrace(tag) -#define RS_TRACE_END() ROSEN_TRACE_END(HITRACE_TAG_GRAPHIC_AGP) +// #include "hitrace_meter.h" +// #define ROSEN_TRACE_BEGIN(tag, name) StartTrace(tag, name) +// #define RS_TRACE_BEGIN(name) ROSEN_TRACE_BEGIN(HITRACE_TAG_GRAPHIC_AGP, name) +// #define ROSEN_TRACE_END(tag) FinishTrace(tag) +// #define RS_TRACE_END() ROSEN_TRACE_END(HITRACE_TAG_GRAPHIC_AGP) #define RS_TRACE_NAME(name) HITRACE_METER_NAME(HITRACE_TAG_GRAPHIC_AGP, name) #define RS_TRACE_NAME_FMT(fmt, ...) HITRACE_METER_FMT(HITRACE_TAG_GRAPHIC_AGP, fmt, ##__VA_ARGS__) #define RS_ASYNC_TRACE_BEGIN(name, value) StartAsyncTrace(HITRACE_TAG_GRAPHIC_AGP, name, value) diff --git a/display_server/utils/scoped_bytrace/ft_build/BUILD.gn b/display_server/utils/scoped_bytrace/ft_build/BUILD.gn index 82cf4eb..df87a48 100644 --- a/display_server/utils/scoped_bytrace/ft_build/BUILD.gn +++ b/display_server/utils/scoped_bytrace/ft_build/BUILD.gn @@ -21,10 +21,11 @@ config("scoped_bytrace_config") { "-g3", ] include_dirs = [ - "${sys_inc}/hitrace_meter", + # "${sys_inc}/hitrace_meter", "${sys_inc}/hilog", ] - libs = ["hilog", "hitrace_meter"] + # libs = ["hilog", "hitrace_meter"] + libs = ["hilog.z"] } config("scoped_bytrace_public_config") { diff --git a/display_server/utils/scoped_bytrace/src/scoped_bytrace.cpp b/display_server/utils/scoped_bytrace/src/scoped_bytrace.cpp index 1a9c564..b38ed12 100644 --- a/display_server/utils/scoped_bytrace/src/scoped_bytrace.cpp +++ b/display_server/utils/scoped_bytrace/src/scoped_bytrace.cpp @@ -15,25 +15,25 @@ #include "scoped_bytrace.h" -#include +// #include #include ScopedBytrace::ScopedBytrace(const std::string &proc) : proc_(proc) { - StartTrace(HITRACE_TAG_GRAPHIC_AGP, proc_); + // StartTrace(HITRACE_TAG_GRAPHIC_AGP, proc_); isEnd = false; } ScopedBytrace::~ScopedBytrace() { if (isEnd == false) { - FinishTrace(HITRACE_TAG_GRAPHIC_AGP); + // FinishTrace(HITRACE_TAG_GRAPHIC_AGP); } } void ScopedBytrace::End() { if (isEnd == false) { - FinishTrace(HITRACE_TAG_GRAPHIC_AGP); + // FinishTrace(HITRACE_TAG_GRAPHIC_AGP); } } diff --git a/display_server/utils/sync_fence/ft_build/BUILD.gn b/display_server/utils/sync_fence/ft_build/BUILD.gn index c474ddc..d10f858 100644 --- a/display_server/utils/sync_fence/ft_build/BUILD.gn +++ b/display_server/utils/sync_fence/ft_build/BUILD.gn @@ -53,7 +53,7 @@ ft_shared_library("sync_fence") { deps = [ "//build/gn/configs/system_libs:eventhandler", - "//build/gn/configs/system_libs:hitrace_meter", + # "//build/gn/configs/system_libs:hitrace_meter", "//build/gn/configs/system_libs:ipc_core", ] } diff --git a/window_manager/dmserver/ft_build/BUILD.gn b/window_manager/dmserver/ft_build/BUILD.gn index 951e759..e6c180a 100644 --- a/window_manager/dmserver/ft_build/BUILD.gn +++ b/window_manager/dmserver/ft_build/BUILD.gn @@ -67,7 +67,7 @@ ft_shared_library("libdms") { "$display_server_root/rosen/modules/render_service_client/ft_build:librender_service_client", "$window_manager_path/utils/ft_build:libwmutil", - "//build/gn/configs/system_libs:hitrace_meter", + # "//build/gn/configs/system_libs:hitrace_meter", "//build/gn/configs/system_libs:safwk", "//build/gn/configs/system_libs:eventhandler", "//build/gn/configs/system_libs:skia", diff --git a/window_manager/wmserver/src/window_node_container.cpp b/window_manager/wmserver/src/window_node_container.cpp index 1a14ae9..703b630 100644 --- a/window_manager/wmserver/src/window_node_container.cpp +++ b/window_manager/wmserver/src/window_node_container.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +// #include #include #include #include @@ -575,7 +575,7 @@ bool WindowNodeContainer::AddNodeOnRSTree(sptr& node, DisplayId disp StartTraceArgs(HITRACE_TAG_WINDOW_MANAGER, "Animate(%u)", node->GetWindowId()); RSNode::Animate(animationConfig_.windowAnimationConfig_.animationTiming_.timingProtocol_, animationConfig_.windowAnimationConfig_.animationTiming_.timingCurve_, updateRSTreeFunc); - FinishTrace(HITRACE_TAG_WINDOW_MANAGER); + // FinishTrace(HITRACE_TAG_WINDOW_MANAGER); } else if (node->GetWindowType() == WindowType::WINDOW_TYPE_INPUT_METHOD_FLOAT && !animationPlayed) { // add keyboard with animation ProcessInputMethodWindowAddAnimation(node, updateRSTreeFunc); @@ -667,7 +667,7 @@ bool WindowNodeContainer::RemoveNodeFromRSTree(sptr& node, DisplayId weakWindow->surfaceNode_->SetAppFreeze(false); } }); - FinishTrace(HITRACE_TAG_WINDOW_MANAGER); + // FinishTrace(HITRACE_TAG_WINDOW_MANAGER); } else if (node->GetWindowType() == WindowType::WINDOW_TYPE_INPUT_METHOD_FLOAT && !animationPlayed) { // remove keyboard with animation auto timingProtocol = animationConfig_.keyboardAnimationConfig_.durationOut_; -- Gitee From d51a15ab8fc375b7e031eeb887dd1ee786c59942 Mon Sep 17 00:00:00 2001 From: huangyuxin2023 Date: Mon, 23 Oct 2023 12:07:17 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E6=B3=A8=E9=87=8Ahitra?= =?UTF-8?q?ce?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../frameworks/surface/src/buffer_queue.cpp | 6 +++--- .../src/render_context/render_context.cpp | 6 +++--- .../src/render_context/shader_cache.cpp | 4 ++-- .../frame_analyzer/src/frame_collector.cpp | 12 ++++++------ .../core/pipeline/rs_base_render_engine.cpp | 8 ++++---- .../core/pipeline/rs_base_render_util.cpp | 10 +++++----- .../core/pipeline/rs_cold_start_thread.cpp | 10 +++++----- .../core/pipeline/rs_composer_adapter.cpp | 6 +++--- .../core/pipeline/rs_main_thread.cpp | 18 +++++++++--------- .../pipeline/rs_physical_screen_processor.cpp | 2 +- .../core/pipeline/rs_render_engine.cpp | 2 +- .../pipeline/rs_render_service_visitor.cpp | 2 +- .../core/pipeline/rs_surface_capture_task.cpp | 2 +- .../rs_uni_render_mirror_processor.cpp | 2 +- .../core/pipeline/rs_uni_render_visitor.cpp | 16 ++++++++-------- .../pipeline/rs_virtual_screen_processor.cpp | 2 +- .../rs_render_service_connection_stub.cpp | 4 ++-- .../src/common/rs_shared_context.cpp | 2 +- .../src/pipeline/rs_draw_cmd_list.cpp | 4 ++-- .../src/platform/fangtian/rs_ashmem_helper.cpp | 4 ++-- .../rs_render_service_connection_proxy.cpp | 2 +- .../src/platform/ohos/rs_ashmem_helper.cpp | 4 ++-- .../rs_render_service_connection_proxy.cpp | 2 +- .../core/pipeline/rs_render_thread.cpp | 6 +++--- display_server/utils/log/rs_trace.h | 12 ++++++------ .../sync_fence/src/sync_fence_tracker.cpp | 6 +++--- 26 files changed, 77 insertions(+), 77 deletions(-) diff --git a/display_server/frameworks/surface/src/buffer_queue.cpp b/display_server/frameworks/surface/src/buffer_queue.cpp index c2af386..c414e38 100644 --- a/display_server/frameworks/surface/src/buffer_queue.cpp +++ b/display_server/frameworks/surface/src/buffer_queue.cpp @@ -25,7 +25,7 @@ #include "buffer_utils.h" #include "buffer_log.h" #include "buffer_manager.h" -#include "hitrace_meter.h" +// #include "hitrace_meter.h" #include "surface_buffer_impl.h" #include "sync_fence.h" #include "sandbox_utils.h" @@ -379,7 +379,7 @@ GSError BufferQueue::FlushBuffer(uint32_t sequence, const sptr if (sret != GSERROR_OK) { return sret; } - CountTrace(HITRACE_TAG_GRAPHIC_AGP, name_, static_cast(dirtyList_.size())); + // CountTrace(HITRACE_TAG_GRAPHIC_AGP, name_, static_cast(dirtyList_.size())); if (sret == GSERROR_OK) { std::lock_guard lockGuard(listenerMutex_); if (listener_ != nullptr) { @@ -492,7 +492,7 @@ GSError BufferQueue::AcquireBuffer(sptr &buffer, BLOGN_FAILURE("there is no dirty buffer"); } - CountTrace(HITRACE_TAG_GRAPHIC_AGP, name_, static_cast(dirtyList_.size())); + // CountTrace(HITRACE_TAG_GRAPHIC_AGP, name_, static_cast(dirtyList_.size())); return ret; } diff --git a/display_server/rosen/modules/2d_graphics/src/render_context/render_context.cpp b/display_server/rosen/modules/2d_graphics/src/render_context/render_context.cpp index df24d5a..ec5b059 100644 --- a/display_server/rosen/modules/2d_graphics/src/render_context/render_context.cpp +++ b/display_server/rosen/modules/2d_graphics/src/render_context/render_context.cpp @@ -217,7 +217,7 @@ void RenderContext::MakeCurrent(EGLSurface surface, EGLContext context) void RenderContext::SwapBuffers(EGLSurface surface) const { - RS_TRACE_FUNC(); + // RS_TRACE_FUNC(); if (!eglSwapBuffers(eglDisplay_, surface)) { LOGE("Failed to SwapBuffers on surface %{public}p, error is %{public}x", surface, eglGetError()); } else { @@ -341,7 +341,7 @@ sk_sp RenderContext::AcquireSurface(int width, int height) void RenderContext::RenderFrame() { - RS_TRACE_FUNC(); + // RS_TRACE_FUNC(); // flush commands if (skSurface_->getCanvas() != nullptr) { LOGD("RenderFrame: Canvas is %{public}p", skSurface_->getCanvas()); @@ -416,7 +416,7 @@ void RenderContext::DamageFrame(const std::vector &rects) void RenderContext::ClearRedundantResources() { - RS_TRACE_FUNC(); + // RS_TRACE_FUNC(); if (grContext_ != nullptr) { LOGD("grContext clear redundant resources"); grContext_->flush(); diff --git a/display_server/rosen/modules/2d_graphics/src/render_context/shader_cache.cpp b/display_server/rosen/modules/2d_graphics/src/render_context/shader_cache.cpp index 944218f..2822883 100644 --- a/display_server/rosen/modules/2d_graphics/src/render_context/shader_cache.cpp +++ b/display_server/rosen/modules/2d_graphics/src/render_context/shader_cache.cpp @@ -75,7 +75,7 @@ void ShaderCache::SetFilePath(const std::string& filename) sk_sp ShaderCache::load(const SkData& key) { - RS_TRACE_NAME("load shader"); + // RS_TRACE_NAME("load shader"); size_t keySize = key.size(); std::lock_guard lock(mutex_); if (!initialized_) { @@ -129,7 +129,7 @@ void ShaderCache::WriteToDisk() void ShaderCache::store(const SkData& key, const SkData& data) { - RS_TRACE_NAME("store shader"); + // RS_TRACE_NAME("store shader"); std::lock_guard lock(mutex_); if (!initialized_) { diff --git a/display_server/rosen/modules/frame_analyzer/src/frame_collector.cpp b/display_server/rosen/modules/frame_analyzer/src/frame_collector.cpp index 4c2fdfd..bd7826b 100644 --- a/display_server/rosen/modules/frame_analyzer/src/frame_collector.cpp +++ b/display_server/rosen/modules/frame_analyzer/src/frame_collector.cpp @@ -21,7 +21,7 @@ #include #include "hilog/log.h" -#include "hitrace_meter.h" +// #include "hitrace_meter.h" #include "parameter.h" #include "frame_saver.h" @@ -117,7 +117,7 @@ void FrameCollector::ProcessFrameEvent(int32_t index, int64_t timeNs) pbefore_->skiped = true; pbefore_->times[vsyncEnd] = pbefore_->times[vsyncStart]; } else { - StartAsyncTrace(HITRACE_TAG_GRAPHIC_AGP, GetAsyncNameByFrameEventType(index), pbefore_->frameNumber); + // StartAsyncTrace(HITRACE_TAG_GRAPHIC_AGP, GetAsyncNameByFrameEventType(index), pbefore_->frameNumber); } return; } @@ -131,9 +131,9 @@ void FrameCollector::ProcessFrameEvent(int32_t index, int64_t timeNs) pafter_->times[index] = timeNs; if (IsStartFrameEventType(index)) { - StartAsyncTrace(HITRACE_TAG_GRAPHIC_AGP, GetAsyncNameByFrameEventType(index), pafter_->frameNumber); + // StartAsyncTrace(HITRACE_TAG_GRAPHIC_AGP, GetAsyncNameByFrameEventType(index), pafter_->frameNumber); } else { - FinishAsyncTrace(HITRACE_TAG_GRAPHIC_AGP, GetAsyncNameByFrameEventType(index), pafter_->frameNumber); + // FinishAsyncTrace(HITRACE_TAG_GRAPHIC_AGP, GetAsyncNameByFrameEventType(index), pafter_->frameNumber); } } @@ -149,9 +149,9 @@ bool FrameCollector::ProcessUIMarkLocked(int32_t index, int64_t timeNs) } if (IsStartFrameEventType(index)) { - StartAsyncTrace(HITRACE_TAG_GRAPHIC_AGP, GetAsyncNameByFrameEventType(index), currentFrameNumber_); + // StartAsyncTrace(HITRACE_TAG_GRAPHIC_AGP, GetAsyncNameByFrameEventType(index), currentFrameNumber_); } else { - FinishAsyncTrace(HITRACE_TAG_GRAPHIC_AGP, GetAsyncNameByFrameEventType(index), currentFrameNumber_); + // FinishAsyncTrace(HITRACE_TAG_GRAPHIC_AGP, GetAsyncNameByFrameEventType(index), currentFrameNumber_); } if (index < uimarksEnd) { diff --git a/display_server/rosen/modules/render_service/core/pipeline/rs_base_render_engine.cpp b/display_server/rosen/modules/render_service/core/pipeline/rs_base_render_engine.cpp index 7d20b42..229144c 100644 --- a/display_server/rosen/modules/render_service/core/pipeline/rs_base_render_engine.cpp +++ b/display_server/rosen/modules/render_service/core/pipeline/rs_base_render_engine.cpp @@ -159,7 +159,7 @@ sk_sp RSBaseRenderEngine::CreateEglImageFromBuffer( std::unique_ptr RSBaseRenderEngine::RequestFrame(const std::shared_ptr& rsSurface, const BufferRequestConfig& config, bool forceCPU, bool useAFBC) { - RS_TRACE_NAME("RSBaseRenderEngine::RequestFrame(RSSurface)"); + // RS_TRACE_NAME("RSBaseRenderEngine::RequestFrame(RSSurface)"); if (rsSurface == nullptr) { RS_LOGE("RSBaseRenderEngine::RequestFrame: surface is null!"); return nullptr; @@ -194,7 +194,7 @@ std::unique_ptr RSBaseRenderEngine::RequestFrame(const std::share std::unique_ptr RSBaseRenderEngine::RequestFrame(const sptr& targetSurface, const BufferRequestConfig& config, bool forceCPU, bool useAFBC) { - RS_TRACE_NAME("RSBaseRenderEngine::RequestFrame(Surface)"); + // RS_TRACE_NAME("RSBaseRenderEngine::RequestFrame(Surface)"); if (targetSurface == nullptr) { RS_LOGE("RSBaseRenderEngine::RequestFrame: surface is null!"); return nullptr; @@ -307,7 +307,7 @@ void RSBaseRenderEngine::SetColorFilterMode(ColorFilterMode mode) void RSBaseRenderEngine::DrawBuffer(RSPaintFilterCanvas& canvas, BufferDrawParam& params) { - RS_TRACE_NAME("RSBaseRenderEngine::DrawBuffer(CPU)"); + // RS_TRACE_NAME("RSBaseRenderEngine::DrawBuffer(CPU)"); SkBitmap bitmap; std::vector newBuffer; if (!RSBaseRenderUtil::ConvertBufferToBitmap(params.buffer, newBuffer, params.targetColorGamut, bitmap, @@ -320,7 +320,7 @@ void RSBaseRenderEngine::DrawBuffer(RSPaintFilterCanvas& canvas, BufferDrawParam void RSBaseRenderEngine::DrawImage(RSPaintFilterCanvas& canvas, BufferDrawParam& params) { - RS_TRACE_NAME("RSBaseRenderEngine::DrawImage(GPU)"); + // RS_TRACE_NAME("RSBaseRenderEngine::DrawImage(GPU)"); auto image = CreateEglImageFromBuffer(params.buffer, params.acquireFence); if (image == nullptr) { RS_LOGE("RSDividedRenderUtil::DrawImage: image is nullptr!"); diff --git a/display_server/rosen/modules/render_service/core/pipeline/rs_base_render_util.cpp b/display_server/rosen/modules/render_service/core/pipeline/rs_base_render_util.cpp index 5986f56..1214182 100644 --- a/display_server/rosen/modules/render_service/core/pipeline/rs_base_render_util.cpp +++ b/display_server/rosen/modules/render_service/core/pipeline/rs_base_render_util.cpp @@ -605,7 +605,7 @@ Offset ConvertColorGamut(uint8_t* dst, uint8_t* src, int32_t pixelFormat, Simple bool ConvertBufferColorGamut(std::vector& dstBuf, const sptr& srcBuf, ColorGamut srcGamut, ColorGamut dstGamut, const std::vector& metaDatas) { - RS_TRACE_NAME("ConvertBufferColorGamut"); + // RS_TRACE_NAME("ConvertBufferColorGamut"); int32_t pixelFormat = srcBuf->GetFormat(); if (!IsSupportedFormatForGamutConversion(pixelFormat)) { @@ -804,7 +804,7 @@ GSError RSBaseRenderUtil::DropFrameProcess(RSSurfaceHandler& node) int32_t maxDirtyListSize = static_cast(surfaceConsumer->GetQueueSize()) - 1; // maxDirtyListSize > 2 means QueueSize >3 too if (maxDirtyListSize > 2 && availableBufferCnt >= maxDirtyListSize) { - RS_TRACE_NAME("DropFrame"); + // RS_TRACE_NAME("DropFrame"); OHOS::sptr cbuffer; Rect damage; sptr acquireFence = SyncFence::INVALID_FENCE; @@ -1147,14 +1147,14 @@ bool RSBaseRenderUtil::CreateNewColorGamutBitmap(sptr buffe std::unique_ptr RSBaseRenderUtil::ParseTransactionData(MessageParcel& parcel) { - RS_TRACE_NAME("UnMarsh RSTransactionData: data size:" + std::to_string(parcel.GetDataSize())); + // RS_TRACE_NAME("UnMarsh RSTransactionData: data size:" + std::to_string(parcel.GetDataSize())); auto transactionData = parcel.ReadParcelable(); if (!transactionData) { - RS_TRACE_NAME("UnMarsh RSTransactionData fail!"); + // RS_TRACE_NAME("UnMarsh RSTransactionData fail!"); RS_LOGE("UnMarsh RSTransactionData fail!"); return nullptr; } - RS_TRACE_NAME("UnMarsh RSTransactionData: recv data from " + std::to_string(transactionData->GetSendingPid())); + // RS_TRACE_NAME("UnMarsh RSTransactionData: recv data from " + std::to_string(transactionData->GetSendingPid())); std::unique_ptr transData(transactionData); return transData; } diff --git a/display_server/rosen/modules/render_service/core/pipeline/rs_cold_start_thread.cpp b/display_server/rosen/modules/render_service/core/pipeline/rs_cold_start_thread.cpp index c0520bb..383fae4 100644 --- a/display_server/rosen/modules/render_service/core/pipeline/rs_cold_start_thread.cpp +++ b/display_server/rosen/modules/render_service/core/pipeline/rs_cold_start_thread.cpp @@ -80,10 +80,10 @@ void RSColdStartThread::Stop() } RS_LOGD("RSColdStartThread::Stop"); - RS_TRACE_NAME_FMT("RSColdStartThread::Stop"); + // RS_TRACE_NAME_FMT("RSColdStartThread::Stop"); isRunning_.store(false); handler_->PostSyncTask([this]() { - RS_TRACE_NAME_FMT("RSColdStartThread abandonContext"); // abandonContext here to avoid crash + // RS_TRACE_NAME_FMT("RSColdStartThread abandonContext"); // abandonContext here to avoid crash RS_LOGD("RSColdStartThread releaseResourcesAndAbandonContext"); { std::lock_guard lock(imageMutex_); @@ -101,7 +101,7 @@ void RSColdStartThread::Stop() #endif }, AppExecFwk::EventQueue::Priority::IMMEDIATE); - RS_TRACE_NAME_FMT("RSColdStartThread runner stop"); + // RS_TRACE_NAME_FMT("RSColdStartThread runner stop"); RS_LOGD("RSColdStartThread runner stop"); if (runner_ != nullptr) { runner_->Stop(); @@ -129,7 +129,7 @@ void RSColdStartThread::Run() #endif { RS_LOGD("RSColdStartThread::Run"); - RS_TRACE_NAME_FMT("RSColdStartThread::Run"); + // RS_TRACE_NAME_FMT("RSColdStartThread::Run"); SystemCallSetThreadName(THREAD_NAME); #ifdef RS_ENABLE_GL context_ = RSSharedContext::MakeSharedGLContext(context); @@ -186,7 +186,7 @@ void RSColdStartThread::PostPlayBackTask(std::shared_ptr drawCmdLis } RS_LOGD("RSColdStartThread::PostPlayBackTask drawCmdList Playback"); - RS_TRACE_NAME_FMT("RSColdStartThread Playback"); + // RS_TRACE_NAME_FMT("RSColdStartThread Playback"); auto canvas = skSurface_->getCanvas(); canvas->clear(SK_ColorTRANSPARENT); drawCmdList->Playback(*canvas); diff --git a/display_server/rosen/modules/render_service/core/pipeline/rs_composer_adapter.cpp b/display_server/rosen/modules/render_service/core/pipeline/rs_composer_adapter.cpp index 2c5d2bc..4c648df 100644 --- a/display_server/rosen/modules/render_service/core/pipeline/rs_composer_adapter.cpp +++ b/display_server/rosen/modules/render_service/core/pipeline/rs_composer_adapter.cpp @@ -159,7 +159,7 @@ void RSComposerAdapter::DealWithNodeGravity(const RSSurfaceRenderNode& node, Com } auto traceInfo = node.GetName() + " DealWithNodeGravity " + std::to_string(static_cast(frameGravity)); - RS_TRACE_NAME(traceInfo.c_str()); + // RS_TRACE_NAME(traceInfo.c_str()); // get current node's translate matrix and calculate gravity matrix. auto translateMatrix = SkMatrix::MakeTrans( @@ -402,7 +402,7 @@ LayerInfoPtr RSComposerAdapter::CreateBufferLayer(RSSurfaceRenderNode& node) con std::string traceInfo; AppendFormat(traceInfo, "ProcessSurfaceNode:%s XYWH[%d %d %d %d]", node.GetName().c_str(), info.dstRect.x, info.dstRect.y, info.dstRect.w, info.dstRect.h); - RS_TRACE_NAME(traceInfo.c_str()); + // RS_TRACE_NAME(traceInfo.c_str()); RS_LOGD( "RsDebug RSComposerAdapter::CreateBufferLayer surfaceNode id:%" PRIu64 " name:[%s] dst [%d %d %d %d]" "SrcRect [%d %d] rawbuffer [%d %d] surfaceBuffer [%d %d] buffaddr:%p, z:%f, globalZOrder:%d, blendType = %d", @@ -433,7 +433,7 @@ LayerInfoPtr RSComposerAdapter::CreateTunnelLayer(RSSurfaceRenderNode& node) con std::string traceInfo; AppendFormat(traceInfo, "ProcessSurfaceNode:%s XYWH[%d %d %d %d]", node.GetName().c_str(), info.dstRect.x, info.dstRect.y, info.dstRect.w, info.dstRect.h); - RS_TRACE_NAME(traceInfo.c_str()); + // RS_TRACE_NAME(traceInfo.c_str()); LayerInfoPtr layer = HdiLayerInfo::CreateHdiLayerInfo(); SetComposeInfoToLayer(layer, info, node.GetConsumer(), &node); LayerRotate(layer, node); diff --git a/display_server/rosen/modules/render_service/core/pipeline/rs_main_thread.cpp b/display_server/rosen/modules/render_service/core/pipeline/rs_main_thread.cpp index 84f62d2..f97e96c 100644 --- a/display_server/rosen/modules/render_service/core/pipeline/rs_main_thread.cpp +++ b/display_server/rosen/modules/render_service/core/pipeline/rs_main_thread.cpp @@ -357,7 +357,7 @@ void RSMainThread::ProcessCommandForUniRender() transactionVec.erase(transactionVec.begin(), iter); } } - RS_TRACE_NAME("RSMainThread::ProcessCommandUni" + transactionFlags); + // RS_TRACE_NAME("RSMainThread::ProcessCommandUni" + transactionFlags); for (auto& rsTransactionElem: transactionDataEffective) { for (auto& rsTransaction: rsTransactionElem.second) { if (rsTransaction) { @@ -419,7 +419,7 @@ void RSMainThread::ProcessCommandForDividedRender() void RSMainThread::ConsumeAndUpdateAllNodes() { - RS_TRACE_NAME("RSMainThread::ConsumeAndUpdateAllNodes"); + // RS_TRACE_NAME("RSMainThread::ConsumeAndUpdateAllNodes"); bool needRequestNextVsync = false; bufferTimestamps_.clear(); const auto& nodeMap = GetContext().GetNodeMap(); @@ -448,7 +448,7 @@ void RSMainThread::ConsumeAndUpdateAllNodes() void RSMainThread::ReleaseAllNodesBuffer() { - RS_TRACE_NAME("RSMainThread::ReleaseAllNodesBuffer"); + // RS_TRACE_NAME("RSMainThread::ReleaseAllNodesBuffer"); const auto& nodeMap = GetContext().GetNodeMap(); nodeMap.TraverseSurfaceNodes([](const std::shared_ptr& surfaceNode) mutable { if (surfaceNode == nullptr) { @@ -479,7 +479,7 @@ void RSMainThread::WaitUntilUnmarshallingTaskFinished() if (!isUniRender_) { return; } - RS_TRACE_NAME("RSMainThread::WaitUntilUnmarshallingTaskFinished"); + //RS_TRACE_NAME("RSMainThread::WaitUntilUnmarshallingTaskFinished"); std::unique_lock lock(unmarshalMutex_); unmarshalTaskCond_.wait(lock, [this]() { return unmarshalFinishedCount_ > 0; }); --unmarshalFinishedCount_; @@ -665,7 +665,7 @@ void RSMainThread::CalcOcclusion() return; } - RS_TRACE_NAME("RSMainThread::CalcOcclusion"); + // RS_TRACE_NAME("RSMainThread::CalcOcclusion"); // 2. Calc occlusion Occlusion::Region curRegion; VisibleData curVisVec; @@ -760,7 +760,7 @@ void RSMainThread::CallbackToQOS(std::map& pidVisMap) if (!CheckQosVisChanged(pidVisMap)) { return; } - RS_TRACE_NAME("RSQosThread::OnRSVisibilityChangeCB"); + // RS_TRACE_NAME("RSQosThread::OnRSVisibilityChangeCB"); RSQosThread::GetInstance()->OnRSVisibilityChangeCB(pidVisMap); } @@ -790,7 +790,7 @@ void RSMainThread::CallbackToWMS(VisibleData& curVisVec) void RSMainThread::RequestNextVSync() { - RS_TRACE_FUNC(); + // RS_TRACE_FUNC(); VSyncReceiver::FrameCallback fcb = { .userData_ = this, .callback_ = [this](uint64_t timestamp, void* data) { OnVsync(timestamp, data); }, @@ -825,7 +825,7 @@ void RSMainThread::OnVsync(uint64_t timestamp, void* data) void RSMainThread::Animate(uint64_t timestamp) { - RS_TRACE_FUNC(); + // RS_TRACE_FUNC(); lastAnimateTimestamp_ = timestamp; @@ -1022,7 +1022,7 @@ void RSMainThread::SetRenderModeChangeCallback(sptr void RSMainThread::SendCommands() { - RS_TRACE_FUNC(); + // RS_TRACE_FUNC(); if (!RSMessageProcessor::Instance().HasTransaction()) { return; } diff --git a/display_server/rosen/modules/render_service/core/pipeline/rs_physical_screen_processor.cpp b/display_server/rosen/modules/render_service/core/pipeline/rs_physical_screen_processor.cpp index 7753e0d..b45cd95 100644 --- a/display_server/rosen/modules/render_service/core/pipeline/rs_physical_screen_processor.cpp +++ b/display_server/rosen/modules/render_service/core/pipeline/rs_physical_screen_processor.cpp @@ -70,7 +70,7 @@ void RSPhysicalScreenProcessor::ProcessDisplaySurface(RSDisplayRenderNode& node) void RSPhysicalScreenProcessor::Redraw(const sptr& surface, const std::vector& layers) { - RS_TRACE_NAME("Redraw"); + // RS_TRACE_NAME("Redraw"); if (surface == nullptr) { RS_LOGE("RSPhysicalScreenProcessor::Redraw: surface is null."); return; diff --git a/display_server/rosen/modules/render_service/core/pipeline/rs_render_engine.cpp b/display_server/rosen/modules/render_service/core/pipeline/rs_render_engine.cpp index 101d2e8..2b7dec8 100644 --- a/display_server/rosen/modules/render_service/core/pipeline/rs_render_engine.cpp +++ b/display_server/rosen/modules/render_service/core/pipeline/rs_render_engine.cpp @@ -185,7 +185,7 @@ void RSRenderEngine::ClipHoleForLayer(RSPaintFilterCanvas& canvas, RSSurfaceRend AppendFormat(traceInfo, "Node name:%s ClipHole[%d %d %d %d]", node.GetName().c_str(), params.clipRect.x(), params.clipRect.y(), params.clipRect.width(), params.clipRect.height()); RS_LOGD("RSRenderEngine::Redraw layer composition ClipHoleForLayer, %s.", traceInfo.c_str()); - RS_TRACE_NAME(traceInfo); + // RS_TRACE_NAME(traceInfo); canvas.save(); canvas.clipRect(params.clipRect); diff --git a/display_server/rosen/modules/render_service/core/pipeline/rs_render_service_visitor.cpp b/display_server/rosen/modules/render_service/core/pipeline/rs_render_service_visitor.cpp index b4b01d3..0716f33 100644 --- a/display_server/rosen/modules/render_service/core/pipeline/rs_render_service_visitor.cpp +++ b/display_server/rosen/modules/render_service/core/pipeline/rs_render_service_visitor.cpp @@ -137,7 +137,7 @@ void RSRenderServiceVisitor::ProcessDisplayRenderNode(RSDisplayRenderNode& node) return; } ScreenInfo curScreenInfo = screenManager->QueryScreenInfo(node.GetScreenId()); - RS_TRACE_NAME("ProcessDisplayRenderNode[" + std::to_string(node.GetScreenId()) + "]"); + // RS_TRACE_NAME("ProcessDisplayRenderNode[" + std::to_string(node.GetScreenId()) + "]"); // skip frame according to skipFrameInterval value of SetScreenSkipFrameInterval interface if (node.SkipFrame(curScreenInfo.skipFrameInterval)) { return; diff --git a/display_server/rosen/modules/render_service/core/pipeline/rs_surface_capture_task.cpp b/display_server/rosen/modules/render_service/core/pipeline/rs_surface_capture_task.cpp index 502d1de..b95437f 100644 --- a/display_server/rosen/modules/render_service/core/pipeline/rs_surface_capture_task.cpp +++ b/display_server/rosen/modules/render_service/core/pipeline/rs_surface_capture_task.cpp @@ -509,7 +509,7 @@ void RSSurfaceCaptureTask::RSSurfaceCaptureVisitor::ProcessSurfaceRenderNodeWith void RSSurfaceCaptureTask::RSSurfaceCaptureVisitor::ProcessSurfaceRenderNode(RSSurfaceRenderNode &node) { - RS_TRACE_NAME("RSSurfaceCaptureVisitor::Process:" + node.GetName()); + // RS_TRACE_NAME("RSSurfaceCaptureVisitor::Process:" + node.GetName()); if (canvas_ == nullptr) { RS_LOGE("ProcessSurfaceRenderNode, canvas is nullptr"); diff --git a/display_server/rosen/modules/render_service/core/pipeline/rs_uni_render_mirror_processor.cpp b/display_server/rosen/modules/render_service/core/pipeline/rs_uni_render_mirror_processor.cpp index 4b827dc..c3817a5 100644 --- a/display_server/rosen/modules/render_service/core/pipeline/rs_uni_render_mirror_processor.cpp +++ b/display_server/rosen/modules/render_service/core/pipeline/rs_uni_render_mirror_processor.cpp @@ -75,7 +75,7 @@ void RSUniRenderMirrorProcessor::ProcessSurface(RSSurfaceRenderNode& node) void RSUniRenderMirrorProcessor::ProcessDisplaySurface(RSDisplayRenderNode& node) { - RS_TRACE_NAME("RSUniRenderMirrorProcessor::ProcessDisplaySurface"); + // RS_TRACE_NAME("RSUniRenderMirrorProcessor::ProcessDisplaySurface"); if (canvas_ == nullptr || node.GetBuffer() == nullptr) { RS_LOGE("RSUniRenderMirrorProcessor::ProcessDisplaySurface: Canvas or buffer is null!"); return; diff --git a/display_server/rosen/modules/render_service/core/pipeline/rs_uni_render_visitor.cpp b/display_server/rosen/modules/render_service/core/pipeline/rs_uni_render_visitor.cpp index 6b81027..9c56332 100644 --- a/display_server/rosen/modules/render_service/core/pipeline/rs_uni_render_visitor.cpp +++ b/display_server/rosen/modules/render_service/core/pipeline/rs_uni_render_visitor.cpp @@ -182,7 +182,7 @@ void RSUniRenderVisitor::PrepareDisplayRenderNode(RSDisplayRenderNode& node) displayHasSecSurface_.emplace(currentVisitDisplay_, false); dirtySurfaceNodeMap_.clear(); - RS_TRACE_NAME("RSUniRender:PrepareDisplay " + std::to_string(currentVisitDisplay_)); + // RS_TRACE_NAME("RSUniRender:PrepareDisplay " + std::to_string(currentVisitDisplay_)); curDisplayDirtyManager_ = node.GetDirtyManager(); curDisplayDirtyManager_->Clear(); curDisplayNode_ = node.shared_from_this()->ReinterpretCastTo(); @@ -489,7 +489,7 @@ void RSUniRenderVisitor::ProcessBaseRenderNode(RSBaseRenderNode& node) void RSUniRenderVisitor::ProcessDisplayRenderNode(RSDisplayRenderNode& node) { - RS_TRACE_NAME("ProcessDisplayRenderNode[" + std::to_string(node.GetScreenId()) + "]" + + // RS_TRACE_NAME("ProcessDisplayRenderNode[" + std::to_string(node.GetScreenId()) + "]" + node.GetDirtyManager()->GetDirtyRegion().ToString().c_str()); RS_LOGD("RSUniRenderVisitor::ProcessDisplayRenderNode node: %" PRIu64 ", child size:%u", node.GetId(), node.GetChildrenCount()); @@ -655,7 +655,7 @@ void RSUniRenderVisitor::ProcessDisplayRenderNode(RSDisplayRenderNode& node) canvas_->restoreToCount(saveCount); if (saveLayerCnt > 0) { - RS_TRACE_NAME("RSUniRender:RestoreLayer"); + // RS_TRACE_NAME("RSUniRender:RestoreLayer"); canvas_->restoreToCount(saveLayerCnt); } @@ -732,7 +732,7 @@ void RSUniRenderVisitor::AddOverDrawListener(std::unique_ptr& ren void RSUniRenderVisitor::CalcDirtyDisplayRegion(std::shared_ptr& node) const { - RS_TRACE_FUNC(); + // RS_TRACE_FUNC(); auto displayDirtyManager = node->GetDirtyManager(); for (auto it = node->GetCurAllSurfaces().rbegin(); it != node->GetCurAllSurfaces().rend(); ++it) { auto surfaceNode = RSBaseRenderNode::ReinterpretCast(*it); @@ -865,7 +865,7 @@ void RSUniRenderVisitor::CalcDirtyRegionForFilterNode(std::shared_ptr& node) { - RS_TRACE_FUNC(); + // RS_TRACE_FUNC(); for (auto it = node->GetCurAllSurfaces().rbegin(); it != node->GetCurAllSurfaces().rend(); ++it) { auto surfaceNode = RSBaseRenderNode::ReinterpretCast(*it); if (surfaceNode == nullptr || !surfaceNode->IsAppWindow()) { @@ -914,12 +914,12 @@ void RSUniRenderVisitor::InitCacheSurface(RSSurfaceRenderNode& node, int width, void RSUniRenderVisitor::ProcessSurfaceRenderNode(RSSurfaceRenderNode& node) { - RS_TRACE_NAME("RSUniRender::Process:[" + node.GetName() + "]" + node.GetDstRect().ToString()); + // RS_TRACE_NAME("RSUniRender::Process:[" + node.GetName() + "]" + node.GetDstRect().ToString()); RS_LOGD("RSUniRenderVisitor::ProcessSurfaceRenderNode node: %" PRIu64 ", child size:%u %s", node.GetId(), node.GetChildrenCount(), node.GetName().c_str()); node.UpdatePositionZ(); if (isSecurityDisplay_ && node.GetSecurityLayer()) { - RS_TRACE_NAME("SecurityLayer Skip"); + // RS_TRACE_NAME("SecurityLayer Skip"); return; } if (node.GetSurfaceNodeType() == RSSurfaceNodeType::STARTING_WINDOW_NODE && !needDrawStartingWindow_) { @@ -932,7 +932,7 @@ void RSUniRenderVisitor::ProcessSurfaceRenderNode(RSSurfaceRenderNode& node) return; } if (!node.GetOcclusionVisible() && !doAnimate_ && isOcclusionEnabled_ && !isSecurityDisplay_) { - RS_TRACE_NAME("Occlusion Skip"); + // RS_TRACE_NAME("Occlusion Skip"); return; } #ifdef RS_ENABLE_EGLQUERYSURFACE diff --git a/display_server/rosen/modules/render_service/core/pipeline/rs_virtual_screen_processor.cpp b/display_server/rosen/modules/render_service/core/pipeline/rs_virtual_screen_processor.cpp index 50b182a..640f28d 100644 --- a/display_server/rosen/modules/render_service/core/pipeline/rs_virtual_screen_processor.cpp +++ b/display_server/rosen/modules/render_service/core/pipeline/rs_virtual_screen_processor.cpp @@ -95,7 +95,7 @@ void RSVirtualScreenProcessor::ProcessSurface(RSSurfaceRenderNode& node) std::string traceInfo; AppendFormat(traceInfo, "RSVirtualScreenProcessor::ProcessSurface Node:%s ", node.GetName().c_str()); - RS_TRACE_NAME(traceInfo); + // RS_TRACE_NAME(traceInfo); // prepare BufferDrawParam // in display's coordinate. diff --git a/display_server/rosen/modules/render_service/core/transaction/rs_render_service_connection_stub.cpp b/display_server/rosen/modules/render_service/core/transaction/rs_render_service_connection_stub.cpp index 0154481..28dbd77 100644 --- a/display_server/rosen/modules/render_service/core/transaction/rs_render_service_connection_stub.cpp +++ b/display_server/rosen/modules/render_service/core/transaction/rs_render_service_connection_stub.cpp @@ -62,7 +62,7 @@ std::shared_ptr CopyParcelIfNeed(MessageParcel& old) if (dataSize <= MAX_DATA_SIZE_FOR_UNMARSHALLING_IN_PLACE) { return nullptr; } - RS_TRACE_NAME("CopyParcelForUnmarsh: size:" + std::to_string(dataSize)); + // RS_TRACE_NAME("CopyParcelForUnmarsh: size:" + std::to_string(dataSize)); void* base = malloc(dataSize); if (memcpy_s(base, dataSize, reinterpret_cast(old.GetData()), dataSize) != 0) { RS_LOGE("RSRenderServiceConnectionStub::CopyParcelIfNeed copy parcel data failed"); @@ -96,7 +96,7 @@ int RSRenderServiceConnectionStub::OnRemoteRequest( int ret = ERR_NONE; switch (code) { case COMMIT_TRANSACTION: { - RS_ASYNC_TRACE_END("RSProxySendRequest", data.GetDataSize()); + // RS_ASYNC_TRACE_END("RSProxySendRequest", data.GetDataSize()); static bool isUniRender = RSUniRenderJudgement::IsUniRender(); std::shared_ptr parsedParcel; if (data.ReadInt32() == 0) { // indicate normal parcel diff --git a/display_server/rosen/modules/render_service_base/src/common/rs_shared_context.cpp b/display_server/rosen/modules/render_service_base/src/common/rs_shared_context.cpp index 7809ccc..12ef169 100644 --- a/display_server/rosen/modules/render_service_base/src/common/rs_shared_context.cpp +++ b/display_server/rosen/modules/render_service_base/src/common/rs_shared_context.cpp @@ -24,7 +24,7 @@ namespace OHOS::Rosen { std::shared_ptr RSSharedContext::MakeSharedGLContext(EGLContext context) { - RS_TRACE_NAME_FMT("MakeSharedGLContext create egl "); + // RS_TRACE_NAME_FMT("MakeSharedGLContext create egl "); if (context == EGL_NO_CONTEXT) { RS_LOGE("eglGetCurrentContext failed err:%d", eglGetError()); return nullptr; diff --git a/display_server/rosen/modules/render_service_base/src/pipeline/rs_draw_cmd_list.cpp b/display_server/rosen/modules/render_service_base/src/pipeline/rs_draw_cmd_list.cpp index 8fb091a..184525d 100644 --- a/display_server/rosen/modules/render_service_base/src/pipeline/rs_draw_cmd_list.cpp +++ b/display_server/rosen/modules/render_service_base/src/pipeline/rs_draw_cmd_list.cpp @@ -210,7 +210,7 @@ void DrawCmdList::GenerateCache(SkSurface* surface) return; } isCached_ = true; - RS_TRACE_FUNC(); + // RS_TRACE_FUNC(); std::lock_guard lock(mutex_); for (auto index = 0u; index < ops_.size(); index++) { @@ -232,7 +232,7 @@ void DrawCmdList::ClearCache() return; } isCached_ = false; - RS_TRACE_FUNC(); + // RS_TRACE_FUNC(); std::lock_guard lock(mutex_); // restore the original op diff --git a/display_server/rosen/modules/render_service_base/src/platform/fangtian/rs_ashmem_helper.cpp b/display_server/rosen/modules/render_service_base/src/platform/fangtian/rs_ashmem_helper.cpp index 9b8d5e6..8bdffe1 100644 --- a/display_server/rosen/modules/render_service_base/src/platform/fangtian/rs_ashmem_helper.cpp +++ b/display_server/rosen/modules/render_service_base/src/platform/fangtian/rs_ashmem_helper.cpp @@ -209,7 +209,7 @@ void RSAshmemHelper::InjectFileDescriptor(std::shared_ptr& dataPa std::shared_ptr RSAshmemHelper::CreateAshmemParcel(std::shared_ptr& dataParcel) { size_t dataSize = dataParcel->GetDataSize(); - RS_TRACE_NAME("CreateAshmemParcel data size:" + std::to_string(dataSize)); + // RS_TRACE_NAME("CreateAshmemParcel data size:" + std::to_string(dataSize)); // if want a full copy of parcel, need to save its data and fds both: // 1. save origin parcel data to ashmeme and record the fd to new parcel @@ -247,7 +247,7 @@ std::shared_ptr RSAshmemHelper::CreateAshmemParcel(std::shared_pt std::shared_ptr RSAshmemHelper::ParseFromAshmemParcel(MessageParcel* ashmemParcel) { int32_t dataSize = ashmemParcel->ReadInt32(); - RS_TRACE_NAME("ParseFromAshmemParcel data size:" + std::to_string(dataSize)); + // RS_TRACE_NAME("ParseFromAshmemParcel data size:" + std::to_string(dataSize)); int fd = ashmemParcel->ReadFileDescriptor(); auto ashmemAllocator = AshmemAllocator::CreateAshmemAllocatorWithFd(fd, dataSize, PROT_READ | PROT_WRITE); diff --git a/display_server/rosen/modules/render_service_base/src/platform/fangtian/rs_render_service_connection_proxy.cpp b/display_server/rosen/modules/render_service_base/src/platform/fangtian/rs_render_service_connection_proxy.cpp index ec176de..a9d717b 100644 --- a/display_server/rosen/modules/render_service_base/src/platform/fangtian/rs_render_service_connection_proxy.cpp +++ b/display_server/rosen/modules/render_service_base/src/platform/fangtian/rs_render_service_connection_proxy.cpp @@ -63,7 +63,7 @@ void RSRenderServiceConnectionProxy::CommitTransaction(std::unique_ptrGetDataSize()); + // RS_ASYNC_TRACE_BEGIN("RSProxySendRequest", parcel->GetDataSize()); int32_t err = Remote()->SendRequest(RSIRenderServiceConnection::COMMIT_TRANSACTION, *parcel, reply, option); if (err != NO_ERROR) { ROSEN_LOGE("RSRenderServiceConnectionProxy::CommitTransaction SendRequest failed, err = %d", err); diff --git a/display_server/rosen/modules/render_service_base/src/platform/ohos/rs_ashmem_helper.cpp b/display_server/rosen/modules/render_service_base/src/platform/ohos/rs_ashmem_helper.cpp index 69f58fd..1e5f546 100644 --- a/display_server/rosen/modules/render_service_base/src/platform/ohos/rs_ashmem_helper.cpp +++ b/display_server/rosen/modules/render_service_base/src/platform/ohos/rs_ashmem_helper.cpp @@ -209,7 +209,7 @@ void RSAshmemHelper::InjectFileDescriptor(std::shared_ptr& dataPa std::shared_ptr RSAshmemHelper::CreateAshmemParcel(std::shared_ptr& dataParcel) { size_t dataSize = dataParcel->GetDataSize(); - RS_TRACE_NAME("CreateAshmemParcel data size:" + std::to_string(dataSize)); + // RS_TRACE_NAME("CreateAshmemParcel data size:" + std::to_string(dataSize)); // if want a full copy of parcel, need to save its data and fds both: // 1. save origin parcel data to ashmeme and record the fd to new parcel @@ -247,7 +247,7 @@ std::shared_ptr RSAshmemHelper::CreateAshmemParcel(std::shared_pt std::shared_ptr RSAshmemHelper::ParseFromAshmemParcel(MessageParcel* ashmemParcel) { int32_t dataSize = ashmemParcel->ReadInt32(); - RS_TRACE_NAME("ParseFromAshmemParcel data size:" + std::to_string(dataSize)); + // RS_TRACE_NAME("ParseFromAshmemParcel data size:" + std::to_string(dataSize)); int fd = ashmemParcel->ReadFileDescriptor(); auto ashmemAllocator = AshmemAllocator::CreateAshmemAllocatorWithFd(fd, dataSize, PROT_READ | PROT_WRITE); diff --git a/display_server/rosen/modules/render_service_base/src/platform/ohos/rs_render_service_connection_proxy.cpp b/display_server/rosen/modules/render_service_base/src/platform/ohos/rs_render_service_connection_proxy.cpp index d206e7f..c12fda1 100644 --- a/display_server/rosen/modules/render_service_base/src/platform/ohos/rs_render_service_connection_proxy.cpp +++ b/display_server/rosen/modules/render_service_base/src/platform/ohos/rs_render_service_connection_proxy.cpp @@ -63,7 +63,7 @@ void RSRenderServiceConnectionProxy::CommitTransaction(std::unique_ptrGetDataSize()); + // RS_ASYNC_TRACE_BEGIN("RSProxySendRequest", parcel->GetDataSize()); int32_t err = Remote()->SendRequest(RSIRenderServiceConnection::COMMIT_TRANSACTION, *parcel, reply, option); if (err != NO_ERROR) { ROSEN_LOGE("RSRenderServiceConnectionProxy::CommitTransaction SendRequest failed, err = %d", err); diff --git a/display_server/rosen/modules/render_service_client/core/pipeline/rs_render_thread.cpp b/display_server/rosen/modules/render_service_client/core/pipeline/rs_render_thread.cpp index fab8e85..cb4c398 100644 --- a/display_server/rosen/modules/render_service_client/core/pipeline/rs_render_thread.cpp +++ b/display_server/rosen/modules/render_service_client/core/pipeline/rs_render_thread.cpp @@ -176,7 +176,7 @@ void RSRenderThread::RecvTransactionData(std::unique_ptr& tra void RSRenderThread::RequestNextVSync() { if (handler_) { - RS_TRACE_FUNC(); + // RS_TRACE_FUNC(); SendFrameEvent(true); VSyncReceiver::FrameCallback fcb = { .userData_ = this, @@ -270,7 +270,7 @@ void RSRenderThread::OnVsync(uint64_t timestamp) // ROSEN_TRACE_BEGIN(HITRACE_TAG_GRAPHIC_AGP, "RSRenderThread::OnVsync"); SendFrameEvent(false); mValue = (mValue + 1) % 2; // 1 and 2 is Calculated parameters - RS_TRACE_INT("Vsync-client", mValue); + // RS_TRACE_INT("Vsync-client", mValue); timestamp_ = timestamp; if (activeWindowCnt_.load() > 0 && (needRender_ || (timestamp_ - prevTimestamp_) / REFRESH_PERIOD >= REFRESH_FREQ_IN_UNI_RENDER)) { @@ -449,7 +449,7 @@ void RSRenderThread::ProcessCommands() void RSRenderThread::Animate(uint64_t timestamp) { - RS_TRACE_FUNC(); + // RS_TRACE_FUNC(); if (RsFrameReport::GetInstance().GetEnable() && needRender_) { RsFrameReport::GetInstance().AnimateStart(); diff --git a/display_server/utils/log/rs_trace.h b/display_server/utils/log/rs_trace.h index 32475aa..b0420c8 100644 --- a/display_server/utils/log/rs_trace.h +++ b/display_server/utils/log/rs_trace.h @@ -22,12 +22,12 @@ // #define RS_TRACE_BEGIN(name) ROSEN_TRACE_BEGIN(HITRACE_TAG_GRAPHIC_AGP, name) // #define ROSEN_TRACE_END(tag) FinishTrace(tag) // #define RS_TRACE_END() ROSEN_TRACE_END(HITRACE_TAG_GRAPHIC_AGP) -#define RS_TRACE_NAME(name) HITRACE_METER_NAME(HITRACE_TAG_GRAPHIC_AGP, name) -#define RS_TRACE_NAME_FMT(fmt, ...) HITRACE_METER_FMT(HITRACE_TAG_GRAPHIC_AGP, fmt, ##__VA_ARGS__) -#define RS_ASYNC_TRACE_BEGIN(name, value) StartAsyncTrace(HITRACE_TAG_GRAPHIC_AGP, name, value) -#define RS_ASYNC_TRACE_END(name, value) FinishAsyncTrace(HITRACE_TAG_GRAPHIC_AGP, name, value) -#define RS_TRACE_INT(name, value) CountTrace(HITRACE_TAG_GRAPHIC_AGP, name, value) -#define RS_TRACE_FUNC() RS_TRACE_NAME(__func__) +// #define RS_TRACE_NAME(name) HITRACE_METER_NAME(HITRACE_TAG_GRAPHIC_AGP, name) +// #define RS_TRACE_NAME_FMT(fmt, ...) HITRACE_METER_FMT(HITRACE_TAG_GRAPHIC_AGP, fmt, ##__VA_ARGS__) +// #define RS_ASYNC_TRACE_BEGIN(name, value) StartAsyncTrace(HITRACE_TAG_GRAPHIC_AGP, name, value) +// #define RS_ASYNC_TRACE_END(name, value) FinishAsyncTrace(HITRACE_TAG_GRAPHIC_AGP, name, value) +// #define RS_TRACE_INT(name, value) CountTrace(HITRACE_TAG_GRAPHIC_AGP, name, value) +// #define RS_TRACE_FUNC() RS_TRACE_NAME(__func__) #else #define ROSEN_TRACE_BEGIN(tag, name) #define RS_TRACE_BEGIN(name) diff --git a/display_server/utils/sync_fence/src/sync_fence_tracker.cpp b/display_server/utils/sync_fence/src/sync_fence_tracker.cpp index 943b88f..820b2a4 100644 --- a/display_server/utils/sync_fence/src/sync_fence_tracker.cpp +++ b/display_server/utils/sync_fence/src/sync_fence_tracker.cpp @@ -40,14 +40,14 @@ void SyncFenceTracker::TrackFence(const sptr& fence) std::string fenceMsg; if (fence->SyncFileReadTimestamp() != SyncFence::FENCE_PENDING_TIMESTAMP) { fenceMsg = threadName_ + " " + std::to_string(fencesQueued_.load()) + " has signaled"; - RS_TRACE_NAME(fenceMsg.c_str()); + // RS_TRACE_NAME(fenceMsg.c_str()); fencesQueued_++; fencesSignaled_++; return; } fenceMsg = threadName_ + " " + std::to_string(fencesQueued_.load()); - RS_TRACE_NAME(fenceMsg.c_str()); + // RS_TRACE_NAME(fenceMsg.c_str()); if (handler_) { handler_->PostTask([this, fence]() { Loop(fence); @@ -62,7 +62,7 @@ void SyncFenceTracker::Loop(const sptr& fence) fenceIndex = fencesSignaled_.load(); { std::string fenceMsg = "Waiting for " + threadName_ + " " + std::to_string(fenceIndex); - RS_TRACE_NAME(fenceMsg.c_str()); + // RS_TRACE_NAME(fenceMsg.c_str()); int32_t result = fence->Wait(SYNC_TIME_OUT); if (result < 0) { HiLog::Debug(LABEL, "Error waiting for SyncFence: %s", strerror(result)); -- Gitee From 0d54fd996f884487e94ea24fb8039bbcd6c15bd9 Mon Sep 17 00:00:00 2001 From: huangyuxin2023 Date: Mon, 23 Oct 2023 15:04:36 +0800 Subject: [PATCH 13/16] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E6=B3=A8=E9=87=8Ahitra?= =?UTF-8?q?ce?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/gn/BUILDCONFIG.gn | 1 + build/gn/configs/system_libs/BUILD.gn | 14 ++++---- .../core/pipeline/rs_uni_render_visitor.cpp | 4 +-- .../modules/render_service/ft_build/BUILD.gn | 1 + .../rs_render_service_connection_proxy.cpp | 4 +-- .../rs_render_service_connection_proxy.cpp | 4 +-- .../src/render/rs_image.cpp | 2 +- .../core/pipeline/rs_render_thread.cpp | 2 +- .../transaction/rs_application_agent_impl.cpp | 6 ++-- .../utils/buffer_handle/ft_build/BUILD.gn | 5 +-- .../src/abstract_display_controller.cpp | 8 ++--- .../src/abstract_screen_controller.cpp | 4 +-- .../dmserver/src/display_manager_service.cpp | 28 +++++++-------- .../src/window_extension_connection.cpp | 10 +++--- .../src/js_window_extension.cpp | 12 +++---- .../snapshot/src/snapshot_utils.cpp | 4 +-- .../wmserver/src/avoid_area_controller.cpp | 6 ++-- .../wmserver/src/remote_animation.cpp | 34 +++++++++---------- .../wmserver/src/starting_window.cpp | 8 ++--- .../wmserver/src/window_controller.cpp | 18 +++++----- .../src/window_layout_policy_cascade.cpp | 8 ++--- .../src/window_layout_policy_tile.cpp | 8 ++--- .../wmserver/src/window_manager_service.cpp | 22 ++++++------ .../wmserver/src/window_node_container.cpp | 22 ++++++------ window_manager/wmserver/src/window_root.cpp | 4 +-- .../window_snapshot/snapshot_controller.cpp | 4 +-- .../unittest/window_manager_service_test.cpp | 2 +- 27 files changed, 124 insertions(+), 121 deletions(-) diff --git a/build/gn/BUILDCONFIG.gn b/build/gn/BUILDCONFIG.gn index 4fd86e0..80728c8 100644 --- a/build/gn/BUILDCONFIG.gn +++ b/build/gn/BUILDCONFIG.gn @@ -76,6 +76,7 @@ declare_args() { is_ft_build = current_os == "linux" sys_inc = "/usr/include" + usr_inc = "/usr/local/include" } if (use_musl_oh == true) { diff --git a/build/gn/configs/system_libs/BUILD.gn b/build/gn/configs/system_libs/BUILD.gn index 5a46c60..7ac4c2f 100644 --- a/build/gn/configs/system_libs/BUILD.gn +++ b/build/gn/configs/system_libs/BUILD.gn @@ -22,7 +22,7 @@ config("c_utils_config") { config("ipc_core_config") { visibility = [ ":*" ] - include_dirs = [ "//display_server/rosen/modules/platform/ipc_core" ] + include_dirs = [ "${sys_inc}/ipc" ] libs = [ "ipc_core.z" ] } @@ -51,8 +51,8 @@ config("skia_config") { visibility = [ ":*" ] include_dirs = [ - "${sys_inc}/flutter", - "${sys_inc}/flutter/txt", + "${usr_inc}/flutter", + "${usr_inc}/flutter/txt", "${sys_inc}/skia", "${sys_inc}/skia/src", "${sys_inc}/skia/include", @@ -65,7 +65,7 @@ config("samgr_config") { visibility = [ ":*" ] include_dirs = [ "${sys_inc}/samgr" ] - libs = [ "samgr_proxy" ] + libs = [ "samgr_proxy.z" ] } config("image_config") { @@ -85,15 +85,15 @@ config("mmi_config") { config("syspara_config") { visibility = [ ":*" ] - include_dirs = [ "${sys_inc}/syspara" ] - libs = [ "beget_proxy", "begetutil" ] + include_dirs = [ "${sys_inc}/init" ] + libs = [ "beget_proxy.z", "begetutil.z" ] } config("safwk_config") { visibility = [ ":*" ] include_dirs = [ "${sys_inc}/safwk" ] - libs = [ "system_ability_fwk" ] + libs = [ "system_ability_fwk.z" ] } config("libz_config") { diff --git a/display_server/rosen/modules/render_service/core/pipeline/rs_uni_render_visitor.cpp b/display_server/rosen/modules/render_service/core/pipeline/rs_uni_render_visitor.cpp index 9c56332..2769e2d 100644 --- a/display_server/rosen/modules/render_service/core/pipeline/rs_uni_render_visitor.cpp +++ b/display_server/rosen/modules/render_service/core/pipeline/rs_uni_render_visitor.cpp @@ -490,7 +490,7 @@ void RSUniRenderVisitor::ProcessBaseRenderNode(RSBaseRenderNode& node) void RSUniRenderVisitor::ProcessDisplayRenderNode(RSDisplayRenderNode& node) { // RS_TRACE_NAME("ProcessDisplayRenderNode[" + std::to_string(node.GetScreenId()) + "]" + - node.GetDirtyManager()->GetDirtyRegion().ToString().c_str()); + // node.GetDirtyManager()->GetDirtyRegion().ToString().c_str()); RS_LOGD("RSUniRenderVisitor::ProcessDisplayRenderNode node: %" PRIu64 ", child size:%u", node.GetId(), node.GetChildrenCount()); sptr screenManager = CreateOrGetScreenManager(); @@ -939,7 +939,7 @@ void RSUniRenderVisitor::ProcessSurfaceRenderNode(RSSurfaceRenderNode& node) // skip clean surface node if (isOpDropped_ && node.IsAppWindow()) { if (!node.SubNodeNeedDraw(node.GetOldDirtyInSurface(), partialRenderType_)) { - RS_TRACE_NAME("QuickReject Skip"); + // RS_TRACE_NAME("QuickReject Skip"); RS_LOGD("RSUniRenderVisitor::ProcessSurfaceRenderNode skip: %s", node.GetName().c_str()); return; } diff --git a/display_server/rosen/modules/render_service/ft_build/BUILD.gn b/display_server/rosen/modules/render_service/ft_build/BUILD.gn index 821cf63..88547a9 100644 --- a/display_server/rosen/modules/render_service/ft_build/BUILD.gn +++ b/display_server/rosen/modules/render_service/ft_build/BUILD.gn @@ -90,6 +90,7 @@ ft_shared_library("librender_service") { public_deps = [ "//build/gn/configs/system_libs:samgr", + "//build/gn/configs/system_libs:ipc_core", # "//build/gn/configs/system_libs:hitrace_meter", "//build/gn/configs/system_libs:skia", "//build/gn/configs/system_libs:syspara", diff --git a/display_server/rosen/modules/render_service_base/src/platform/fangtian/rs_render_service_connection_proxy.cpp b/display_server/rosen/modules/render_service_base/src/platform/fangtian/rs_render_service_connection_proxy.cpp index a9d717b..ec6da93 100644 --- a/display_server/rosen/modules/render_service_base/src/platform/fangtian/rs_render_service_connection_proxy.cpp +++ b/display_server/rosen/modules/render_service_base/src/platform/fangtian/rs_render_service_connection_proxy.cpp @@ -82,8 +82,8 @@ bool RSRenderServiceConnectionProxy::FillParcelWithTransactionData( // 1. marshalling RSTransactionData // RS_TRACE_BEGIN("Marsh RSTransactionData: cmd count:" + std::to_string(transactionData->GetCommandCount()) + - " transactionFlag:[" + std::to_string(pid_) + ", " + std::to_string(transactionData->GetIndex()) + "],isUni:" + - std::to_string(transactionData->GetUniRender())); + // " transactionFlag:[" + std::to_string(pid_) + ", " + std::to_string(transactionData->GetIndex()) + "],isUni:" + + // std::to_string(transactionData->GetUniRender())); bool success = data->WriteParcelable(transactionData.get()); // RS_TRACE_END(); if (!success) { diff --git a/display_server/rosen/modules/render_service_base/src/platform/ohos/rs_render_service_connection_proxy.cpp b/display_server/rosen/modules/render_service_base/src/platform/ohos/rs_render_service_connection_proxy.cpp index c12fda1..5a3a74d 100644 --- a/display_server/rosen/modules/render_service_base/src/platform/ohos/rs_render_service_connection_proxy.cpp +++ b/display_server/rosen/modules/render_service_base/src/platform/ohos/rs_render_service_connection_proxy.cpp @@ -82,8 +82,8 @@ bool RSRenderServiceConnectionProxy::FillParcelWithTransactionData( // 1. marshalling RSTransactionData // RS_TRACE_BEGIN("Marsh RSTransactionData: cmd count:" + std::to_string(transactionData->GetCommandCount()) + - " transactionFlag:[" + std::to_string(pid_) + ", " + std::to_string(transactionData->GetIndex()) + "],isUni:" + - std::to_string(transactionData->GetUniRender())); + // " transactionFlag:[" + std::to_string(pid_) + ", " + std::to_string(transactionData->GetIndex()) + "],isUni:" + + // std::to_string(transactionData->GetUniRender())); bool success = data->WriteParcelable(transactionData.get()); // RS_TRACE_END(); if (!success) { diff --git a/display_server/rosen/modules/render_service_base/src/render/rs_image.cpp b/display_server/rosen/modules/render_service_base/src/render/rs_image.cpp index 71989b7..bb966dc 100644 --- a/display_server/rosen/modules/render_service_base/src/render/rs_image.cpp +++ b/display_server/rosen/modules/render_service_base/src/render/rs_image.cpp @@ -128,7 +128,7 @@ void RSImage::UploadGpu(SkCanvas& canvas) if (canvas.getGrContext() == nullptr) { return; } - RS_TRACE_NAME("make compress img"); + // RS_TRACE_NAME("make compress img"); auto image = SkImage::MakeFromCompressed(canvas.getGrContext(), compressData_, static_cast(srcRect_.width_), static_cast(srcRect_.height_), SkImage::kASTC_CompressionType); if (image) { diff --git a/display_server/rosen/modules/render_service_client/core/pipeline/rs_render_thread.cpp b/display_server/rosen/modules/render_service_client/core/pipeline/rs_render_thread.cpp index cb4c398..e664e04 100644 --- a/display_server/rosen/modules/render_service_client/core/pipeline/rs_render_thread.cpp +++ b/display_server/rosen/modules/render_service_client/core/pipeline/rs_render_thread.cpp @@ -205,7 +205,7 @@ void RSRenderThread::CreateAndInitRenderContextIfNeed() renderContext_ = new RenderContext(); #endif ROSEN_LOGD("Create RenderContext, its pointer is %p", renderContext_); - RS_TRACE_NAME("InitializeEglContext"); + // RS_TRACE_NAME("InitializeEglContext"); #ifndef ROSEN_CROSS_PLATFORM renderContext_->InitializeEglContext(); // init egl context on RT if (!cacheDir_.empty()) { diff --git a/display_server/rosen/modules/render_service_client/core/transaction/rs_application_agent_impl.cpp b/display_server/rosen/modules/render_service_client/core/transaction/rs_application_agent_impl.cpp index 3df2a46..6181828 100644 --- a/display_server/rosen/modules/render_service_client/core/transaction/rs_application_agent_impl.cpp +++ b/display_server/rosen/modules/render_service_client/core/transaction/rs_application_agent_impl.cpp @@ -53,20 +53,20 @@ void RSApplicationAgentImpl::RegisterRSApplicationAgent() #ifdef ROSEN_OHOS void RSApplicationAgentImpl::OnTransaction(std::shared_ptr transactionData) { - RS_TRACE_NAME("RSApplicationAgentImpl::OnTransaction"); + // RS_TRACE_NAME("RSApplicationAgentImpl::OnTransaction"); RSUIDirector::RecvMessages(transactionData); } void RSApplicationAgentImpl::OnRenderModeChanged(bool renderThreadNeedRender) { - RS_TRACE_NAME_FMT("RSApplicationAgentImpl::OnRenderModeChanged isUni:%d", !renderThreadNeedRender); + // RS_TRACE_NAME_FMT("RSApplicationAgentImpl::OnRenderModeChanged isUni:%d", !renderThreadNeedRender); RSSystemProperties::SetRenderMode(!renderThreadNeedRender); RSRenderThread::Instance().UpdateRenderMode(renderThreadNeedRender); } void RSApplicationAgentImpl::NotifyClearBufferCache() { - RS_TRACE_NAME_FMT("RSApplicationAgentImpl::NotifyClearBufferCache"); + // RS_TRACE_NAME_FMT("RSApplicationAgentImpl::NotifyClearBufferCache"); RSRenderThread::Instance().NotifyClearBufferCache(); } #endif diff --git a/display_server/utils/buffer_handle/ft_build/BUILD.gn b/display_server/utils/buffer_handle/ft_build/BUILD.gn index 3c82b68..858794f 100644 --- a/display_server/utils/buffer_handle/ft_build/BUILD.gn +++ b/display_server/utils/buffer_handle/ft_build/BUILD.gn @@ -21,14 +21,15 @@ config("buffer_handle_public") { ft_static_library("buffer_handle") { include_dirs = [ + "/opt/distributed-middleware-build/openeuler/compiler_include", "${sys_inc}/c_utils", - "${sys_inc}/ipc_core", + "${sys_inc}/ipc", "${sys_inc}/hilog", "${sys_inc}/ftsurface", ] public_configs = [ ":buffer_handle_public" ] - libs = [ "ipc_core", "hilog", "utils", "sec_shared" ] + libs = [ "ipc_core.z", "hilog.z", "utils.z", "boundscheck" ] sources = [ "../src/buffer_handle.cpp" ] } diff --git a/window_manager/dmserver/src/abstract_display_controller.cpp b/window_manager/dmserver/src/abstract_display_controller.cpp index 61d29fb..99a3b95 100644 --- a/window_manager/dmserver/src/abstract_display_controller.cpp +++ b/window_manager/dmserver/src/abstract_display_controller.cpp @@ -16,7 +16,7 @@ #include "abstract_display_controller.h" #include -#include +// #include #include #include @@ -428,7 +428,7 @@ void AbstractDisplayController::ProcessDisplayUpdateOrientation(sptr absScreen) { - HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "dms:ProcessDisplaySizeChange(%" PRIu64")", absScreen->dmsId_); + // HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "dms:ProcessDisplaySizeChange(%" PRIu64")", absScreen->dmsId_); sptr info = absScreen->GetActiveScreenMode(); if (info == nullptr) { WLOGE("cannot get active screen info."); @@ -608,13 +608,13 @@ void AbstractDisplayController::AddScreenToExpandLocked(sptr abs void AbstractDisplayController::SetFreeze(std::vector displayIds, bool toFreeze) { - HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "dms:SetAllFreeze"); + // HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "dms:SetAllFreeze"); DisplayStateChangeType type = toFreeze ? DisplayStateChangeType::FREEZE : DisplayStateChangeType::UNFREEZE; DisplayChangeEvent event = toFreeze ? DisplayChangeEvent::DISPLAY_FREEZED : DisplayChangeEvent::DISPLAY_UNFREEZED; for (DisplayId displayId : displayIds) { sptr abstractDisplay; - HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "dms:SetFreeze(%" PRIu64")", displayId); + // HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "dms:SetFreeze(%" PRIu64")", displayId); { WLOGI("setfreeze display %{public}" PRIu64"", displayId); std::lock_guard lock(mutex_); diff --git a/window_manager/dmserver/src/abstract_screen_controller.cpp b/window_manager/dmserver/src/abstract_screen_controller.cpp index ec986a7..bf94ef4 100644 --- a/window_manager/dmserver/src/abstract_screen_controller.cpp +++ b/window_manager/dmserver/src/abstract_screen_controller.cpp @@ -18,7 +18,7 @@ #include #include -#include +// #include #include #include #include @@ -839,7 +839,7 @@ bool AbstractScreenController::SetScreenActiveMode(ScreenId screenId, uint32_t m void AbstractScreenController::ProcessScreenModeChanged(ScreenId dmsScreenId) { - HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "dms:ProcessScreenModeChanged(%" PRIu64")", dmsScreenId); + // HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "dms:ProcessScreenModeChanged(%" PRIu64")", dmsScreenId); sptr absScreen = nullptr; sptr absScreenCallback = nullptr; { diff --git a/window_manager/dmserver/src/display_manager_service.cpp b/window_manager/dmserver/src/display_manager_service.cpp index b038d1f..a8f4e94 100644 --- a/window_manager/dmserver/src/display_manager_service.cpp +++ b/window_manager/dmserver/src/display_manager_service.cpp @@ -16,7 +16,7 @@ #include "display_manager_service.h" #include -#include +// #include #include #include #include @@ -223,7 +223,7 @@ ScreenId DisplayManagerService::CreateVirtualScreen(VirtualScreenOption option, WLOGFE("displayManagerAgent invalid"); return SCREEN_ID_INVALID; } - HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "dms:CreateVirtualScreen(%s)", option.name_.c_str()); + // HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "dms:CreateVirtualScreen(%s)", option.name_.c_str()); if (option.surface_ != nullptr && !Permission::CheckCallingPermission(SCREEN_CAPTURE_PERMISSION) && !Permission::IsStartByHdcd()) { WLOGFE("permission denied"); @@ -248,7 +248,7 @@ DMError DisplayManagerService::DestroyVirtualScreen(ScreenId screenId) WLOGFI("DestroyVirtualScreen::ScreenId: %{public}" PRIu64 "", screenId); CHECK_SCREEN_AND_RETURN(DMError::DM_ERROR_INVALID_PARAM); - HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "dms:DestroyVirtualScreen(%" PRIu64")", screenId); + // HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "dms:DestroyVirtualScreen(%" PRIu64")", screenId); return abstractScreenController_->DestroyVirtualScreen(screenId); } @@ -274,25 +274,25 @@ bool DisplayManagerService::SetOrientation(ScreenId screenId, Orientation orient WLOGFE("SetOrientation::orientation: %{public}u", static_cast(orientation)); return false; } - HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "dms:SetOrientation(%" PRIu64")", screenId); + // HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "dms:SetOrientation(%" PRIu64")", screenId); return abstractScreenController_->SetOrientation(screenId, orientation, false); } bool DisplayManagerService::SetOrientationFromWindow(ScreenId screenId, Orientation orientation) { - HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "dms:SetOrientationFromWindow(%" PRIu64")", screenId); + // HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "dms:SetOrientationFromWindow(%" PRIu64")", screenId); return abstractScreenController_->SetOrientation(screenId, orientation, true); } bool DisplayManagerService::SetRotationFromWindow(ScreenId screenId, Rotation targetRotation) { - HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "dms:SetRotationFromWindow(%" PRIu64")", screenId); + // HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "dms:SetRotationFromWindow(%" PRIu64")", screenId); return abstractScreenController_->SetRotation(screenId, targetRotation, true); } std::shared_ptr DisplayManagerService::GetDisplaySnapshot(DisplayId displayId) { - HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "dms:GetDisplaySnapshot(%" PRIu64")", displayId); + // HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "dms:GetDisplaySnapshot(%" PRIu64")", displayId); if (Permission::CheckCallingPermission(SCREEN_CAPTURE_PERMISSION) || Permission::IsStartByHdcd()) { auto res = abstractDisplayController_->GetScreenSnapshot(displayId); @@ -388,7 +388,7 @@ bool DisplayManagerService::UnregisterDisplayManagerAgent(const sptr(allMirrorScreenIds.size())); return SCREEN_ID_INVALID; } - HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "dms:MakeMirror"); + // HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "dms:MakeMirror"); if (!abstractScreenController_->MakeMirror(mainScreenId, allMirrorScreenIds)) { WLOGFE("make mirror failed."); return SCREEN_ID_INVALID; @@ -635,7 +635,7 @@ ScreenId DisplayManagerService::MakeExpand(std::vector expandScreenIds pointsMap[allExpandScreenIds[i]].posY_); } } - HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "dms:MakeExpand"); + // HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "dms:MakeExpand"); if (!abstractScreenController_->MakeExpand(allExpandScreenIds, points)) { WLOGFE("make expand failed."); return SCREEN_ID_INVALID; @@ -654,7 +654,7 @@ bool DisplayManagerService::SetScreenActiveMode(ScreenId screenId, uint32_t mode WLOGFE("set screen active permission denied!"); return false; } - HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "dms:SetScreenActiveMode(%" PRIu64", %u)", screenId, modeId); + // HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "dms:SetScreenActiveMode(%" PRIu64", %u)", screenId, modeId); return abstractScreenController_->SetScreenActiveMode(screenId, modeId); } @@ -664,8 +664,8 @@ bool DisplayManagerService::SetVirtualPixelRatio(ScreenId screenId, float virtua WLOGFE("set virtual pixel permission denied!"); return false; } - HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "dms:SetVirtualPixelRatio(%" PRIu64", %f)", screenId, - virtualPixelRatio); + // HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "dms:SetVirtualPixelRatio(%" PRIu64", %f)", screenId, + // virtualPixelRatio); return abstractScreenController_->SetVirtualPixelRatio(screenId, virtualPixelRatio); } diff --git a/window_manager/extension/extension_connection/src/window_extension_connection.cpp b/window_manager/extension/extension_connection/src/window_extension_connection.cpp index 9e97179..d082887 100644 --- a/window_manager/extension/extension_connection/src/window_extension_connection.cpp +++ b/window_manager/extension/extension_connection/src/window_extension_connection.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +// #include #include #include "window_extension_proxy.h" @@ -106,8 +106,8 @@ int WindowExtensionConnection::Impl::ConnectExtension(const AppExecFwk::ElementN { AAFwk::Want want; want.SetElement(element); - StartAsyncTraceArgs(HITRACE_TAG_WINDOW_MANAGER, static_cast(TraceTaskId::CONNECT_EXTENSION), - "WindowExtension %s-%s", element.GetBundleName().c_str(), element.GetAbilityName().c_str()); + // StartAsyncTraceArgs(HITRACE_TAG_WINDOW_MANAGER, static_cast(TraceTaskId::CONNECT_EXTENSION), + // "WindowExtension %s-%s", element.GetBundleName().c_str(), element.GetAbilityName().c_str()); want.SetParam(RECT_FORM_KEY_POS_X, rect.posX_); want.SetParam(RECT_FORM_KEY_POS_Y, rect.posY_); want.SetParam(RECT_FORM_KEY_WIDTH, static_cast(rect.width_)); @@ -190,8 +190,8 @@ void WindowExtensionConnection::Impl::OnAbilityConnectDone(const AppExecFwk::Ele WLOGFI("GetExtensionWindow"); } WLOGFI("call end"); - FinishAsyncTraceArgs(HITRACE_TAG_WINDOW_MANAGER, static_cast(TraceTaskId::CONNECT_EXTENSION), - "WindowExtension %s-%s", element.GetBundleName().c_str(), element.GetAbilityName().c_str()); + // FinishAsyncTraceArgs(HITRACE_TAG_WINDOW_MANAGER, static_cast(TraceTaskId::CONNECT_EXTENSION), + // "WindowExtension %s-%s", element.GetBundleName().c_str(), element.GetAbilityName().c_str()); } void WindowExtensionConnection::Impl::OnAbilityDisconnectDone(const AppExecFwk::ElementName& element, int resultCode) diff --git a/window_manager/extension/window_extension/src/js_window_extension.cpp b/window_manager/extension/window_extension/src/js_window_extension.cpp index 524b87c..0a7112b 100644 --- a/window_manager/extension/window_extension/src/js_window_extension.cpp +++ b/window_manager/extension/window_extension/src/js_window_extension.cpp @@ -15,7 +15,7 @@ #include "js_window_extension.h" -#include +// #include #include #include #include @@ -101,7 +101,7 @@ void JsWindowExtension::Init(const std::shared_ptr& handler, const sptr& token) { - HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "WindowExtension Init"); + // HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "WindowExtension Init"); WindowExtension::Init(record, application, handler, token); std::string srcPath; GetSrcPath(srcPath); @@ -199,8 +199,8 @@ void JsWindowExtension::GetSrcPath(std::string& srcPath) const sptr JsWindowExtension::OnConnect(const AAFwk::Want& want) { - HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "WindowExtension OnConnect %s-%s", - want.GetElement().GetAbilityName().c_str(), want.GetElement().GetAbilityName().c_str()); + // HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "WindowExtension OnConnect %s-%s", + // want.GetElement().GetAbilityName().c_str(), want.GetElement().GetAbilityName().c_str()); WLOGFI("called."); Extension::OnConnect(want); NativeEngine& engine = jsRuntime_.GetNativeEngine(); @@ -256,8 +256,8 @@ void JsWindowExtension::OnDisconnect(const AAFwk::Want& want) void JsWindowExtension::OnStart(const AAFwk::Want& want) { - HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "WindowExtension OnStart %s-%s", - want.GetElement().GetAbilityName().c_str(), want.GetElement().GetAbilityName().c_str()); + // HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "WindowExtension OnStart %s-%s", + // want.GetElement().GetAbilityName().c_str(), want.GetElement().GetAbilityName().c_str()); Extension::OnStart(want); AbilityRuntime::ElementName elementName = want.GetElement(); diff --git a/window_manager/snapshot/src/snapshot_utils.cpp b/window_manager/snapshot/src/snapshot_utils.cpp index 8551ca3..3630af2 100644 --- a/window_manager/snapshot/src/snapshot_utils.cpp +++ b/window_manager/snapshot/src/snapshot_utils.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +// #include #include #include #include @@ -271,7 +271,7 @@ bool SnapShotUtils::WriteToJpeg(const std::string &fileName, const WriteToJpegPa std::cout << "error: invalid param." << std::endl; return ret; } - HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "snapshot:WriteToJpeg(%s)", fileName.c_str()); + // HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "snapshot:WriteToJpeg(%s)", fileName.c_str()); FILE *file = fopen(fileName.c_str(), "wb"); if (file == nullptr) { diff --git a/window_manager/wmserver/src/avoid_area_controller.cpp b/window_manager/wmserver/src/avoid_area_controller.cpp index 711d48d..d1fb818 100644 --- a/window_manager/wmserver/src/avoid_area_controller.cpp +++ b/window_manager/wmserver/src/avoid_area_controller.cpp @@ -15,7 +15,7 @@ #include "avoid_area_controller.h" -#include +// #include #include "display_manager_service_inner.h" #include "window_helper.h" @@ -72,7 +72,7 @@ void AvoidAreaController::AddOrRemoveOverlayWindowIfNeed(const sptr& WLOGFE("IsOverlayWindow Failed."); return; } - HITRACE_METER(HITRACE_TAG_WINDOW_MANAGER); + // HITRACE_METER(HITRACE_TAG_WINDOW_MANAGER); uint32_t overlayId = overlayNode->GetWindowId(); bool isRecorded = (overlayWindowMap_.find(overlayId) != overlayWindowMap_.end()); @@ -151,7 +151,7 @@ void AvoidAreaController::AddOrRemoveKeyboard(const sptr& keyboardNo void AvoidAreaController::UpdateOverlayWindowIfNeed(const sptr& node, const std::function)>& checkFunc) { - HITRACE_METER(HITRACE_TAG_WINDOW_MANAGER); + // HITRACE_METER(HITRACE_TAG_WINDOW_MANAGER); if (WindowHelper::IsOverlayWindow(node->GetWindowType())) { AvoidAreaType type = WindowHelper::IsSystemBarWindow(node->GetWindowType()) ? AvoidAreaType::TYPE_SYSTEM : AvoidAreaType::TYPE_KEYBOARD; diff --git a/window_manager/wmserver/src/remote_animation.cpp b/window_manager/wmserver/src/remote_animation.cpp index 3ecb7ee..f6aa963 100644 --- a/window_manager/wmserver/src/remote_animation.cpp +++ b/window_manager/wmserver/src/remote_animation.cpp @@ -17,7 +17,7 @@ #include #include -#include +// #include #include #include #include "minimize_app.h" @@ -238,8 +238,8 @@ sptr RemoteAnimation::GetTransitionFinishedCa WLOGFE("dst windowNode is nullptr!"); return; } - FinishAsyncTraceArgs(HITRACE_TAG_WINDOW_MANAGER, static_cast(TraceTaskId::REMOTE_ANIMATION), - "wms:async:ShowRemoteAnimation"); + // FinishAsyncTraceArgs(HITRACE_TAG_WINDOW_MANAGER, static_cast(TraceTaskId::REMOTE_ANIMATION), + // "wms:async:ShowRemoteAnimation"); if (!weakNode->stateMachine_.IsWindowNodeShownOrShowing()) { WLOGFI("node:%{public}u is not play show animation with state:%{public}u!", weakNode->GetWindowId(), static_cast(weakNode->stateMachine_.GetCurrentState())); @@ -459,8 +459,8 @@ WMError RemoteAnimation::NotifyAnimationBackTransition(sptr(TraceTaskId::REMOTE_ANIMATION), - "wms:async:ShowRemoteAnimation"); + // FinishAsyncTraceArgs(HITRACE_TAG_WINDOW_MANAGER, static_cast(TraceTaskId::REMOTE_ANIMATION), + // "wms:async:ShowRemoteAnimation"); }; sptr finishedCallback = CreateAnimationFinishedCallback(func); if (finishedCallback == nullptr) { @@ -511,8 +511,8 @@ static void GetAnimationHomeFinishCallback(std::function& func, srcNode->stateMachine_.TransitionTo(WindowNodeState::HIDE_ANIMATION_DONE); } MinimizeApp::ExecuteMinimizeTargetReasons(MinimizeReason::MINIMIZE_ALL); - FinishAsyncTraceArgs(HITRACE_TAG_WINDOW_MANAGER, static_cast(TraceTaskId::REMOTE_ANIMATION), - "wms:async:ShowRemoteAnimation"); + // FinishAsyncTraceArgs(HITRACE_TAG_WINDOW_MANAGER, static_cast(TraceTaskId::REMOTE_ANIMATION), + // "wms:async:ShowRemoteAnimation"); }; } @@ -529,8 +529,8 @@ WMError RemoteAnimation::NotifyAnimationByHome() std::function func; if (animationFirst_) { MinimizeApp::ExecuteMinimizeTargetReasons(MinimizeReason::MINIMIZE_ALL); - FinishAsyncTraceArgs(HITRACE_TAG_WINDOW_MANAGER, static_cast(TraceTaskId::REMOTE_ANIMATION), - "wms:async:ShowRemoteAnimation"); + // FinishAsyncTraceArgs(HITRACE_TAG_WINDOW_MANAGER, static_cast(TraceTaskId::REMOTE_ANIMATION), + // "wms:async:ShowRemoteAnimation"); func = [needMinimizeAppNodes]() { WLOGFI("NotifyAnimationByHome in animation callback in animationFirst with size:%{public}u", static_cast(needMinimizeAppNodes.size())); @@ -538,8 +538,8 @@ WMError RemoteAnimation::NotifyAnimationByHome() auto srcNode = weakNode.promote(); ProcessNodeStateTask(srcNode); } - FinishAsyncTraceArgs(HITRACE_TAG_WINDOW_MANAGER, static_cast(TraceTaskId::REMOTE_ANIMATION), - "wms:async:ShowRemoteAnimation"); + // FinishAsyncTraceArgs(HITRACE_TAG_WINDOW_MANAGER, static_cast(TraceTaskId::REMOTE_ANIMATION), + // "wms:async:ShowRemoteAnimation"); }; } else { GetAnimationHomeFinishCallback(func, needMinimizeAppNodes); @@ -786,8 +786,8 @@ sptr RemoteAnimation::CreateShowAnimationFini } WLOGFI("current window:%{public}u state: %{public}u", dstNodeSptr->GetWindowId(), static_cast(dstNodeSptr->stateMachine_.GetCurrentState())); - FinishAsyncTraceArgs(HITRACE_TAG_WINDOW_MANAGER, static_cast(TraceTaskId::REMOTE_ANIMATION), - "wms:async:ShowRemoteAnimation"); + // FinishAsyncTraceArgs(HITRACE_TAG_WINDOW_MANAGER, static_cast(TraceTaskId::REMOTE_ANIMATION), + // "wms:async:ShowRemoteAnimation"); std::unordered_map payload; if (srcNodeWptr != nullptr) { payload["srcPid"] = std::to_string(srcNodeWptr->GetCallingPid()); @@ -853,8 +853,8 @@ sptr RemoteAnimation::CreateHideAnimationFini } ProcessAbility(weakNode, event); weakNode->stateMachine_.TransitionTo(WindowNodeState::HIDE_ANIMATION_DONE); - FinishAsyncTraceArgs(HITRACE_TAG_WINDOW_MANAGER, static_cast(TraceTaskId::REMOTE_ANIMATION), - "wms:async:ShowRemoteAnimation"); + // FinishAsyncTraceArgs(HITRACE_TAG_WINDOW_MANAGER, static_cast(TraceTaskId::REMOTE_ANIMATION), + // "wms:async:ShowRemoteAnimation"); }; } else { if (event != TransitionEvent::MINIMIZE) { @@ -865,8 +865,8 @@ sptr RemoteAnimation::CreateHideAnimationFini WLOGFI("RSWindowAnimation: animationFirst use state machine process HideAnimationFinishedCallback!"); auto srcNodeSptr = srcNodeWptr.promote(); ProcessNodeStateTask(srcNodeSptr); - FinishAsyncTraceArgs(HITRACE_TAG_WINDOW_MANAGER, static_cast(TraceTaskId::REMOTE_ANIMATION), - "wms:async:ShowRemoteAnimation"); + // FinishAsyncTraceArgs(HITRACE_TAG_WINDOW_MANAGER, static_cast(TraceTaskId::REMOTE_ANIMATION), + // "wms:async:ShowRemoteAnimation"); }; } return CreateAnimationFinishedCallback(func); diff --git a/window_manager/wmserver/src/starting_window.cpp b/window_manager/wmserver/src/starting_window.cpp index 258b087..d1f16a2 100644 --- a/window_manager/wmserver/src/starting_window.cpp +++ b/window_manager/wmserver/src/starting_window.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +// #include #include #include "remote_animation.h" #include "window_helper.h" @@ -104,7 +104,7 @@ WMError StartingWindow::DrawStartingWindow(sptr& node, return WMError::WM_ERROR_NULLPTR; } // using snapshot to support hot start since node destroy when hide - HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "wms:DrawStartingWindow(%u)", node->GetWindowId()); + // HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "wms:DrawStartingWindow(%u)", node->GetWindowId()); Rect rect = node->GetWindowRect(); if (RemoteAnimation::CheckRemoteAnimationEnabled(node->GetDisplayId()) && node->leashWinSurfaceNode_) { // hides this node until RSProxyNode send valid context alpha/matrix @@ -150,8 +150,8 @@ void StartingWindow::HandleClientWindowCreate(sptr& node, sptr weak = node; auto firstFrameCompleteCallback = [weak]() { WindowManagerService::GetInstance().PostAsyncTask([weak]() { - FinishAsyncTraceArgs(HITRACE_TAG_WINDOW_MANAGER, static_cast(TraceTaskId::STARTING_WINDOW), - "wms:async:ShowStartingWindow"); + // FinishAsyncTraceArgs(HITRACE_TAG_WINDOW_MANAGER, static_cast(TraceTaskId::STARTING_WINDOW), + // "wms:async:ShowStartingWindow"); auto weakNode = weak.promote(); if (weakNode == nullptr || weakNode->leashWinSurfaceNode_ == nullptr) { WLOGFE("windowNode or leashWinSurfaceNode_ is nullptr"); diff --git a/window_manager/wmserver/src/window_controller.cpp b/window_manager/wmserver/src/window_controller.cpp index 67c1779..1bc382a 100644 --- a/window_manager/wmserver/src/window_controller.cpp +++ b/window_manager/wmserver/src/window_controller.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +// #include #include #include #include @@ -54,8 +54,8 @@ void WindowController::StartingWindow(sptr info, std::shar WLOGFE("info or AbilityToken is nullptr!"); return; } - StartAsyncTraceArgs(HITRACE_TAG_WINDOW_MANAGER, static_cast(TraceTaskId::STARTING_WINDOW), - "wms:async:ShowStartingWindow"); + // StartAsyncTraceArgs(HITRACE_TAG_WINDOW_MANAGER, static_cast(TraceTaskId::STARTING_WINDOW), + // "wms:async:ShowStartingWindow"); auto node = windowRoot_->FindWindowNodeWithToken(info->GetAbilityToken()); if (node == nullptr) { if (!isColdStart) { @@ -111,9 +111,9 @@ void WindowController::CancelStartingWindow(sptr abilityToken) WLOGFE("CancelStartingWindow failed because client window has shown id:%{public}u", node->GetWindowId()); return; } - HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "wms:CancelStartingWindow(%u)", node->GetWindowId()); - FinishAsyncTraceArgs(HITRACE_TAG_WINDOW_MANAGER, static_cast(TraceTaskId::STARTING_WINDOW), - "wms:async:ShowStartingWindow"); + // HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "wms:CancelStartingWindow(%u)", node->GetWindowId()); + // FinishAsyncTraceArgs(HITRACE_TAG_WINDOW_MANAGER, static_cast(TraceTaskId::STARTING_WINDOW), + // "wms:async:ShowStartingWindow"); WLOGFD("CancelStartingWindow with id:%{public}u!", node->GetWindowId()); node->isAppCrash_ = true; WMError res = DestroyWindow(node->GetWindowId(), false); @@ -137,8 +137,8 @@ WMError WindowController::NotifyWindowTransition(sptr& src if (!RemoteAnimation::CheckTransition(srcInfo, srcNode, dstInfo, dstNode)) { return WMError::WM_ERROR_NO_REMOTE_ANIMATION; } - StartAsyncTraceArgs(HITRACE_TAG_WINDOW_MANAGER, static_cast(TraceTaskId::REMOTE_ANIMATION), - "wms:async:ShowRemoteAnimation"); + // StartAsyncTraceArgs(HITRACE_TAG_WINDOW_MANAGER, static_cast(TraceTaskId::REMOTE_ANIMATION), + // "wms:async:ShowRemoteAnimation"); auto transitionEvent = RemoteAnimation::GetTransitionEvent(srcInfo, dstInfo, srcNode, dstNode); switch (transitionEvent) { case TransitionEvent::APP_TRANSITION: { @@ -559,7 +559,7 @@ WMError WindowController::RequestFocus(uint32_t windowId) WMError WindowController::SetWindowMode(uint32_t windowId, WindowMode dstMode) { - HITRACE_METER(HITRACE_TAG_WINDOW_MANAGER); + // HITRACE_METER(HITRACE_TAG_WINDOW_MANAGER); auto node = windowRoot_->GetWindowNode(windowId); if (node == nullptr) { WLOGFE("could not find window"); diff --git a/window_manager/wmserver/src/window_layout_policy_cascade.cpp b/window_manager/wmserver/src/window_layout_policy_cascade.cpp index f4b9076..8fe871d 100644 --- a/window_manager/wmserver/src/window_layout_policy_cascade.cpp +++ b/window_manager/wmserver/src/window_layout_policy_cascade.cpp @@ -15,7 +15,7 @@ #include "window_layout_policy_cascade.h" -#include +// #include #include "minimize_app.h" #include "window_helper.h" @@ -128,7 +128,7 @@ void WindowLayoutPolicyCascade::LayoutWindowTree(DisplayId displayId) void WindowLayoutPolicyCascade::RemoveWindowNode(const sptr& node) { - HITRACE_METER(HITRACE_TAG_WINDOW_MANAGER); + // HITRACE_METER(HITRACE_TAG_WINDOW_MANAGER); auto type = node->GetWindowType(); // affect other windows, trigger off global layout if (avoidTypes_.find(type) != avoidTypes_.end()) { @@ -168,7 +168,7 @@ bool WindowLayoutPolicyCascade::SpecialReasonProcess(const sptr& nod void WindowLayoutPolicyCascade::UpdateWindowNode(const sptr& node, bool isAddWindow) { - HITRACE_METER(HITRACE_TAG_WINDOW_MANAGER); + // HITRACE_METER(HITRACE_TAG_WINDOW_MANAGER); auto type = node->GetWindowType(); const DisplayId& displayId = node->GetDisplayId(); UpdateWindowNodeRectOffset(node); @@ -204,7 +204,7 @@ void WindowLayoutPolicyCascade::UpdateWindowNode(const sptr& node, b void WindowLayoutPolicyCascade::AddWindowNode(const sptr& node) { - HITRACE_METER(HITRACE_TAG_WINDOW_MANAGER); + // HITRACE_METER(HITRACE_TAG_WINDOW_MANAGER); auto property = node->GetWindowProperty(); if (property == nullptr) { WLOGFE("window property is nullptr."); diff --git a/window_manager/wmserver/src/window_layout_policy_tile.cpp b/window_manager/wmserver/src/window_layout_policy_tile.cpp index b580f86..8ac128f 100644 --- a/window_manager/wmserver/src/window_layout_policy_tile.cpp +++ b/window_manager/wmserver/src/window_layout_policy_tile.cpp @@ -15,7 +15,7 @@ #include "window_layout_policy_tile.h" #include -#include +// #include #include "minimize_app.h" #include "window_helper.h" @@ -153,7 +153,7 @@ bool WindowLayoutPolicyTile::IsTileRectSatisfiedWithSizeLimits(const sptr& node) { - HITRACE_METER(HITRACE_TAG_WINDOW_MANAGER); + // HITRACE_METER(HITRACE_TAG_WINDOW_MANAGER); if (WindowHelper::IsMainWindow(node->GetWindowType())) { DisplayId displayId = node->GetDisplayId(); @@ -167,7 +167,7 @@ void WindowLayoutPolicyTile::AddWindowNode(const sptr& node) void WindowLayoutPolicyTile::UpdateWindowNode(const sptr& node, bool isAddWindow) { - HITRACE_METER(HITRACE_TAG_WINDOW_MANAGER); + // HITRACE_METER(HITRACE_TAG_WINDOW_MANAGER); WindowLayoutPolicy::UpdateWindowNode(node); if (avoidTypes_.find(node->GetWindowType()) != avoidTypes_.end()) { DisplayId displayId = node->GetDisplayId(); @@ -179,7 +179,7 @@ void WindowLayoutPolicyTile::UpdateWindowNode(const sptr& node, bool void WindowLayoutPolicyTile::RemoveWindowNode(const sptr& node) { - HITRACE_METER(HITRACE_TAG_WINDOW_MANAGER); + // HITRACE_METER(HITRACE_TAG_WINDOW_MANAGER); WLOGFI("RemoveWindowNode %{public}u in tile", node->GetWindowId()); auto type = node->GetWindowType(); auto displayId = node->GetDisplayId(); diff --git a/window_manager/wmserver/src/window_manager_service.cpp b/window_manager/wmserver/src/window_manager_service.cpp index a42c5e4..b803423 100644 --- a/window_manager/wmserver/src/window_manager_service.cpp +++ b/window_manager/wmserver/src/window_manager_service.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +// #include #include #include #include @@ -687,7 +687,7 @@ WMError WindowManagerService::CreateWindow(sptr& window, sptrCreateWindow(window, property, surfaceNode, windowId, token, pid, uid); }); accessTokenIdMaps_.insert(std::pair(windowId, IPCSkeleton::GetCallingTokenID())); @@ -711,7 +711,7 @@ WMError WindowManagerService::AddWindow(sptr& property) WLOGFI("[WMS] Add: %{public}5d %{public}4d %{public}4d %{public}4d [%{public}4d %{public}4d " \ "%{public}4d %{public}4d]", windowId, property->GetWindowType(), property->GetWindowMode(), property->GetWindowFlags(), rect.posX_, rect.posY_, rect.width_, rect.height_); - HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "wms:AddWindow(%u)", windowId); + // HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "wms:AddWindow(%u)", windowId); WMError res = windowController_->AddWindowNode(property); if (property->GetWindowType() == WindowType::WINDOW_TYPE_DRAGGING_EFFECT) { dragController_->StartDrag(windowId); @@ -727,7 +727,7 @@ WMError WindowManagerService::RemoveWindow(uint32_t windowId) { return PostSyncTask([this, windowId]() { WLOGFI("[WMS] Remove: %{public}u", windowId); - HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "wms:RemoveWindow(%u)", windowId); + // HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "wms:RemoveWindow(%u)", windowId); WindowInnerManager::GetInstance().NotifyWindowRemovedOrDestroyed(windowId); WMError res = windowController_->RecoverInputEventToClient(windowId); if (res != WMError::WM_OK) { @@ -751,7 +751,7 @@ WMError WindowManagerService::DestroyWindow(uint32_t windowId, bool onlySelf) node->stateMachine_.SetDestroyTaskParam(onlySelf); auto func = [this, windowId]() { WLOGFI("[WMS] Destroy: %{public}u", windowId); - HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "wms:DestroyWindow(%u)", windowId); + // HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "wms:DestroyWindow(%u)", windowId); WindowInnerManager::GetInstance().NotifyWindowRemovedOrDestroyed(windowId); auto node = windowRoot_->GetWindowNode(windowId); if (node == nullptr) { @@ -899,7 +899,7 @@ void WindowManagerService::OnWindowEvent(Event event, const sptr& void WindowManagerService::NotifyDisplayStateChange(DisplayId defaultDisplayId, sptr displayInfo, const std::map>& displayInfoMap, DisplayStateChangeType type) { - HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "wms:NotifyDisplayStateChange(%u)", type); + // HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "wms:NotifyDisplayStateChange(%u)", type); DisplayId displayId = (displayInfo == nullptr) ? DISPLAY_ID_INVALID : displayInfo->GetDisplayId(); if (type == DisplayStateChangeType::FREEZE) { freezeDisplayController_->FreezeDisplay(displayId); @@ -981,7 +981,7 @@ void WindowManagerService::MinimizeAllAppWindows(DisplayId displayId) return; } PostAsyncTask([this, displayId]() { - HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "wms:MinimizeAllAppWindows(%" PRIu64")", displayId); + // HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "wms:MinimizeAllAppWindows(%" PRIu64")", displayId); WLOGFI("displayId %{public}" PRIu64"", displayId); windowController_->MinimizeAllAppWindows(displayId); }); @@ -994,7 +994,7 @@ WMError WindowManagerService::ToggleShownStateForAllAppWindows() return WMError::WM_ERROR_INVALID_PERMISSION; } PostAsyncTask([this]() { - HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "wms:ToggleShownStateForAllAppWindows"); + // HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "wms:ToggleShownStateForAllAppWindows"); return windowController_->ToggleShownStateForAllAppWindows(); }); return WMError::WM_OK; @@ -1015,7 +1015,7 @@ WMError WindowManagerService::SetWindowLayoutMode(WindowLayoutMode mode) } return PostSyncTask([this, mode]() { WLOGFI("layoutMode: %{public}u", mode); - HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "wms:SetWindowLayoutMode"); + // HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "wms:SetWindowLayoutMode"); return windowController_->SetWindowLayoutMode(mode); }); } @@ -1043,7 +1043,7 @@ WMError WindowManagerService::UpdateProperty(sptr& windowPropert if (isAsyncTask || action == PropertyChangeAction::ACTION_UPDATE_RECT) { PostAsyncTask([this, windowProperty, action]() mutable { - HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "wms:UpdateProperty"); + // HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "wms:UpdateProperty"); WMError res = windowController_->UpdateProperty(windowProperty, action); if (action == PropertyChangeAction::ACTION_UPDATE_RECT && res == WMError::WM_OK && windowProperty->GetWindowSizeChangeReason() == WindowSizeChangeReason::MOVE) { @@ -1054,7 +1054,7 @@ WMError WindowManagerService::UpdateProperty(sptr& windowPropert } return PostSyncTask([this, &windowProperty, action]() { - HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "wms:UpdateProperty"); + // HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "wms:UpdateProperty"); WMError res = windowController_->UpdateProperty(windowProperty, action); if (action == PropertyChangeAction::ACTION_UPDATE_RECT && res == WMError::WM_OK && windowProperty->GetWindowSizeChangeReason() == WindowSizeChangeReason::MOVE) { diff --git a/window_manager/wmserver/src/window_node_container.cpp b/window_manager/wmserver/src/window_node_container.cpp index 703b630..7573ee5 100644 --- a/window_manager/wmserver/src/window_node_container.cpp +++ b/window_manager/wmserver/src/window_node_container.cpp @@ -480,7 +480,7 @@ void WindowNodeContainer::UpdateSizeChangeReason(sptr& node, WindowS void WindowNodeContainer::UpdateWindowTree(sptr& node) { - HITRACE_METER(HITRACE_TAG_WINDOW_MANAGER); + // HITRACE_METER(HITRACE_TAG_WINDOW_MANAGER); node->priority_ = zorderPolicy_->GetWindowPriority(node->GetWindowType()); RaiseInputMethodWindowPriorityIfNeeded(node); RaiseShowWhenLockedWindowIfNeeded(node); @@ -519,7 +519,7 @@ bool WindowNodeContainer::AddAppSurfaceNodeOnRSTree(sptr& node) * Starting Window has already update leashWindowSurfaceNode and starting window surfaceNode on RSTree * Just need add appSurface Node as child of leashWindowSurfaceNode */ - HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "AddAppSurfaceNodeOnRSTree"); + // HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "AddAppSurfaceNodeOnRSTree"); if (!WindowHelper::IsMainWindow(node->GetWindowType())) { WLOGFE("id:%{public}u not main app window but has start window", node->GetWindowId()); return false; @@ -540,7 +540,7 @@ bool WindowNodeContainer::AddAppSurfaceNodeOnRSTree(sptr& node) bool WindowNodeContainer::AddNodeOnRSTree(sptr& node, DisplayId displayId, DisplayId parentDisplayId, WindowUpdateType type, bool animationPlayed) { - HITRACE_METER(HITRACE_TAG_WINDOW_MANAGER); + // HITRACE_METER(HITRACE_TAG_WINDOW_MANAGER); if (node->GetWindowProperty()->GetAnimationFlag() == static_cast(WindowAnimation::CUSTOM) || node->GetWindowType() == WindowType::WINDOW_TYPE_APP_COMPONENT) { WLOGFD("not need to update RSTree"); @@ -572,7 +572,7 @@ bool WindowNodeContainer::AddNodeOnRSTree(sptr& node, DisplayId disp if (node->EnableDefaultAnimation(animationPlayed)) { WLOGFD("add window with animation"); - StartTraceArgs(HITRACE_TAG_WINDOW_MANAGER, "Animate(%u)", node->GetWindowId()); + // StartTraceArgs(HITRACE_TAG_WINDOW_MANAGER, "Animate(%u)", node->GetWindowId()); RSNode::Animate(animationConfig_.windowAnimationConfig_.animationTiming_.timingProtocol_, animationConfig_.windowAnimationConfig_.animationTiming_.timingCurve_, updateRSTreeFunc); // FinishTrace(HITRACE_TAG_WINDOW_MANAGER); @@ -627,7 +627,7 @@ void WindowNodeContainer::ProcessInputMethodWindowAddAnimation(sptr& bool WindowNodeContainer::RemoveNodeFromRSTree(sptr& node, DisplayId displayId, DisplayId parentDisplayId, WindowUpdateType type, bool animationPlayed) { - HITRACE_METER(HITRACE_TAG_WINDOW_MANAGER); + // HITRACE_METER(HITRACE_TAG_WINDOW_MANAGER); if (node->GetWindowProperty()->GetAnimationFlag() == static_cast(WindowAnimation::CUSTOM) || node->GetWindowType() == WindowType::WINDOW_TYPE_APP_COMPONENT) { WLOGFD("not need to update RSTree"); @@ -655,7 +655,7 @@ bool WindowNodeContainer::RemoveNodeFromRSTree(sptr& node, DisplayId if (node->EnableDefaultAnimation(animationPlayed)) { WLOGFD("remove window with animation"); - StartTraceArgs(HITRACE_TAG_WINDOW_MANAGER, "Animate(%u)", node->GetWindowId()); + // StartTraceArgs(HITRACE_TAG_WINDOW_MANAGER, "Animate(%u)", node->GetWindowId()); if (node->surfaceNode_) { node->surfaceNode_->SetAppFreeze(true); } @@ -953,8 +953,8 @@ void WindowNodeContainer::HandleKeepScreenOn(const sptr& node, bool return; } WLOGFD("handle keep screen on: [%{public}s, %{public}d]", node->GetWindowName().c_str(), requireLock); - HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "container:HandleKeepScreenOn(%s, %d)", - node->GetWindowName().c_str(), requireLock); + // HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "container:HandleKeepScreenOn(%s, %d)", + // node->GetWindowName().c_str(), requireLock); ErrCode res; // reset ipc identity std::string identity = IPCSkeleton::ResetCallingIdentity(); @@ -1058,7 +1058,7 @@ void WindowNodeContainer::ProcessWindowAvoidAreaChangeWhenDisplayChange() const void WindowNodeContainer::NotifyIfSystemBarTintChanged(DisplayId displayId) const { - HITRACE_METER(HITRACE_TAG_WINDOW_MANAGER); + // HITRACE_METER(HITRACE_TAG_WINDOW_MANAGER); auto expectSystemBarProp = GetExpectImmersiveProperty(); SystemBarRegionTints tints; SysBarTintMap& sysBarTintMap = displayGroupController_->sysBarTintMaps_[displayId]; @@ -1078,7 +1078,7 @@ void WindowNodeContainer::NotifyIfSystemBarTintChanged(DisplayId displayId) cons void WindowNodeContainer::NotifyIfSystemBarRegionChanged(DisplayId displayId) const { - HITRACE_METER(HITRACE_TAG_WINDOW_MANAGER); + // HITRACE_METER(HITRACE_TAG_WINDOW_MANAGER); SystemBarRegionTints tints; SysBarTintMap& sysBarTintMap = displayGroupController_->sysBarTintMaps_[displayId]; SysBarNodeMap& sysBarNodeMap = displayGroupController_->sysBarNodeMaps_[displayId]; @@ -1167,7 +1167,7 @@ void WindowNodeContainer::NotifySystemBarTints(std::vector displayIdV void WindowNodeContainer::NotifyDockWindowStateChanged(sptr& node, bool isEnable) { - HITRACE_METER(HITRACE_TAG_WINDOW_MANAGER); + // HITRACE_METER(HITRACE_TAG_WINDOW_MANAGER); WLOGFD("[Immersive] begin isEnable: %{public}d", isEnable); if (isEnable) { for (auto& windowNode : appWindowNode_->children_) { diff --git a/window_manager/wmserver/src/window_root.cpp b/window_manager/wmserver/src/window_root.cpp index 73438cd..ef8ab38 100644 --- a/window_manager/wmserver/src/window_root.cpp +++ b/window_manager/wmserver/src/window_root.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +// #include #include #include "display_manager_service_inner.h" @@ -229,7 +229,7 @@ WMError WindowRoot::SaveWindow(const sptr& node) WMError WindowRoot::MinimizeStructuredAppWindowsExceptSelf(sptr& node) { - HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "root:MinimizeStructuredAppWindowsExceptSelf"); + // HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "root:MinimizeStructuredAppWindowsExceptSelf"); auto container = GetOrCreateWindowNodeContainer(node->GetDisplayId()); if (container == nullptr) { WLOGFE("MinimizeAbility failed, window container could not be found"); diff --git a/window_manager/wmserver/src/window_snapshot/snapshot_controller.cpp b/window_manager/wmserver/src/window_snapshot/snapshot_controller.cpp index 65eed33..60e4f86 100644 --- a/window_manager/wmserver/src/window_snapshot/snapshot_controller.cpp +++ b/window_manager/wmserver/src/window_snapshot/snapshot_controller.cpp @@ -15,7 +15,7 @@ #include "snapshot_controller.h" -#include +// #include #include "surface_capture_future.h" #include "surface_draw.h" @@ -30,7 +30,7 @@ namespace { int32_t SnapshotController::GetSnapshot(const sptr &token, Snapshot& snapshot) { - HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "wms:GetSnapshot"); + // HITRACE_METER_FMT(HITRACE_TAG_WINDOW_MANAGER, "wms:GetSnapshot"); if (token == nullptr) { WLOGFE("Get snapshot failed, because token is null."); return static_cast(WMError::WM_ERROR_NULLPTR); diff --git a/window_manager/wmserver/test/unittest/window_manager_service_test.cpp b/window_manager/wmserver/test/unittest/window_manager_service_test.cpp index bc95191..d0880f5 100644 --- a/window_manager/wmserver/test/unittest/window_manager_service_test.cpp +++ b/window_manager/wmserver/test/unittest/window_manager_service_test.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +// #include #include #include #include -- Gitee From fc699703336add9006ef4f4ddb26c9328bfb48be Mon Sep 17 00:00:00 2001 From: huangyuxin2023 Date: Mon, 23 Oct 2023 15:25:05 +0800 Subject: [PATCH 14/16] Update prebuild.sh --- build/prebuild.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/build/prebuild.sh b/build/prebuild.sh index a83df4e..db890c9 100644 --- a/build/prebuild.sh +++ b/build/prebuild.sh @@ -104,8 +104,6 @@ if [ ! -d ${PROJECT_DIR}/third_party/ft_flutter ]; then git clone -b 2203sp2_20231023 https://gitee.com/openeuler/ft_flutter.git ${PROJECT_DIR}/third_party/ft_flutter fi cd ${PROJECT_DIR}/third_party/ft_flutter -git fetch https://gitee.com/openeuler/ft_flutter.git pull/24/head:pr_24 -git checkout pr_24 ./project_build/prebuild.sh ./build.sh $* -- Gitee From 9319e2fefcb1784a0397db0940929d0048ad6df1 Mon Sep 17 00:00:00 2001 From: huangyuxin2023 Date: Mon, 23 Oct 2023 18:49:56 +0800 Subject: [PATCH 15/16] Update prebuild.sh --- build/prebuild.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/build/prebuild.sh b/build/prebuild.sh index db890c9..541056c 100644 --- a/build/prebuild.sh +++ b/build/prebuild.sh @@ -120,8 +120,6 @@ if [ ! -d ${PROJECT_DIR}/third_party/ft_mmi ]; then git clone -b 2203sp2_20231023 https://gitee.com/openeuler/ft_mmi.git ${PROJECT_DIR}/third_party/ft_mmi fi cd ${PROJECT_DIR}/third_party/ft_mmi -git fetch https://gitee.com/openeuler/ft_mmi.git pull/35/head:pr_35 -git checkout pr_35 ./build/prebuild.sh ./build.sh $* -- Gitee From 07b01e7ea9d92cc5bba02317bfcb8028ab3056c8 Mon Sep 17 00:00:00 2001 From: huangyuxin2023 Date: Tue, 24 Oct 2023 14:32:02 +0800 Subject: [PATCH 16/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9flutter=E5=A4=B4?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/gn/configs/system_libs/BUILD.gn | 4 ++-- build/prebuild.sh | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/build/gn/configs/system_libs/BUILD.gn b/build/gn/configs/system_libs/BUILD.gn index 7ac4c2f..fbf2894 100644 --- a/build/gn/configs/system_libs/BUILD.gn +++ b/build/gn/configs/system_libs/BUILD.gn @@ -51,8 +51,8 @@ config("skia_config") { visibility = [ ":*" ] include_dirs = [ - "${usr_inc}/flutter", - "${usr_inc}/flutter/txt", + "${sys_inc}/flutter", + "${sys_inc}/flutter/txt", "${sys_inc}/skia", "${sys_inc}/skia/src", "${sys_inc}/skia/include", diff --git a/build/prebuild.sh b/build/prebuild.sh index 541056c..7a883fc 100644 --- a/build/prebuild.sh +++ b/build/prebuild.sh @@ -111,8 +111,6 @@ if [ ! -d ${PROJECT_DIR}/third_party/ft_multimedia ]; then git clone -b 2203sp2_20231023 https://gitee.com/openeuler/ft_multimedia.git ${PROJECT_DIR}/third_party/ft_multimedia fi cd ${PROJECT_DIR}/third_party/ft_multimedia -git fetch https://gitee.com/openeuler/ft_multimedia.git pull/24/head:pr_24 -git checkout pr_24 ./build/prebuild.sh $* ./build.sh $* -- Gitee