openharmony/distributedhardware_distributed_input
1
0
Fork 0
mirror of https://github.com/openharmony/distributedhardware_distributed_input.git synced 2026-07-19 17:43:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

!199 fix:修改死锁导致UT卡死

Browse Source 
Merge pull request !199 from 李天刚/master
This commit is contained in:
openharmony_ci
2024-05-11 06:39:23 +00:00
committed by Gitee
parent 722ef369c5 825320b904
commit 8616f6b5fd
4 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/sink/sinkmanager/src/distributed_input_sink_manager.cpp
-1
View File
@@ -695,7 +695,6 @@ int32_t DistributedInputSinkManager::RegisterGetSinkScreenInfosCallback(
uint32_t DistributedInputSinkManager::GetSinkScreenInfosCbackSize()
{
std::lock_guard<std::mutex> lock(mutex_);
return getSinkScreenInfosCallbacks_.size();
}
services/transportbase/src/distributed_input_transport_base.cpp
-2
View File
@@ -369,13 +369,11 @@ void DistributedInputTransportBase::RunSessionStateCallback(const std::string &r
int32_t DistributedInputTransportBase::CountSession(const std::string &remoteDevId)
{
std::unique_lock<std::mutex> sessionLock(operationMutex_);
return remoteDevSessionMap_.count(remoteDevId);
}
void DistributedInputTransportBase::EraseSessionId(const std::string &remoteDevId)
{
std::unique_lock<std::mutex> sessionLock(operationMutex_);
remoteDevSessionMap_.erase(remoteDevId);
}
services/transportbase/test/transbaseunittest/distributed_input_transbase_test.cpp
-8
View File
@@ -33,14 +33,6 @@ namespace {
}
void DistributedInputTransbaseTest::SetUp()
{
sourceTransport_ = new DistributedInputSourceTransport();
statusSourceListener_ =
std::make_shared<DistributedInputSourceTransport::DInputTransbaseSourceListener>(sourceTransport_);
DistributedInputTransportBase::GetInstance().RegisterSrcHandleSessionCallback(statusSourceListener_);
sinkTransport_ = new DistributedInputSinkTransport();
statusSinkListener_ = std::make_shared<DistributedInputSinkTransport::DInputTransbaseSinkListener>(sinkTransport_);
DistributedInputTransportBase::GetInstance().RegisterSinkHandleSessionCallback(statusSinkListener_);
}
void DistributedInputTransbaseTest::TearDown()
services/transportbase/test/transbaseunittest/distributed_input_transbase_test.h
-6
View File
@@ -48,12 +48,6 @@ public:
virtual ~TestRegisterSessionStateCallbackStub() = default;
void OnResult(const std::string &devId, const uint32_t status);
};
private:
DistributedInputSourceTransport* sourceTransport_;
std::shared_ptr<DistributedInputSourceTransport::DInputTransbaseSourceListener> statusSourceListener_;
DistributedInputSinkTransport* sinkTransport_;
std::shared_ptr<DistributedInputSinkTransport::DInputTransbaseSinkListener> statusSinkListener_;
};
} // namespace DistributedInput
} // namespace DistributedHardware