diff --git a/dm/src/display.cpp b/dm/src/display.cpp index e154bbf7300405550dcfdb56e139e11e3786d2bd..86f9401cf827ed02b3ce5734fb5d3c592002e1cc 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 5ce8c46d3c60a68f734beecab0f8dd01bdd49169..346534714d42c4595be9dbbcf14d3ae83d741341 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 26a0220d064fd7c6410262270d6a69a553820bd2..483641b671f40d8138dd3ad9653a35584bad0064 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 2277d5bfcacc6df778e0fea8548aaba8ea899881..ceeb05213073693e7cf7d3a65ebdda9e6c686ede 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 93dd8d0d116726ef160d42f3f39e784d8633c49b..704f42b2d89b37d1c43fc04a6df24b2971f3b606 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 90446dec5db18539b6f760ce08ca9ec8a7ba28bc..1e7bda2487775bb792f1dfbeeaa7cf287520debd 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 acb4cab5f779f57d015c77e1ed5637df9084d415..4a21cd39611974695fa51c507ace7c8a2ae7575a 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 7a493661f4ba80513e933edcfaa513e9a4ffa380..a9fd5c9c1be88109768487d713950bb78f94f9f2 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 b9c04ab80b4c85f40a4e95d8bd0c19ba72c31735..57e048f9b9ca1d2d9cd51fc43b4ca333f711cfa7 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 b3a18dd441477e3a669fd57cb0abd0638012755f..dcfc4d9025f1350273661978f43cdfcf5b30b1b3 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 94cf4b335ecceb56b8f0212c7b7eaa0fc87200e7..33ae03d6af1bc02783fc3a749f57ec8ad8ac1a2e 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 4134aa3a5bd0e96708a901fb243d567bf4833b29..3d86de735ad0cbbe081c871dfe64166c6c332752 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 791c4a4fd83b9abd163f1758bbe3b2ada974d4f5..344c1f996968a93b262b735cc645b6088ea1eaf5 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 123595a7b0c672cfa4f5be045d7e668c62cc133e..909bce642722b676a7e5b9e8f8a7c2456f93d72a 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 5ea59e9514ab53b6784124722dcc145203b96c2d..4b29e22b0a3acdca6ec8388ad20ae0ff2c869761 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 bc134c8d2a1c1469d67453f337c864775209b7c3..e1d7d21bab8ab7b85c437ff21a11aebab0b18789 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 4ad3562d8d4c71cc59a5c63921114809890a381b..f62c485dc65d36235fd4e0692db1e180ce8c8067 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 2683deae317aeff7ede240fed04b196188b70356..2eaba8a219d2ea175c94fe92e9079c6442efe402 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 8e71461ca99bf3a4bb4bb9c6d1192c6b43a7ceba..b919e5715c52d59a4dc613af2e0b27510da0c08c 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 30afb6c54bca4c6a8cdb12a859fa62564d3013a0..1e739272a79fecb62e5306d0c53acfdda564785d 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 e214d4733fb440dcc9bd2358705cd4075fd17407..55340bde0ee845097396fbd14e9b1c7436aff26b 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 eca5892b5d6320f3c251627a43feafef890d412f..588f73bb53602470335222ea2b04ddea74d74a10 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 2946bad1b2854b8ad9df7d766327b8bec83a9e8f..73f6aa461a2558ecf77487e8b78ce28d8a957808 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 a60d5f3fbcedb9c2d3535982410d534d3e0019ab..dee29cf1fe1169f4c6a18a365adffd6a8a95c668 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 470de4ceb589f197b2e16ca0b506e44cdc239744..2776bb1676f86c9bb36cc4cc21935ecd71b54779 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 129bf75fed57d36c31927bcb1d751e405b173d49..09db23add79714767f84cd2fc6bfc8c66822d117 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 11b51987a20acddc5f70008aab13044815c9919c..db7ae3946e10219259f5eca99933c0fff69f88f4 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 32f8f653dd4cb7a613d2fd2d0e444961d4ae8bf2..e0bcbbf8bcbdc8a5ce3e108874fd76ebfe80edda 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 e661b04d4b210e92ea20428930965db3d374392e..698520720e1b4f55706384800f6b83b29651e845 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 27923222e78e58b5aaf3c86fdb819adbdf8d989f..163cde95d95230a0592419fb65fe7611cfd63607 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 cb28a6976c58531415369c0f773a4f0eeec53cd3..d29078ea6bd9fda5a06ad31020f559cb1a927579 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 6e3c6385c58e8d9a312988ce763989a170b314fe..591713ffd3f0136f2fa96889777c47687562d7f7 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 5d849c8e7067a27655a2eeb81ec086bf74ebaec7..68ae3e0864bbaba7fc84e3dc1b31c37aa3e40be1 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 8db4eb108e615cc45d01ac5400e7e6b1f98c7933..3d9d4626b28682b52d9d9ba7712cdc81c2c1d78d 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 f9ce22332773339d55e7602ccfdf5fa5e3e3b63c..2331d0e2c7343cd47298b79fe0dd571084acd148 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 cdce847a8ca45fe4ea80efec0b9119af1e9e4c2f..024e6660c18d246b068cf9ccb1446a7d62abd01e 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 e2fcebdcb8b158e34dacdaa9ebd86846a670fc1c..8d34c73bbbb261296e279d9af7cb1ae8643eabcc 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 920d800160b2db724bcf5fb7c3f75ad2dd11afad..a06c08d2f02f1507c6ed77fcbdcfb3216c6e4b3c 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 aab6e3296bc980bbc49ac6fed75d3e1bc8b980d4..7313f339045c7fe91071137f1401829b609976ce 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 6b5ba55458b262c085ea5e2cc7431c92d3cf1e41..9d707dcd3844e5225f8bcf70f8b7087e34d491ca 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 487a5b94c86f0ea7464dd173e4a70794990b938f..bf5a44309f51eba0a71a37424e80a2d11d2b4552 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 1622ae625e25359b9690b02707606536345a4708..9d9169e8d10bbfcd9d41ca55e7fa422b6f513b83 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 ffa4a86b9eff784d8b1e73803d1070a1e09f0e9e..9bcdb9e19350fbd281d63f9d76bb5e57d245f13f 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 94c7c4ba35f9a2d5633c4f04d7c0036efd8cdfb7..2d291e474a138f0cc2fe86bac861bf55a6c5ebfa 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 fd4b7c93faa3d9870bbace37f960f3be42a4d277..8bae55664b785dcf32b0bfb6cd6f5d3debb8113c 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 cf948a044b569b97e9317e027fcd299f8d9a7bef..626286a90694d8817a3ce66adcd4ab89ce7a5173 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 19c827ddc4caf24c5f466115581ae7721a22c7da..cc2e33ded4cc12e27e0016e3bd97fda300fc2c1a 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 67151117a0860d5221e9e3ac0a9ddf95a09a0a37..4c0c328117d961229f2174ea93abaf812b830448 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; }