openharmony/distributedhardware_distributed_input
1
0
Fork 0
mirror of https://github.com/openharmony/distributedhardware_distributed_input.git synced 2026-07-20 21:41:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

resolve cppcheck and oversize function

Browse Source 
Signed-off-by: l30054665 <lishang21@huawei.com>
This commit is contained in:
l30054665
2023-12-06 15:05:14 +08:00
parent d07449c4c4
commit 7fc6f8f3e9
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/source/sourcemanager/src/distributed_input_source_manager.cpp
+2 -2
View File
@@ -1314,13 +1314,13 @@ void DistributedInputSourceManager::RunRelayUnprepareCallback(const std::string
void DistributedInputSourceManager::RunUnprepareCallback(const std::string &devId, const int32_t &status)
{
FinishAsyncTrace(DINPUT_HITRACE_LABEL, DINPUT_UNPREPARE_START, DINPUT_UNPREPARE_TASK);
std::lock_guard<std::mutex> lock(prepareMutex_);
std::lock_guard<std::mutex> prepareLock(prepareMutex_);
for (auto iter = unpreCallbacks_.begin(); iter != unpreCallbacks_.end(); ++iter) {
if (iter->devId == devId) {
DHLOGI("ProcessEvent DINPUT_SOURCE_MANAGER_UNPREPARE_MSG");
iter->unpreCallback->OnResult(devId, status);
unpreCallbacks_.erase(iter);
std::lock_guard<std::mutex> lock(whiteListMutex_);
std::lock_guard<std::mutex> whiteListLock(whiteListMutex_);
if (delWhiteListCallbacks_.size() == 0) {
DHLOGE("ProcessEvent DINPUT_SOURCE_MANAGER_UNPREPARE_MSG delWhiteListCallback is null.");
return;
services/transportbase/include/distributed_input_transport_base.h
+1
View File
@@ -67,6 +67,7 @@ public:
private:
DistributedInputTransportBase() = default;
~DistributedInputTransportBase();
void OnSessionOpenedError(int32_t sessionId, int32_t result);
int32_t CheckDeviceSessionState(const std::string &remoteDevId);
bool CheckRecivedData(const std::string &message);
void HandleSession(int32_t sessionId, const std::string &message);
services/transportbase/src/distributed_input_transport_base.cpp
+13 -7
View File
@@ -325,13 +325,7 @@ int32_t DistributedInputTransportBase::OnSessionOpened(int32_t sessionId, int32_
DHLOGI("OnSessionOpened, sessionId: %d, result: %d", sessionId, result);
FinishAsyncTrace(DINPUT_HITRACE_LABEL, DINPUT_OPEN_SESSION_START, DINPUT_OPEN_SESSION_TASK);
if (result != DH_SUCCESS) {
std::string deviceId = GetDevIdBySessionId(sessionId);
DHLOGE("session open failed, sessionId: %d, result:%d, deviceId:%s", sessionId, result,
GetAnonyString(deviceId).c_str());
std::unique_lock<std::mutex> sessionLock(operationMutex_);
if (CountSession(deviceId) > 0) {
EraseSessionId(deviceId);
}
OnSessionOpenedError(sessionId, result);
return DH_SUCCESS;
}
@@ -377,6 +371,18 @@ int32_t DistributedInputTransportBase::OnSessionOpened(int32_t sessionId, int32_
return DH_SUCCESS;
}
void DistributedInputTransportBase::OnSessionOpenedError(int32_t sessionId, int32_t result)
{
std::string deviceId = GetDevIdBySessionId(sessionId);
DHLOGE("session open failed, sessionId: %d, result:%d, deviceId:%s", sessionId, result,
GetAnonyString(deviceId).c_str());
std::unique_lock<std::mutex> sessionLock(operationMutex_);
if (CountSession(deviceId) > 0) {
EraseSessionId(deviceId);
}
return;
}
void DistributedInputTransportBase::OnSessionClosed(int32_t sessionId)
{
DHLOGI("OnSessionClosed, sessionId: %d", sessionId);