From 6954888f4485d73b2ea41e50d207c42213299472 Mon Sep 17 00:00:00 2001 From: huangji731 Date: Tue, 6 Feb 2024 16:59:27 +0800 Subject: [PATCH] https://gitee.com/openharmony/window_window_manager/issues/I91CWB Signed-off-by: huangji731 --- dm/src/display.cpp | 2 +- dm/src/display_manager.cpp | 2 +- dm/src/display_manager_adapter.cpp | 2 +- dm/src/screen.cpp | 2 +- dm/src/screen_group.cpp | 2 +- dm/src/screen_manager.cpp | 4 ++-- dm/src/zidl/display_manager_agent_proxy.cpp | 2 +- dm/src/zidl/display_manager_agent_stub.cpp | 2 +- dm/test/unittest/display_change_unit_test.cpp | 2 +- dm_lite/src/display_lite.cpp | 2 +- dm_lite/src/display_manager_adapter_lite.cpp | 2 +- dm_lite/src/display_manager_lite.cpp | 2 +- dmserver/src/abstract_display.cpp | 2 +- dmserver/src/abstract_display_controller.cpp | 2 +- dmserver/src/abstract_screen.cpp | 2 +- dmserver/src/abstract_screen_controller.cpp | 2 +- dmserver/src/display_cutout_controller.cpp | 2 +- dmserver/src/display_dumper.cpp | 2 +- dmserver/src/display_manager_agent_controller.cpp | 2 +- dmserver/src/display_manager_config.cpp | 2 +- dmserver/src/display_manager_proxy.cpp | 2 +- dmserver/src/display_manager_service.cpp | 2 +- dmserver/src/display_manager_service_inner.cpp | 2 +- dmserver/src/display_manager_stub.cpp | 2 +- dmserver/src/display_power_controller.cpp | 2 +- dmserver/src/screen_rotation_controller.cpp | 2 +- dmserver/src/sensor_connector.cpp | 2 +- interfaces/kits/napi/display_runtime/js_display.cpp | 2 +- .../kits/napi/display_runtime/js_display_listener.cpp | 2 +- .../kits/napi/display_runtime/js_display_manager.cpp | 2 +- .../kits/napi/screen_runtime/napi/js_screen.cpp | 2 +- .../napi/screen_runtime/napi/js_screen_listener.cpp | 2 +- .../napi/screen_runtime/napi/js_screen_manager.cpp | 2 +- utils/include/window_manager_hilog.h | 11 +++++++++++ .../src/screen_session_manager_client.cpp | 2 +- .../src/zidl/screen_session_manager_client_proxy.cpp | 3 ++- .../src/zidl/screen_session_manager_client_stub.cpp | 3 ++- window_scene/session/screen/src/screen_session.cpp | 2 +- .../session_manager/src/screen_rotation_property.cpp | 3 ++- .../session_manager/src/screen_scene_config.cpp | 2 +- .../session_manager/src/screen_sensor_connector.cpp | 2 +- .../src/session_display_power_controller.cpp | 3 ++- window_scene/session_manager/src/session_manager.cpp | 2 +- .../session_manager/src/session_manager_lite.cpp | 2 +- .../src/zidl/screen_session_manager_lite_proxy.cpp | 3 ++- .../src/zidl/screen_session_manager_lite_stub.cpp | 3 ++- .../src/zidl/screen_session_manager_proxy.cpp | 3 ++- .../src/zidl/screen_session_manager_stub.cpp | 3 ++- 48 files changed, 67 insertions(+), 48 deletions(-) diff --git a/dm/src/display.cpp b/dm/src/display.cpp index e154bbf730..86f9401cf8 100644 --- a/dm/src/display.cpp +++ b/dm/src/display.cpp @@ -27,7 +27,7 @@ namespace OHOS::Rosen { namespace { - constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "Display"}; + constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DMS_DM, "Display"}; } class Display::Impl : public RefBase { public: diff --git a/dm/src/display_manager.cpp b/dm/src/display_manager.cpp index 5ce8c46d3c..346534714d 100644 --- a/dm/src/display_manager.cpp +++ b/dm/src/display_manager.cpp @@ -29,7 +29,7 @@ namespace OHOS::Rosen { namespace { - constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "DisplayManager"}; + constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DMS_DM, "DisplayManager"}; const static uint32_t MAX_RETRY_NUM = 6; const static uint32_t RETRY_WAIT_MS = 500; const static uint32_t MAX_DISPLAY_SIZE = 32; diff --git a/dm/src/display_manager_adapter.cpp b/dm/src/display_manager_adapter.cpp index 26a0220d06..483641b671 100644 --- a/dm/src/display_manager_adapter.cpp +++ b/dm/src/display_manager_adapter.cpp @@ -28,7 +28,7 @@ namespace OHOS::Rosen { namespace { - constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "DisplayManagerAdapter"}; + constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DMS_DM, "DisplayManagerAdapter"}; } WM_IMPLEMENT_SINGLE_INSTANCE(DisplayManagerAdapter) WM_IMPLEMENT_SINGLE_INSTANCE(ScreenManagerAdapter) diff --git a/dm/src/screen.cpp b/dm/src/screen.cpp index 2277d5bfca..ceeb052130 100644 --- a/dm/src/screen.cpp +++ b/dm/src/screen.cpp @@ -27,7 +27,7 @@ namespace OHOS::Rosen { namespace { - constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "Screen"}; + constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DMS_DM, "Screen"}; } class Screen::Impl : public RefBase { public: diff --git a/dm/src/screen_group.cpp b/dm/src/screen_group.cpp index 93dd8d0d11..704f42b2d8 100644 --- a/dm/src/screen_group.cpp +++ b/dm/src/screen_group.cpp @@ -26,7 +26,7 @@ namespace OHOS::Rosen { namespace { - constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "ScreenGroup"}; + constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DMS_DM, "ScreenGroup"}; } class ScreenGroup::Impl : public RefBase { public: diff --git a/dm/src/screen_manager.cpp b/dm/src/screen_manager.cpp index 90446dec5d..1e7bda2487 100644 --- a/dm/src/screen_manager.cpp +++ b/dm/src/screen_manager.cpp @@ -28,8 +28,8 @@ namespace OHOS::Rosen { namespace { -constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "ScreenManager"}; -const static uint32_t MAX_SCREEN_SIZE = 32; + constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DMS_DM, "ScreenManager"}; + const static uint32_t MAX_SCREEN_SIZE = 32; } class ScreenManager::Impl : public RefBase { public: diff --git a/dm/src/zidl/display_manager_agent_proxy.cpp b/dm/src/zidl/display_manager_agent_proxy.cpp index acb4cab5f7..4a21cd3961 100644 --- a/dm/src/zidl/display_manager_agent_proxy.cpp +++ b/dm/src/zidl/display_manager_agent_proxy.cpp @@ -22,7 +22,7 @@ namespace OHOS { namespace Rosen { namespace { - constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "DisplayManagerAgentProxy"}; + constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DMS_DM, "DisplayManagerAgentProxy"}; } void DisplayManagerAgentProxy::NotifyDisplayPowerEvent(DisplayPowerEvent event, EventStatus status) diff --git a/dm/src/zidl/display_manager_agent_stub.cpp b/dm/src/zidl/display_manager_agent_stub.cpp index 7a493661f4..a9fd5c9c1b 100644 --- a/dm/src/zidl/display_manager_agent_stub.cpp +++ b/dm/src/zidl/display_manager_agent_stub.cpp @@ -25,7 +25,7 @@ namespace OHOS::Rosen { namespace { - constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "DisplayManagerAgentStub"}; + constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DMS_DM, "DisplayManagerAgentStub"}; } int32_t DisplayManagerAgentStub::OnRemoteRequest(uint32_t code, MessageParcel& data, diff --git a/dm/test/unittest/display_change_unit_test.cpp b/dm/test/unittest/display_change_unit_test.cpp index b9c04ab80b..57e048f9b9 100644 --- a/dm/test/unittest/display_change_unit_test.cpp +++ b/dm/test/unittest/display_change_unit_test.cpp @@ -28,7 +28,7 @@ using namespace testing::ext; namespace OHOS { namespace Rosen { -constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "DisplayChangeUnitTest"}; +constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DMS_DM, "DisplayChangeUnitTest"}; using Mocker = SingletonMocker; class DisplayChangeEventListener : public DisplayManager::IDisplayListener { diff --git a/dm_lite/src/display_lite.cpp b/dm_lite/src/display_lite.cpp index b3a18dd441..dcfc4d9025 100644 --- a/dm_lite/src/display_lite.cpp +++ b/dm_lite/src/display_lite.cpp @@ -27,7 +27,7 @@ namespace OHOS::Rosen { namespace { - constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "DisplayLite"}; + constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DMS_DM_LITE, "DisplayLite"}; } class DisplayLite::Impl : public RefBase { public: diff --git a/dm_lite/src/display_manager_adapter_lite.cpp b/dm_lite/src/display_manager_adapter_lite.cpp index 94cf4b335e..33ae03d6af 100644 --- a/dm_lite/src/display_manager_adapter_lite.cpp +++ b/dm_lite/src/display_manager_adapter_lite.cpp @@ -26,7 +26,7 @@ namespace OHOS::Rosen { namespace { - constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "DisplayManagerAdapterLite"}; + constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DMS_DM_LITE, "DisplayManagerAdapterLite"}; } WM_IMPLEMENT_SINGLE_INSTANCE(DisplayManagerAdapterLite) diff --git a/dm_lite/src/display_manager_lite.cpp b/dm_lite/src/display_manager_lite.cpp index 4134aa3a5b..3d86de735a 100644 --- a/dm_lite/src/display_manager_lite.cpp +++ b/dm_lite/src/display_manager_lite.cpp @@ -26,7 +26,7 @@ namespace OHOS::Rosen { namespace { - constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "DisplayManagerLite"}; + constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DMS_DM_LITE, "DisplayManagerLite"}; } WM_IMPLEMENT_SINGLE_INSTANCE(DisplayManagerLite) diff --git a/dmserver/src/abstract_display.cpp b/dmserver/src/abstract_display.cpp index 791c4a4fd8..344c1f9969 100644 --- a/dmserver/src/abstract_display.cpp +++ b/dmserver/src/abstract_display.cpp @@ -22,7 +22,7 @@ namespace OHOS::Rosen { namespace { - constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "AbstractDisplay"}; + constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DMS_DM_SERVER, "AbstractDisplay"}; constexpr int32_t PAD_SCREEN_WIDTH = 2560; constexpr int32_t PHONE_SCREEN_WIDTH = 2160; constexpr float INCH_2_MM = 25.4f; diff --git a/dmserver/src/abstract_display_controller.cpp b/dmserver/src/abstract_display_controller.cpp index 123595a7b0..909bce6427 100644 --- a/dmserver/src/abstract_display_controller.cpp +++ b/dmserver/src/abstract_display_controller.cpp @@ -31,7 +31,7 @@ namespace OHOS::Rosen { namespace { - constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "AbstractDisplayController"}; + constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DMS_DM_SERVER, "AbstractDisplayController"}; } AbstractDisplayController::AbstractDisplayController(std::recursive_mutex& mutex, DisplayStateChangeListener listener) diff --git a/dmserver/src/abstract_screen.cpp b/dmserver/src/abstract_screen.cpp index 5ea59e9514..4b29e22b0a 100644 --- a/dmserver/src/abstract_screen.cpp +++ b/dmserver/src/abstract_screen.cpp @@ -23,7 +23,7 @@ namespace OHOS::Rosen { namespace { - constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "AbstractScreenGroup"}; + constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DMS_DM_SERVER, "AbstractScreenGroup"}; constexpr float MAX_ZORDER = 100000.0f; } diff --git a/dmserver/src/abstract_screen_controller.cpp b/dmserver/src/abstract_screen_controller.cpp index bc134c8d2a..e1d7d21bab 100644 --- a/dmserver/src/abstract_screen_controller.cpp +++ b/dmserver/src/abstract_screen_controller.cpp @@ -38,7 +38,7 @@ namespace OHOS::Rosen { namespace { - constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "AbstractScreenController"}; + constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DMS_DM_SERVER, "AbstractScreenController"}; const std::string CONTROLLER_THREAD_ID = "AbstractScreenControllerThread"; } diff --git a/dmserver/src/display_cutout_controller.cpp b/dmserver/src/display_cutout_controller.cpp index 4ad3562d8d..f62c485dc6 100644 --- a/dmserver/src/display_cutout_controller.cpp +++ b/dmserver/src/display_cutout_controller.cpp @@ -21,7 +21,7 @@ namespace OHOS { namespace Rosen { namespace { - constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "DisplayCutoutController"}; + constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DMS_DM_SERVER, "DisplayCutoutController"}; const uint32_t NO_WATERFALL_DISPLAY_COMPRESSION_SIZE = 0; } diff --git a/dmserver/src/display_dumper.cpp b/dmserver/src/display_dumper.cpp index 2683deae31..2eaba8a219 100644 --- a/dmserver/src/display_dumper.cpp +++ b/dmserver/src/display_dumper.cpp @@ -28,7 +28,7 @@ namespace OHOS { namespace Rosen { namespace { - constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "DisplayDumper"}; + constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DMS_DM_SERVER, "DisplayDumper"}; constexpr int SCREEN_NAME_MAX_LENGTH = 20; const std::string ARG_DUMP_HELP = "-h"; diff --git a/dmserver/src/display_manager_agent_controller.cpp b/dmserver/src/display_manager_agent_controller.cpp index 8e71461ca9..b919e5715c 100644 --- a/dmserver/src/display_manager_agent_controller.cpp +++ b/dmserver/src/display_manager_agent_controller.cpp @@ -19,7 +19,7 @@ namespace OHOS { namespace Rosen { namespace { - constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "DisplayManagerAgentController"}; + constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DMS_DM_SERVER, "DisplayManagerAgentController"}; } WM_IMPLEMENT_SINGLE_INSTANCE(DisplayManagerAgentController) diff --git a/dmserver/src/display_manager_config.cpp b/dmserver/src/display_manager_config.cpp index 30afb6c54b..1e739272a7 100644 --- a/dmserver/src/display_manager_config.cpp +++ b/dmserver/src/display_manager_config.cpp @@ -30,7 +30,7 @@ namespace OHOS::Rosen { namespace { - constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "DisplayManagerConfig"}; + constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DMS_DM_SERVER, "DisplayManagerConfig"}; } std::map DisplayManagerConfig::enableConfig_; diff --git a/dmserver/src/display_manager_proxy.cpp b/dmserver/src/display_manager_proxy.cpp index e214d4733f..55340bde0e 100644 --- a/dmserver/src/display_manager_proxy.cpp +++ b/dmserver/src/display_manager_proxy.cpp @@ -24,7 +24,7 @@ namespace OHOS::Rosen { namespace { - constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "DisplayManagerProxy"}; + constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DMS_DM_SERVER, "DisplayManagerProxy"}; } sptr DisplayManagerProxy::GetDefaultDisplayInfo() diff --git a/dmserver/src/display_manager_service.cpp b/dmserver/src/display_manager_service.cpp index eca5892b5d..588f73bb53 100644 --- a/dmserver/src/display_manager_service.cpp +++ b/dmserver/src/display_manager_service.cpp @@ -33,7 +33,7 @@ namespace OHOS::Rosen { namespace { - constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "DisplayManagerService"}; + constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DMS_DM_SERVER, "DisplayManagerService"}; const std::string SCREEN_CAPTURE_PERMISSION = "ohos.permission.CAPTURE_SCREEN"; } WM_IMPLEMENT_SINGLE_INSTANCE(DisplayManagerService) diff --git a/dmserver/src/display_manager_service_inner.cpp b/dmserver/src/display_manager_service_inner.cpp index 2946bad1b2..73f6aa461a 100644 --- a/dmserver/src/display_manager_service_inner.cpp +++ b/dmserver/src/display_manager_service_inner.cpp @@ -23,7 +23,7 @@ namespace OHOS::Rosen { namespace { - constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "DisplayManagerServiceInner"}; + constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DMS_DM_SERVER, "DisplayManagerServiceInner"}; } WM_IMPLEMENT_SINGLE_INSTANCE(DisplayManagerServiceInner) diff --git a/dmserver/src/display_manager_stub.cpp b/dmserver/src/display_manager_stub.cpp index a60d5f3fbc..dee29cf1fe 100644 --- a/dmserver/src/display_manager_stub.cpp +++ b/dmserver/src/display_manager_stub.cpp @@ -26,7 +26,7 @@ namespace OHOS::Rosen { namespace { - constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "DisplayManagerStub"}; + constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DMS_DM_SERVER, "DisplayManagerStub"}; const static uint32_t MAX_SCREEN_SIZE = 32; } diff --git a/dmserver/src/display_power_controller.cpp b/dmserver/src/display_power_controller.cpp index 470de4ceb5..2776bb1676 100644 --- a/dmserver/src/display_power_controller.cpp +++ b/dmserver/src/display_power_controller.cpp @@ -21,7 +21,7 @@ namespace OHOS { namespace Rosen { namespace { - constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "DisplayPowerController"}; + constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DMS_DM_SERVER, "DisplayPowerController"}; } bool DisplayPowerController::SuspendBegin(PowerStateChangeReason reason) diff --git a/dmserver/src/screen_rotation_controller.cpp b/dmserver/src/screen_rotation_controller.cpp index 129bf75fed..09db23add7 100644 --- a/dmserver/src/screen_rotation_controller.cpp +++ b/dmserver/src/screen_rotation_controller.cpp @@ -23,7 +23,7 @@ namespace OHOS { namespace Rosen { namespace { - constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "ScreenRotationController"}; + constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DMS_DM_SERVER, "ScreenRotationController"}; } DisplayId ScreenRotationController::defaultDisplayId_ = 0; diff --git a/dmserver/src/sensor_connector.cpp b/dmserver/src/sensor_connector.cpp index 11b51987a2..db7ae3946e 100644 --- a/dmserver/src/sensor_connector.cpp +++ b/dmserver/src/sensor_connector.cpp @@ -23,7 +23,7 @@ namespace OHOS { namespace Rosen { namespace { - constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "SensorConnector"}; + constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DMS_DM_SERVER, "SensorConnector"}; #ifdef SENSOR_ENABLE constexpr int64_t ORIENTATION_SENSOR_SAMPLING_RATE = 200000000; // 200ms diff --git a/interfaces/kits/napi/display_runtime/js_display.cpp b/interfaces/kits/napi/display_runtime/js_display.cpp index 32f8f653dd..e0bcbbf8bc 100644 --- a/interfaces/kits/napi/display_runtime/js_display.cpp +++ b/interfaces/kits/napi/display_runtime/js_display.cpp @@ -29,7 +29,7 @@ namespace Rosen { using namespace AbilityRuntime; constexpr size_t ARGC_ONE = 1; namespace { - constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "JsDisplay"}; + constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DMS_DISPLAY_RUNTIME, "JsDisplay"}; const std::map NATIVE_TO_JS_DISPLAY_STATE_MAP { { DisplayState::UNKNOWN, DisplayStateMode::STATE_UNKNOWN }, { DisplayState::OFF, DisplayStateMode::STATE_OFF }, diff --git a/interfaces/kits/napi/display_runtime/js_display_listener.cpp b/interfaces/kits/napi/display_runtime/js_display_listener.cpp index e661b04d4b..698520720e 100644 --- a/interfaces/kits/napi/display_runtime/js_display_listener.cpp +++ b/interfaces/kits/napi/display_runtime/js_display_listener.cpp @@ -21,7 +21,7 @@ namespace OHOS { namespace Rosen { using namespace AbilityRuntime; namespace { - constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "JsDisplayListener"}; + constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DMS_DISPLAY_RUNTIME, "JsDisplayListener"}; } void JsDisplayListener::AddCallback(const std::string& type, napi_value jsListenerObject) diff --git a/interfaces/kits/napi/display_runtime/js_display_manager.cpp b/interfaces/kits/napi/display_runtime/js_display_manager.cpp index 27923222e7..163cde95d9 100644 --- a/interfaces/kits/napi/display_runtime/js_display_manager.cpp +++ b/interfaces/kits/napi/display_runtime/js_display_manager.cpp @@ -33,7 +33,7 @@ constexpr size_t ARGC_ONE = 1; constexpr size_t ARGC_TWO = 2; constexpr int32_t INDEX_ONE = 1; namespace { - constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "JsDisplayManager"}; + constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DMS_DISPLAY_RUNTIME, "JsDisplayManager"}; } class JsDisplayManager { diff --git a/interfaces/kits/napi/screen_runtime/napi/js_screen.cpp b/interfaces/kits/napi/screen_runtime/napi/js_screen.cpp index cb28a6976c..d29078ea6b 100644 --- a/interfaces/kits/napi/screen_runtime/napi/js_screen.cpp +++ b/interfaces/kits/napi/screen_runtime/napi/js_screen.cpp @@ -27,7 +27,7 @@ using namespace AbilityRuntime; constexpr size_t ARGC_ONE = 1; constexpr size_t ARGC_TWO = 2; namespace { - constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "JsScreen"}; + constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DMS_SCREEN_RUNTIME, "JsScreen"}; } static thread_local std::map> g_JsScreenMap; diff --git a/interfaces/kits/napi/screen_runtime/napi/js_screen_listener.cpp b/interfaces/kits/napi/screen_runtime/napi/js_screen_listener.cpp index 6e3c6385c5..591713ffd3 100644 --- a/interfaces/kits/napi/screen_runtime/napi/js_screen_listener.cpp +++ b/interfaces/kits/napi/screen_runtime/napi/js_screen_listener.cpp @@ -20,7 +20,7 @@ namespace OHOS { namespace Rosen { using namespace AbilityRuntime; namespace { - constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "JsScreenListener"}; + constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DMS_SCREEN_RUNTIME, "JsScreenListener"}; } inline uint32_t SCREEN_DISCONNECT_TYPE = 0; inline uint32_t SCREEN_CONNECT_TYPE = 1; diff --git a/interfaces/kits/napi/screen_runtime/napi/js_screen_manager.cpp b/interfaces/kits/napi/screen_runtime/napi/js_screen_manager.cpp index 5d849c8e70..68ae3e0864 100644 --- a/interfaces/kits/napi/screen_runtime/napi/js_screen_manager.cpp +++ b/interfaces/kits/napi/screen_runtime/napi/js_screen_manager.cpp @@ -36,7 +36,7 @@ constexpr size_t ARGC_THREE = 3; constexpr int32_t INDEX_ONE = 1; constexpr uint32_t MAX_SCREENS_NUM = 1000; namespace { - constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "JsScreenManager"}; + constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DMS_SCREEN_RUNTIME, "JsScreenManager"}; } class JsScreenManager { diff --git a/utils/include/window_manager_hilog.h b/utils/include/window_manager_hilog.h index 8db4eb108e..3d9d4626b2 100644 --- a/utils/include/window_manager_hilog.h +++ b/utils/include/window_manager_hilog.h @@ -21,6 +21,17 @@ namespace OHOS { namespace Rosen { static constexpr unsigned int HILOG_DOMAIN_WINDOW = 0xD004200; static constexpr unsigned int HILOG_DOMAIN_DISPLAY = 0xD004201; +static constexpr unsigned int HILOG_DOMAIN_DMS_DM = 0xD004280; +static constexpr unsigned int HILOG_DOMAIN_DMS_DM_LITE = 0xD004281; +static constexpr unsigned int HILOG_DOMAIN_DMS_DM_SERVER = 0xD004282; +static constexpr unsigned int HILOG_DOMAIN_DMS_SCREEN_KITS = 0xD004283; +static constexpr unsigned int HILOG_DOMAIN_DMS_SCREEN_CLIENT = 0xD004284; +static constexpr unsigned int HILOG_DOMAIN_DMS_SCREEN_SESSION = 0xD004285; +static constexpr unsigned int HILOG_DOMAIN_DMS_SCREEN_SESSION_MANAGER = 0xD004286; +static constexpr unsigned int HILOG_DOMAIN_DMS_DISPLAY_RUNTIME = 0xD004287; +static constexpr unsigned int HILOG_DOMAIN_DMS_SCREEN_RUNTIME = 0xD004288; +static constexpr unsigned int HILOG_DOMAIN_DMS_SCREEN_SHOT = 0xD004289; + static constexpr OHOS::HiviewDFX::HiLogLabel LOG_LABEL = {LOG_CORE, HILOG_DOMAIN_WINDOW, "WindowManager"}; #define WLOG_F(...) (void)OHOS::HiviewDFX::HiLog::Fatal(LOG_LABEL, __VA_ARGS__) diff --git a/window_scene/screen_session_manager/src/screen_session_manager_client.cpp b/window_scene/screen_session_manager/src/screen_session_manager_client.cpp index f9ce223327..2331d0e2c7 100644 --- a/window_scene/screen_session_manager/src/screen_session_manager_client.cpp +++ b/window_scene/screen_session_manager/src/screen_session_manager_client.cpp @@ -21,7 +21,7 @@ namespace OHOS::Rosen { namespace { -constexpr HiviewDFX::HiLogLabel LABEL = { LOG_CORE, HILOG_DOMAIN_DISPLAY, "ScreenSessionManagerClient" }; +constexpr HiviewDFX::HiLogLabel LABEL = { LOG_CORE, HILOG_DOMAIN_DMS_SCREEN_CLIENT, "ScreenSessionManagerClient" }; std::mutex g_instanceMutex; } // namespace diff --git a/window_scene/screen_session_manager/src/zidl/screen_session_manager_client_proxy.cpp b/window_scene/screen_session_manager/src/zidl/screen_session_manager_client_proxy.cpp index cdce847a8c..024e6660c1 100644 --- a/window_scene/screen_session_manager/src/zidl/screen_session_manager_client_proxy.cpp +++ b/window_scene/screen_session_manager/src/zidl/screen_session_manager_client_proxy.cpp @@ -19,7 +19,8 @@ namespace OHOS::Rosen { namespace { -constexpr HiviewDFX::HiLogLabel LABEL = { LOG_CORE, HILOG_DOMAIN_DISPLAY, "ScreenSessionManagerClientProxy" }; +constexpr HiviewDFX::HiLogLabel LABEL = { LOG_CORE, HILOG_DOMAIN_DMS_SCREEN_CLIENT, + "ScreenSessionManagerClientProxy" }; } // namespace void ScreenSessionManagerClientProxy::OnScreenConnectionChanged(ScreenId screenId, ScreenEvent screenEvent, diff --git a/window_scene/screen_session_manager/src/zidl/screen_session_manager_client_stub.cpp b/window_scene/screen_session_manager/src/zidl/screen_session_manager_client_stub.cpp index e2fcebdcb8..8d34c73bbb 100644 --- a/window_scene/screen_session_manager/src/zidl/screen_session_manager_client_stub.cpp +++ b/window_scene/screen_session_manager/src/zidl/screen_session_manager_client_stub.cpp @@ -19,7 +19,8 @@ namespace OHOS::Rosen { namespace { -constexpr HiviewDFX::HiLogLabel LABEL = { LOG_CORE, HILOG_DOMAIN_DISPLAY, "ScreenSessionManagerClientStub" }; +constexpr HiviewDFX::HiLogLabel LABEL = { LOG_CORE, HILOG_DOMAIN_DMS_SCREEN_CLIENT, + "ScreenSessionManagerClientStub" }; } // namespace const std::map ScreenSessionManagerClientStub::stubFuncMap_ { diff --git a/window_scene/session/screen/src/screen_session.cpp b/window_scene/session/screen/src/screen_session.cpp index 920d800160..a06c08d2f0 100644 --- a/window_scene/session/screen/src/screen_session.cpp +++ b/window_scene/session/screen/src/screen_session.cpp @@ -24,7 +24,7 @@ namespace OHOS::Rosen { namespace { -constexpr HiviewDFX::HiLogLabel LABEL = { LOG_CORE, HILOG_DOMAIN_WINDOW, "ScreenSession" }; +constexpr HiviewDFX::HiLogLabel LABEL = { LOG_CORE, HILOG_DOMAIN_DMS_SCREEN_SESSION, "ScreenSession" }; } ScreenSession::ScreenSession(ScreenId screenId, ScreenId rsId, const std::string& name, diff --git a/window_scene/session_manager/src/screen_rotation_property.cpp b/window_scene/session_manager/src/screen_rotation_property.cpp index aab6e3296b..7313f33904 100644 --- a/window_scene/session_manager/src/screen_rotation_property.cpp +++ b/window_scene/session_manager/src/screen_rotation_property.cpp @@ -24,7 +24,8 @@ namespace OHOS { namespace Rosen { namespace { - constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "ScreenRotationProperty"}; +constexpr HiviewDFX::HiLogLabel LABEL = { LOG_CORE, HILOG_DOMAIN_DMS_SCREEN_SESSION_MANAGER, + "ScreenRotationProperty" }; } DisplayId ScreenRotationProperty::defaultDisplayId_ = 0; diff --git a/window_scene/session_manager/src/screen_scene_config.cpp b/window_scene/session_manager/src/screen_scene_config.cpp index 6b5ba55458..9d707dcd38 100644 --- a/window_scene/session_manager/src/screen_scene_config.cpp +++ b/window_scene/session_manager/src/screen_scene_config.cpp @@ -33,7 +33,7 @@ namespace OHOS::Rosen { namespace { -constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "ScreenSceneConfig"}; +constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DMS_SCREEN_SESSION_MANAGER, "ScreenSceneConfig"}; constexpr char IS_WATERFALL_DISPLAY[] = "isWaterfallDisplay"; constexpr char CURVED_SCREEN_BOUNDARY[] = "curvedScreenBoundary"; constexpr char CURVED_AREA_IN_LANDSCAPE[] = "waterfallAreaCompressionSizeWhenHorzontal"; diff --git a/window_scene/session_manager/src/screen_sensor_connector.cpp b/window_scene/session_manager/src/screen_sensor_connector.cpp index 487a5b94c8..bf5a44309f 100644 --- a/window_scene/session_manager/src/screen_sensor_connector.cpp +++ b/window_scene/session_manager/src/screen_sensor_connector.cpp @@ -21,7 +21,7 @@ namespace OHOS { namespace Rosen { namespace { - constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "ScreenSensorConnector"}; +constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DMS_SCREEN_SESSION_MANAGER, "ScreenSensorConnector"}; #ifdef WM_SUBSCRIBE_MOTION_ENABLE constexpr int32_t MOTION_ACTION_PORTRAIT = 0; constexpr int32_t MOTION_ACTION_LEFT_LANDSCAPE = 1; diff --git a/window_scene/session_manager/src/session_display_power_controller.cpp b/window_scene/session_manager/src/session_display_power_controller.cpp index 1622ae625e..9d9169e8d1 100644 --- a/window_scene/session_manager/src/session_display_power_controller.cpp +++ b/window_scene/session_manager/src/session_display_power_controller.cpp @@ -20,7 +20,8 @@ namespace OHOS { namespace Rosen { namespace { - constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "SessionDisplayPowerController"}; +constexpr HiviewDFX::HiLogLabel LABEL = { LOG_CORE, HILOG_DOMAIN_DMS_SCREEN_SESSION_MANAGER, + "SessionDisplayPowerController" }; } bool SessionDisplayPowerController::SuspendBegin(PowerStateChangeReason reason) diff --git a/window_scene/session_manager/src/session_manager.cpp b/window_scene/session_manager/src/session_manager.cpp index ffa4a86b9e..9bcdb9e193 100644 --- a/window_scene/session_manager/src/session_manager.cpp +++ b/window_scene/session_manager/src/session_manager.cpp @@ -24,7 +24,7 @@ namespace OHOS::Rosen { namespace { -constexpr HiviewDFX::HiLogLabel LABEL = { LOG_CORE, HILOG_DOMAIN_DISPLAY, "SessionManager" }; +constexpr HiviewDFX::HiLogLabel LABEL = { LOG_CORE, HILOG_DOMAIN_WINDOW, "SessionManager" }; } class SessionManagerServiceRecoverListener : public IRemoteStub { diff --git a/window_scene/session_manager/src/session_manager_lite.cpp b/window_scene/session_manager/src/session_manager_lite.cpp index 94c7c4ba35..2d291e474a 100644 --- a/window_scene/session_manager/src/session_manager_lite.cpp +++ b/window_scene/session_manager/src/session_manager_lite.cpp @@ -25,7 +25,7 @@ namespace OHOS::Rosen { namespace { -constexpr HiviewDFX::HiLogLabel LABEL = { LOG_CORE, HILOG_DOMAIN_DISPLAY, "SessionManagerLite" }; +constexpr HiviewDFX::HiLogLabel LABEL = { LOG_CORE, HILOG_DOMAIN_WINDOW, "SessionManagerLite" }; } class SessionManagerServiceLiteRecoverListener : public IRemoteStub { diff --git a/window_scene/session_manager/src/zidl/screen_session_manager_lite_proxy.cpp b/window_scene/session_manager/src/zidl/screen_session_manager_lite_proxy.cpp index fd4b7c93fa..8bae55664b 100644 --- a/window_scene/session_manager/src/zidl/screen_session_manager_lite_proxy.cpp +++ b/window_scene/session_manager/src/zidl/screen_session_manager_lite_proxy.cpp @@ -25,7 +25,8 @@ namespace OHOS::Rosen { namespace { -constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "ScreenSessionManagerLiteProxy"}; +constexpr HiviewDFX::HiLogLabel LABEL = { LOG_CORE, HILOG_DOMAIN_DMS_SCREEN_SESSION_MANAGER, + "ScreenSessionManagerLiteProxy" }; } DMError ScreenSessionManagerLiteProxy::RegisterDisplayManagerAgent( diff --git a/window_scene/session_manager/src/zidl/screen_session_manager_lite_stub.cpp b/window_scene/session_manager/src/zidl/screen_session_manager_lite_stub.cpp index cf948a044b..626286a906 100644 --- a/window_scene/session_manager/src/zidl/screen_session_manager_lite_stub.cpp +++ b/window_scene/session_manager/src/zidl/screen_session_manager_lite_stub.cpp @@ -22,7 +22,8 @@ namespace OHOS::Rosen { namespace { -constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "ScreenSessionManagerLiteStub"}; +constexpr HiviewDFX::HiLogLabel LABEL = { LOG_CORE, HILOG_DOMAIN_DMS_SCREEN_SESSION_MANAGER, + "ScreenSessionManagerLiteStub"} ; } int32_t ScreenSessionManagerLiteStub::OnRemoteRequest(uint32_t code, MessageParcel& data, MessageParcel& reply, diff --git a/window_scene/session_manager/src/zidl/screen_session_manager_proxy.cpp b/window_scene/session_manager/src/zidl/screen_session_manager_proxy.cpp index 19c827ddc4..cc2e33ded4 100644 --- a/window_scene/session_manager/src/zidl/screen_session_manager_proxy.cpp +++ b/window_scene/session_manager/src/zidl/screen_session_manager_proxy.cpp @@ -23,7 +23,8 @@ namespace OHOS::Rosen { namespace { -constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "ScreenSessionManagerProxy"}; +constexpr HiviewDFX::HiLogLabel LABEL = { LOG_CORE, HILOG_DOMAIN_DMS_SCREEN_SESSION_MANAGER, + "ScreenSessionManagerProxy" }; } sptr OHOS::Rosen::ScreenSessionManagerProxy::GetDefaultDisplayInfo() diff --git a/window_scene/session_manager/src/zidl/screen_session_manager_stub.cpp b/window_scene/session_manager/src/zidl/screen_session_manager_stub.cpp index 67151117a0..4c0c328117 100644 --- a/window_scene/session_manager/src/zidl/screen_session_manager_stub.cpp +++ b/window_scene/session_manager/src/zidl/screen_session_manager_stub.cpp @@ -24,7 +24,8 @@ namespace OHOS::Rosen { namespace { -constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, HILOG_DOMAIN_DISPLAY, "ScreenSessionManagerStub"}; +constexpr HiviewDFX::HiLogLabel LABEL = { LOG_CORE, HILOG_DOMAIN_DMS_SCREEN_SESSION_MANAGER, + "ScreenSessionManagerStub" }; const static uint32_t MAX_SCREEN_SIZE = 32; } -- Gitee