From 5214c8477de43b16c58ec39bac252c90ff24cc8f Mon Sep 17 00:00:00 2001 From: l30054665 Date: Mon, 8 Jan 2024 16:52:49 +0800 Subject: [PATCH] delete callrepeat verifying Signed-off-by: l30054665 --- .../src/distributed_input_source_manager.cpp | 87 ------------------- 1 file changed, 87 deletions(-) diff --git a/services/source/sourcemanager/src/distributed_input_source_manager.cpp b/services/source/sourcemanager/src/distributed_input_source_manager.cpp index d3df093..6db7d82 100644 --- a/services/source/sourcemanager/src/distributed_input_source_manager.cpp +++ b/services/source/sourcemanager/src/distributed_input_source_manager.cpp @@ -637,15 +637,6 @@ int32_t DistributedInputSourceManager::StartRemoteInput(const std::string &srcId if (srcId != localNetworkId) { return RelayStartRemoteInputByType(srcId, sinkId, inputTypes, callback); } - for (auto iter : staCallbacks_) { - if (iter.devId == sinkId && iter.inputTypes == inputTypes) { - DHLOGE("StartRemoteInput called, repeat call."); - HisyseventUtil::GetInstance().SysEventWriteFault(DINPUT_OPT_FAIL, sinkId, - ERR_DH_INPUT_SERVER_SOURCE_MANAGER_START_FAIL, "Dinput start use failed in already started."); - FinishAsyncTrace(DINPUT_HITRACE_LABEL, DINPUT_START_START, DINPUT_START_TASK); - return ERR_DH_INPUT_SERVER_SOURCE_MANAGER_START_FAIL; - } - } DInputClientStartInfo info {sinkId, inputTypes, callback}; staCallbacks_.push_back(info); @@ -690,15 +681,6 @@ int32_t DistributedInputSourceManager::StopRemoteInput(const std::string &srcId, if (srcId != localNetworkId) { return RelayStopRemoteInputByType(srcId, sinkId, inputTypes, callback); } - for (auto iter : stpCallbacks_) { - if (iter.devId == sinkId && iter.inputTypes == inputTypes) { - DHLOGE("StopRemoteInput called, repeat call."); - HisyseventUtil::GetInstance().SysEventWriteFault(DINPUT_OPT_FAIL, sinkId, - ERR_DH_INPUT_SERVER_SOURCE_MANAGER_STOP_FAIL, "Dinput stop use failed in already stoped."); - FinishAsyncTrace(DINPUT_HITRACE_LABEL, DINPUT_STOP_START, DINPUT_STOP_TASK); - return ERR_DH_INPUT_SERVER_SOURCE_MANAGER_STOP_FAIL; - } - } DInputClientStopInfo info {sinkId, inputTypes, callback}; stpCallbacks_.push_back(info); @@ -722,14 +704,6 @@ int32_t DistributedInputSourceManager::StopRemoteInput(const std::string &srcId, int32_t DistributedInputSourceManager::RelayStartRemoteInputByType(const std::string &srcId, const std::string &sinkId, const uint32_t &inputTypes, sptr callback) { - std::lock_guard lock(startStopMutex_); - for (auto iter : relayStaTypeCallbacks_) { - if (iter.srcId == srcId && iter.sinkId == sinkId && iter.inputTypes == inputTypes) { - DHLOGE("Repeat call."); - return ERR_DH_INPUT_SERVER_SOURCE_MANAGER_START_FAIL; - } - } - DInputClientStartTypeInfo info(srcId, sinkId, inputTypes, callback); relayStaTypeCallbacks_.push_back(info); @@ -751,14 +725,6 @@ int32_t DistributedInputSourceManager::RelayStartRemoteInputByType(const std::st int32_t DistributedInputSourceManager::RelayStopRemoteInputByType( const std::string &srcId, const std::string &sinkId, const uint32_t &inputTypes, sptr callback) { - std::lock_guard lock(startStopMutex_); - for (auto iter : relayStpTypeCallbacks_) { - if (iter.srcId == srcId && iter.sinkId == sinkId && iter.inputTypes == inputTypes) { - DHLOGE("Repeat call."); - return ERR_DH_INPUT_SERVER_SOURCE_MANAGER_STOP_FAIL; - } - } - DInputClientStopTypeInfo info(srcId, sinkId, inputTypes, callback); relayStpTypeCallbacks_.push_back(info); @@ -882,16 +848,6 @@ int32_t DistributedInputSourceManager::StartRemoteInput(const std::string &sinkI } // current device is source device - for (auto iter : staStringCallbacks_) { - if (iter.sinkId == sinkId && IsStringDataSame(iter.dhIds, dhIds)) { - HisyseventUtil::GetInstance().SysEventWriteFault(DINPUT_OPT_FAIL, sinkId, - ERR_DH_INPUT_SERVER_SOURCE_MANAGER_START_FAIL, "dinput start use failed in already started"); - FinishAsyncTrace(DINPUT_HITRACE_LABEL, DINPUT_START_START, DINPUT_START_TASK); - DHLOGE("sinkId: %s, repeat call.", GetAnonyString(sinkId).c_str()); - return ERR_DH_INPUT_SERVER_SOURCE_MANAGER_START_FAIL; - } - } - DInputClientStartDhidInfo info {localNetworkId, sinkId, dhIds, callback}; staStringCallbacks_.push_back(info); DeviceMap_[sinkId] = DINPUT_SOURCE_SWITCH_OFF; // when sink device start success,set DINPUT_SOURCE_SWITCH_ON @@ -931,15 +887,6 @@ int32_t DistributedInputSourceManager::StopRemoteInput(const std::string &sinkId FinishAsyncTrace(DINPUT_HITRACE_LABEL, DINPUT_STOP_START, DINPUT_STOP_TASK); return ERR_DH_INPUT_SERVER_SOURCE_MANAGER_STOP_FAIL; } - for (auto iter : stpStringCallbacks_) { - if (iter.sinkId == sinkId && IsStringDataSame(iter.dhIds, dhIds)) { - HisyseventUtil::GetInstance().SysEventWriteFault(DINPUT_OPT_FAIL, sinkId, - ERR_DH_INPUT_SERVER_SOURCE_MANAGER_STOP_FAIL, "dinput stop use failed in already stop"); - FinishAsyncTrace(DINPUT_HITRACE_LABEL, DINPUT_STOP_START, DINPUT_STOP_TASK); - DHLOGE("sinkId: %s, repeat call.", GetAnonyString(sinkId).c_str()); - return ERR_DH_INPUT_SERVER_SOURCE_MANAGER_STOP_FAIL; - } - } DInputClientStopDhidInfo info {localNetworkId, sinkId, dhIds, callback}; stpStringCallbacks_.push_back(info); @@ -982,15 +929,6 @@ int32_t DistributedInputSourceManager::StartRemoteInput(const std::string &srcId if (srcId != localNetworkId) { return RelayStartRemoteInputByDhid(srcId, sinkId, dhIds, callback); } - for (auto iter : staStringCallbacks_) { - if (iter.srcId == srcId && iter.sinkId == sinkId && IsStringDataSame(iter.dhIds, dhIds)) { - HisyseventUtil::GetInstance().SysEventWriteFault(DINPUT_OPT_FAIL, sinkId, - ERR_DH_INPUT_SERVER_SOURCE_MANAGER_START_FAIL, "Dinput start use failed in already start."); - FinishAsyncTrace(DINPUT_HITRACE_LABEL, DINPUT_START_START, DINPUT_START_TASK); - DHLOGE("sinkId: %s, repeat call.", GetAnonyString(sinkId).c_str()); - return ERR_DH_INPUT_SERVER_SOURCE_MANAGER_START_FAIL; - } - } DInputClientStartDhidInfo info {srcId, sinkId, dhIds, callback}; staStringCallbacks_.push_back(info); @@ -1035,15 +973,6 @@ int32_t DistributedInputSourceManager::StopRemoteInput(const std::string &srcId, if (srcId != localNetworkId) { return RelayStopRemoteInputByDhid(srcId, sinkId, dhIds, callback); } - for (auto iter : stpStringCallbacks_) { - if (iter.srcId == srcId && iter.sinkId == sinkId && IsStringDataSame(iter.dhIds, dhIds)) { - HisyseventUtil::GetInstance().SysEventWriteFault(DINPUT_OPT_FAIL, sinkId, - ERR_DH_INPUT_SERVER_SOURCE_MANAGER_STOP_FAIL, "Dinput stop use failed in already stop."); - FinishAsyncTrace(DINPUT_HITRACE_LABEL, DINPUT_STOP_START, DINPUT_STOP_TASK); - DHLOGE("sinkId: %s, repeat call.", GetAnonyString(sinkId).c_str()); - return ERR_DH_INPUT_SERVER_SOURCE_MANAGER_STOP_FAIL; - } - } DInputClientStopDhidInfo info {srcId, sinkId, dhIds, callback}; stpStringCallbacks_.push_back(info); @@ -1167,14 +1096,6 @@ int32_t DistributedInputSourceManager::RelayUnprepareRemoteInput(const std::stri int32_t DistributedInputSourceManager::RelayStartRemoteInputByDhid(const std::string &srcId, const std::string &sinkId, const std::vector &dhIds, sptr callback) { - std::lock_guard lock(startStopMutex_); - for (auto iter : relayStaDhidCallbacks_) { - if (iter.srcId == srcId && iter.sinkId == sinkId && IsStringDataSame(iter.dhIds, dhIds)) { - DHLOGE("Repeat call."); - return ERR_DH_INPUT_SERVER_SOURCE_MANAGER_START_FAIL; - } - } - DInputClientStartDhidInfo info{srcId, sinkId, dhIds, callback}; relayStaDhidCallbacks_.push_back(info); @@ -1195,14 +1116,6 @@ int32_t DistributedInputSourceManager::RelayStartRemoteInputByDhid(const std::st int32_t DistributedInputSourceManager::RelayStopRemoteInputByDhid(const std::string &srcId, const std::string &sinkId, const std::vector &dhIds, sptr callback) { - std::lock_guard lock(startStopMutex_); - for (auto iter : relayStpDhidCallbacks_) { - if (iter.srcId == srcId && iter.sinkId == sinkId && IsStringDataSame(iter.dhIds, dhIds)) { - DHLOGE("Repeat call."); - return ERR_DH_INPUT_SERVER_SOURCE_MANAGER_STOP_FAIL; - } - } - DInputClientStopDhidInfo info{srcId, sinkId, dhIds, callback}; relayStpDhidCallbacks_.push_back(info); -- Gitee