diff --git a/dm_lite/src/screen_manager_lite.cpp b/dm_lite/src/screen_manager_lite.cpp index fc695b43049dbabb99e7499b039d9d4f20209c4c..084f3e0f0dbcd2da347243c0809be3778f7ebe02 100644 --- a/dm_lite/src/screen_manager_lite.cpp +++ b/dm_lite/src/screen_manager_lite.cpp @@ -249,9 +249,11 @@ DMError ScreenManagerLite::Impl::RegisterScreenModeChangeManagerAgent() { DMError regSucc = DMError::DM_OK; if (screenModeChangeListenerAgent_ == nullptr) { + TLOGI(WmsLogTag::DMS, "HGC 001 [regis_lis] RegisterDisplayManagerAgent begin"); screenModeChangeListenerAgent_ = new ScreenManagerScreenModeChangeAgent(this); regSucc = SingletonContainer::Get().RegisterDisplayManagerAgent( screenModeChangeListenerAgent_, DisplayManagerAgentType::SCREEN_MODE_CHANGE_EVENT_LISTENER); + TLOGI(WmsLogTag::DMS, "HGC 002 [regis_lis] RegisterDisplayManagerAgent end"); if (regSucc != DMError::DM_OK) { screenModeChangeListenerAgent_ = nullptr; TLOGW(WmsLogTag::DMS, "RegisterDisplayManagerAgent failed !"); @@ -282,9 +284,10 @@ DMError ScreenManagerLite::Impl::RegisterScreenModeChangeListener(sptr> screenInfos; + TLOGI(WmsLogTag::DMS, "HGC 003 [regis_lis] GetPhysicalScreenInfos begin"); DMError ret = GetPhysicalScreenInfos(screenInfos); if (ret == DMError::DM_OK) { - TLOGI(WmsLogTag::DMS, "RegisterScreenListener notify"); + TLOGI(WmsLogTag::DMS, "HGC 004 [regis_lis] RegisterScreenListener notify"); listener->NotifyScreenModeChange(screenInfos); } return regSucc; diff --git a/utils/src/sys_cap_util.cpp b/utils/src/sys_cap_util.cpp index 94b14ee641634dd7d6d4cb6100462dac332ae08f..2cf46c6f3466c7c65023b5200aa3f98d63947015 100644 --- a/utils/src/sys_cap_util.cpp +++ b/utils/src/sys_cap_util.cpp @@ -51,8 +51,10 @@ std::string SysCapUtil::GetClientName() std::string SysCapUtil::GetBundleName() { + TLOGI(WmsLogTag::DMS, "HGC 005[regis_lis] GetSystemAbilityManager enter"); OHOS::sptr systemAbilityManager = OHOS::SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); + TLOGI(WmsLogTag::DMS, "HGC 006 [regis_lis] GetSystem BMS Ability enter"); OHOS::sptr remoteObject = systemAbilityManager->GetSystemAbility(BUNDLE_MGR_SERVICE_SYS_ABILITY_ID); sptr iBundleMgr = OHOS::iface_cast(remoteObject); @@ -74,8 +76,10 @@ std::string SysCapUtil::GetBundleName() uint32_t SysCapUtil::GetApiCompatibleVersion() { uint32_t apiCompatibleVersion = 0; + TLOGI(WmsLogTag::DMS, "[regis_lis] GetSystemAbilityManager enter"); OHOS::sptr systemAbilityManager = OHOS::SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); + TLOGI(WmsLogTag::DMS, "[regis_lis] GetSystem BMS Ability enter"); OHOS::sptr remoteObject = systemAbilityManager->GetSystemAbility(BUNDLE_MGR_SERVICE_SYS_ABILITY_ID); sptr iBundleMgr = OHOS::iface_cast(remoteObject); diff --git a/window_scene/screen_session_manager/src/screen_session_manager.cpp b/window_scene/screen_session_manager/src/screen_session_manager.cpp index 7ad286ec411b3362d58cf84e9e7b4bde96708892..90737bb2271204f3db6b9565db1e9a8768b81059 100644 --- a/window_scene/screen_session_manager/src/screen_session_manager.cpp +++ b/window_scene/screen_session_manager/src/screen_session_manager.cpp @@ -1119,8 +1119,10 @@ void ScreenSessionManager::NotifyScreenModeChange(ScreenId disconnectedScreenId) return; } std::vector> screenInfos; + TLOGI(WmsLogTag::DMS, "[regis_lis] GetAllScreenInfos begin"); std::vector screenIds = GetAllScreenIds(); for (auto screenId : screenIds) { + TLOGI(WmsLogTag::DMS, "[regis_lis] GetScreenInfoById begin"); if (disconnectedScreenId == screenId) { continue; } @@ -1234,6 +1236,7 @@ void ScreenSessionManager::SetMultiScreenDefaultRelativePosition() sptr extendSession = nullptr; { std::lock_guard lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); for (auto sessionIt : screenSessionMap_) { auto screenSession = sessionIt.second; if (screenSession == nullptr) { @@ -1426,6 +1429,7 @@ int32_t ScreenSessionManager::GetCurrentInUseScreenNumber() { int32_t inUseScreenNumber_ = 0; std::lock_guard lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); for (auto sessionIt : screenSessionMap_) { auto screenSession = sessionIt.second; if (screenSession == nullptr) { @@ -1465,6 +1469,7 @@ void ScreenSessionManager::SetCastPrivacyFromSettingData() bool isOK = ScreenSettingHelper::GetSettingCast(enable); TLOGI(WmsLogTag::DMS, "get setting cast done, isOK: %{public}u, enable: %{public}u", isOK, enable); std::lock_guard lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); for (const auto& sessionIt : screenSessionMap_) { auto screenSession = sessionIt.second; if (screenSession == nullptr) { @@ -1498,6 +1503,7 @@ void ScreenSessionManager::UnregisterSettingWireCastObserver(ScreenId screenId) } { std::lock_guard lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); for (const auto& sessionIt : screenSessionMap_) { auto screenSession = sessionIt.second; if (screenSession == nullptr) { @@ -1768,10 +1774,12 @@ void ScreenSessionManager::HandleMapWhenScreenDisconnect(ScreenId screenId) } } std::lock_guard lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); screenSessionMap_.erase(smsId); } { std::lock_guard lock(physicalScreenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); physicalScreenSessionMap_.erase(screenId); } } @@ -1901,6 +1909,7 @@ void ScreenSessionManager::OnHgmRefreshRateChange(uint32_t refreshRate) std::map> screenSessionMap; { std::lock_guard lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); screenSessionMap = screenSessionMap_; } for (const auto &sessionItem : screenSessionMap) { @@ -1959,6 +1968,7 @@ void ScreenSessionManager::SetMultiScreenFrameControl(void) uint32_t count = 0; { std::lock_guard lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); for (auto sessionIt : screenSessionMap_) { if (IsPhysicalScreenAndInUse(sessionIt.second)) { count++; @@ -1980,6 +1990,8 @@ void ScreenSessionManager::SetMultiScreenFrameControl(void) sptr ScreenSessionManager::GetScreenSession(ScreenId screenId) const { std::lock_guard lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); + TLOGI(WmsLogTag::DMS, "[regis_lis] GetScreenSession begin"); if (screenSessionMap_.empty()) { screenEventTracker_.LogWarningAllInfos(); } @@ -2071,6 +2083,7 @@ sptr ScreenSessionManager::GetDisplayInfoById(DisplayId displayId) { TLOGD(WmsLogTag::DMS, "enter, displayId: %{public}" PRIu64" ", displayId); std::lock_guard lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); for (auto sessionIt : screenSessionMap_) { auto screenSession = sessionIt.second; if (screenSession == nullptr) { @@ -2119,6 +2132,7 @@ sptr ScreenSessionManager::GetVisibleAreaDisplayInfoById(DisplayId { TLOGD(WmsLogTag::DMS, "enter, displayId: %{public}" PRIu64" ", displayId); std::lock_guard lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); for (auto sessionIt : screenSessionMap_) { auto screenSession = sessionIt.second; if (screenSession == nullptr) { @@ -2172,6 +2186,7 @@ sptr ScreenSessionManager::GetDisplayInfoByScreen(ScreenId screenId { TLOGD(WmsLogTag::DMS, "enter, screenId: %{public}" PRIu64"", screenId); std::lock_guard lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); for (auto sessionIt : screenSessionMap_) { auto screenSession = sessionIt.second; if (screenSession == nullptr) { @@ -2222,13 +2237,16 @@ std::vector ScreenSessionManager::GetAllDisplayIds() } DisplayId displayId = screenSession->GetDisplayId(); res.push_back(displayId); + TLOGI(WmsLogTag::DMS, "[regis_lis] ConvertToDisplayInfo end"); if (!FoldScreenStateInternel::IsSuperFoldDisplayDevice()) { continue; } if (!screenSession->GetScreenProperty().GetIsFakeInUse()) { continue; } + TLOGI(WmsLogTag::DMS, "[regis_lis] GetFakeDisplayId enter"); DisplayId fakeDisplayId = GetFakeDisplayId(screenSession); + TLOGI(WmsLogTag::DMS, "[regis_lis] GetFakeDisplayId end"); if (fakeDisplayId == DISPLAY_ID_FAKE) { res.push_back(fakeDisplayId); TLOGI(WmsLogTag::DMS, "add fakeDisplayId: %{public}" PRIu64 "", fakeDisplayId); @@ -3239,6 +3257,7 @@ sptr ScreenSessionManager::GetOrCreateScreenSession(ScreenId scre session->groupSmsId_ = 1; { std::lock_guard lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); screenSessionMap_[smsScreenId] = session; } if (g_isPcDevice) { @@ -3461,6 +3480,7 @@ ScreenId ScreenSessionManager::GetInternalScreenId() { ScreenId screenId = SCREEN_ID_INVALID; std::lock_guard lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); for (auto sessionIt : screenSessionMap_) { auto screenSession = sessionIt.second; if (screenSession == nullptr) { @@ -3479,6 +3499,7 @@ ScreenId ScreenSessionManager::GetInternalScreenId() sptr ScreenSessionManager::GetInternalScreenSession() { std::lock_guard lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); for (auto sessionIt : screenSessionMap_) { sptr screenSession = sessionIt.second; if (screenSession == nullptr) { @@ -3497,6 +3518,7 @@ void ScreenSessionManager::GetInternalAndExternalSession(sptr& in sptr& externalSession) { std::lock_guard lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); for (auto sessionIt : screenSessionMap_) { auto screenSession = sessionIt.second; if (screenSession == nullptr) { @@ -4373,6 +4395,7 @@ std::vector ScreenSessionManager::GetAllScreenIds() { std::vector res; std::lock_guard lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); for (const auto& iter : screenSessionMap_) { res.emplace_back(iter.first); } @@ -4838,6 +4861,7 @@ int ScreenSessionManager::NotifyPowerEventForDualDisplay(DisplayPowerEvent event PowerStateChangeReason reason) { std::lock_guard lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); if (screenSessionMap_.empty()) { TLOGE(WmsLogTag::DMS, "[UL_POWER]screenSessionMap is empty"); return NOTIFY_EVENT_FOR_DUAL_FAILED; @@ -4932,6 +4956,7 @@ std::vector ScreenSessionManager::GetAllScreenIds() const { std::vector res; std::lock_guard lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); for (const auto& iter : screenSessionMap_) { res.emplace_back(iter.first); } @@ -5180,6 +5205,7 @@ ScreenId ScreenSessionManager::CreateVirtualScreen(VirtualScreenOption option, screenSession->SetSecurity(option.isSecurity_); { std::lock_guard lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); screenSessionMap_.insert(std::make_pair(smsScreenId, screenSession)); } screenSession->SetVirtualScreenFlag(option.virtualScreenFlag_); @@ -5413,6 +5439,7 @@ DMError ScreenSessionManager::DestroyVirtualScreen(ScreenId screenId) NotifyDisplayDestroy(screenId); { std::lock_guard lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); auto screenGroup = RemoveFromGroupLocked(screen); if (screenGroup != nullptr) { NotifyScreenGroupChanged(screen->ConvertToScreenInfo(), ScreenGroupChangeEvent::REMOVE_FROM_GROUP); @@ -5773,6 +5800,7 @@ DMError ScreenSessionManager::VirtualScreenUniqueSwitch(const std::vectorgroupSmsId_ = 1; { std::lock_guard lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); auto iter = smsScreenGroupMap_.find(defaultScreen->groupSmsId_); if (iter != smsScreenGroupMap_.end()) { smsScreenGroupMap_.erase(iter); @@ -6151,6 +6179,7 @@ bool ScreenSessionManager::InitAbstractScreenModesInfo(sptr& scre sptr ScreenSessionManager::InitAndGetScreen(ScreenId rsScreenId) { std::lock_guard lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); ScreenId smsScreenId = screenIdManager_.CreateAndGetNewScreenId(rsScreenId); RSScreenCapability screenCapability = rsInterface_.GetScreenCapability(rsScreenId); TLOGI(WmsLogTag::DMS, "Screen name is %{public}s, phyWidth is %{public}u, phyHeight is %{public}u", @@ -6183,6 +6212,7 @@ bool ScreenSessionManager::IsExtendMode() std::vector mainVector; std::vector extendVector; std::lock_guard lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); for (const auto& pair : screenSessionMap_) { sptr session = pair.second; if (!session) { @@ -6213,6 +6243,7 @@ bool ScreenSessionManager::IsExtendMode() sptr ScreenSessionManager::AddToGroupLocked(sptr newScreen, bool isUnique) { std::lock_guard lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); sptr res; if (smsScreenGroupMap_.empty()) { TLOGI(WmsLogTag::DMS, "connect the first screen"); @@ -6260,6 +6291,7 @@ sptr ScreenSessionManager::AddAsFirstScreenLocked(sptr lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); auto iter = smsScreenGroupMap_.find(smsGroupScreenId); if (iter != smsScreenGroupMap_.end()) { TLOGE(WmsLogTag::DMS, "group screen existed. id=%{public}" PRIu64"", smsGroupScreenId); @@ -6277,6 +6309,7 @@ sptr ScreenSessionManager::AddAsSuccedentScreenLocked(sptr lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); auto iter = screenSessionMap_.find(defaultScreenId); if (iter == screenSessionMap_.end()) { TLOGE(WmsLogTag::DMS, "defaultScreenId:%{public}" PRIu64" is not in screenSessionMap_.", @@ -6329,6 +6362,7 @@ bool ScreenSessionManager::RemoveChildFromGroup(sptr screen, sptr if (screenGroup->GetChildCount() == 0) { // Group removed, need to do something. std::lock_guard lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); smsScreenGroupMap_.erase(screenGroup->screenId_); screenSessionMap_.erase(screenGroup->screenId_); TLOGE(WmsLogTag::DMS, "screenSessionMap_ remove screen:%{public}" PRIu64, screenGroup->screenId_); @@ -6371,6 +6405,7 @@ DMError ScreenSessionManager::SetMirror(ScreenId screenId, std::vector sptr ScreenSessionManager::GetAbstractScreenGroup(ScreenId smsScreenId) { std::lock_guard lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); auto iter = smsScreenGroupMap_.find(smsScreenId); if (iter == smsScreenGroupMap_.end()) { TLOGE(WmsLogTag::DMS, "did not find screen:%{public}" PRIu64"", smsScreenId); @@ -6386,6 +6421,7 @@ bool ScreenSessionManager::CheckScreenInScreenGroup(sptr screen) return false; } std::lock_guard lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); auto groupSmsId = screen->groupSmsId_; auto iter = smsScreenGroupMap_.find(groupSmsId); if (iter == smsScreenGroupMap_.end()) { @@ -6607,6 +6643,7 @@ std::shared_ptr ScreenSessionManager::GetDisplayNodeByDisplayId(D { std::shared_ptr displayNode = nullptr; std::lock_guard lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); for (auto sessionIt : screenSessionMap_) { auto screenSession = sessionIt.second; if (screenSession == nullptr) { @@ -7008,6 +7045,7 @@ std::vector ScreenSessionManager::GetAllValidScreenIds(const std::vect continue; } std::lock_guard lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); auto iter = screenSessionMap_.find(screenId); if (iter != screenSessionMap_.end() && iter->second != nullptr && iter->second->GetScreenProperty().GetScreenType() != ScreenType::UNDEFINED) { @@ -7404,6 +7442,7 @@ void ScreenSessionManager::DumpAllScreensInfo(std::string& dumpInfo) << "RequestOrientation NodeId " << std::endl; std::lock_guard lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); for (auto sessionIt : screenSessionMap_) { auto screenSession = sessionIt.second; if (screenSession == nullptr) { @@ -7929,6 +7968,7 @@ bool ScreenSessionManager::IsMultiScreenCollaboration() bool ScreenSessionManager::HasCastEngineOrPhyMirror(const std::vector& screenIdsToExclude) { std::lock_guard lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); for (auto sessionItem : screenSessionMap_) { auto screenId = sessionItem.first; auto screenSession = sessionItem.second; @@ -7999,6 +8039,7 @@ float ScreenSessionManager::GetSuperRotation() } { std::lock_guard lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); for (auto sessionIt : screenSessionMap_) { auto screenSession = sessionIt.second; if (screenSession == nullptr) { @@ -8770,6 +8811,7 @@ void ScreenSessionManager::RecoverMultiScreenModeWhenSwitchUser(std::vector> screenSessionMap; { std::lock_guard lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); screenSessionMap = screenSessionMap_; } for (const auto& [screenId, screenSession] : screenSessionMap) { @@ -8845,6 +8887,7 @@ void ScreenSessionManager::SwitchModeHandleExternalScreen(bool isSwitchToPcMode) bool hasExternalScreen = false; { std::lock_guard lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); for (const auto& iter : screenSessionMap_) { auto screenSession = iter.second; if (screenSession == nullptr) { @@ -9038,6 +9081,7 @@ void ScreenSessionManager::NotifyCastWhenSwitchScbNode() std::map> screenSessionMapCopy; { std::lock_guard lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); screenSessionMapCopy = screenSessionMap_; } for (const auto& sessionIt : screenSessionMapCopy) { @@ -9095,6 +9139,7 @@ void ScreenSessionManager::SetClientInner(int32_t newUserId, const sptr lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); DisplayId targetDisplay = GetUserDisplayId(newUserId); bool isSuperFoldDeviceBootUp = FoldScreenStateInternel::IsSuperFoldDisplayDevice() && firstSCBConnect_; for (auto iter : screenSessionMap_) { @@ -10437,6 +10482,7 @@ void ScreenSessionManager::OperateModeChange(ScreenId mainScreenId, ScreenId sec { { std::lock_guard lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); for (auto sessionIt : screenSessionMap_) { auto screenSession = sessionIt.second; if (screenSession == nullptr) { @@ -10457,6 +10503,7 @@ void ScreenSessionManager::OperateModeChange(ScreenId mainScreenId, ScreenId sec } if (operateMode == "off" || operateMode == "on") { std::lock_guard lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); for (auto sessionIt : screenSessionMap_) { auto screenSession = sessionIt.second; if (screenSession == nullptr) { @@ -10665,6 +10712,7 @@ sptr ScreenSessionManager::GetPrimaryDisplayInfo() sptr screenSession = nullptr; { std::lock_guard lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); for (auto sessionIt : screenSessionMap_) { sptr session = sessionIt.second; if (session == nullptr) { @@ -11108,6 +11156,7 @@ sptr ScreenSessionManager::GetOrCreatePhysicalScreenSession(Scree session->groupSmsId_ = 1; { std::lock_guard lock(physicalScreenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); physicalScreenSessionMap_[screenId] = session; } SetHdrFormats(screenId, session); @@ -11120,6 +11169,7 @@ sptr ScreenSessionManager::GetOrCreatePhysicalScreenSession(Scree sptr ScreenSessionManager::GetScreenSessionByRsId(ScreenId rsScreenId) { std::lock_guard lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); for (auto sessionIt : screenSessionMap_) { sptr screenSession = sessionIt.second; if (screenSession == nullptr) { @@ -11138,12 +11188,14 @@ sptr ScreenSessionManager::GetPhysicalScreenSession(ScreenId scre { { std::lock_guard lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); if (screenSessionMap_.empty()) { screenEventTracker_.LogWarningAllInfos(); } } std::lock_guard lock(physicalScreenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); auto iter = physicalScreenSessionMap_.find(screenId); if (iter == physicalScreenSessionMap_.end()) { TLOGW(WmsLogTag::DMS, "not found screen id: %{public}" PRIu64, screenId); @@ -11166,6 +11218,7 @@ void ScreenSessionManager::NotifyExtendScreenCreateFinish() sptr extendScreen = nullptr; { std::lock_guard lock(screenSessionMapMutex_); + TLOGI(WmsLogTag::DMS, "[lock_map] enter"); for (auto sessionIt : screenSessionMap_) { auto screenSession = sessionIt.second; if (screenSession == nullptr) { diff --git a/window_scene/session/screen/src/screen_session.cpp b/window_scene/session/screen/src/screen_session.cpp index 6873db100d031da14d913643293566cfd37db257..65561f891a2835fa8dc014c9dd2bc624c072ba37 100644 --- a/window_scene/session/screen/src/screen_session.cpp +++ b/window_scene/session/screen/src/screen_session.cpp @@ -413,7 +413,9 @@ sptr ScreenSession::ConvertToRealDisplayInfo() displayInfo->SetXDpi(property_.GetXDpi()); displayInfo->SetYDpi(property_.GetYDpi()); displayInfo->SetDpi(property_.GetVirtualPixelRatio() * DOT_PER_INCH); + TLOGI(WmsLogTag::DMS, "[regis_lis] GetApiVersion enter"); int32_t apiVersion = GetApiVersion(); + TLOGI(WmsLogTag::DMS, "[regis_lis] GetApiVersion end"); if (apiVersion >= 14 || apiVersion == 0) { // 14 is API version displayInfo->SetRotation(property_.GetDeviceRotation()); displayInfo->SetDisplayOrientation(property_.GetDeviceOrientation()); @@ -2475,6 +2477,7 @@ int32_t ScreenSession::GetApiVersion() apiVersion = g_uidVersionMap.Get(currentPid); } if (apiVersion == NO_EXIST_UID_VERSION) { + TLOGI(WmsLogTag::DMS, "[regis_lis] GetApiCompatibleVersion enter"); apiVersion = static_cast(SysCapUtil::GetApiCompatibleVersion()); TLOGI(WmsLogTag::DMS, "IPC get"); g_uidVersionMap.Set(currentPid, apiVersion);