From 2e6e41f0f0ae11eb0ccc8b24bd37ccf5baf8b65e Mon Sep 17 00:00:00 2001 From: li-tiangang4 Date: Fri, 10 May 2024 18:41:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=AD=BB=E9=94=81=E5=AF=BC?= =?UTF-8?q?=E8=87=B4UT=E5=8D=A1=E6=AD=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: li-tiangang4 --- .../sinkmanager/src/distributed_input_sink_manager.cpp | 1 - .../src/distributed_input_transport_base.cpp | 2 -- .../distributed_input_transbase_test.cpp | 8 -------- .../transbaseunittest/distributed_input_transbase_test.h | 6 ------ 4 files changed, 17 deletions(-) diff --git a/services/sink/sinkmanager/src/distributed_input_sink_manager.cpp b/services/sink/sinkmanager/src/distributed_input_sink_manager.cpp index 80faa00..27b157f 100644 --- a/services/sink/sinkmanager/src/distributed_input_sink_manager.cpp +++ b/services/sink/sinkmanager/src/distributed_input_sink_manager.cpp @@ -695,7 +695,6 @@ int32_t DistributedInputSinkManager::RegisterGetSinkScreenInfosCallback( uint32_t DistributedInputSinkManager::GetSinkScreenInfosCbackSize() { - std::lock_guard lock(mutex_); return getSinkScreenInfosCallbacks_.size(); } diff --git a/services/transportbase/src/distributed_input_transport_base.cpp b/services/transportbase/src/distributed_input_transport_base.cpp index 1721633..ad8a335 100644 --- a/services/transportbase/src/distributed_input_transport_base.cpp +++ b/services/transportbase/src/distributed_input_transport_base.cpp @@ -369,13 +369,11 @@ void DistributedInputTransportBase::RunSessionStateCallback(const std::string &r int32_t DistributedInputTransportBase::CountSession(const std::string &remoteDevId) { - std::unique_lock sessionLock(operationMutex_); return remoteDevSessionMap_.count(remoteDevId); } void DistributedInputTransportBase::EraseSessionId(const std::string &remoteDevId) { - std::unique_lock sessionLock(operationMutex_); remoteDevSessionMap_.erase(remoteDevId); } diff --git a/services/transportbase/test/transbaseunittest/distributed_input_transbase_test.cpp b/services/transportbase/test/transbaseunittest/distributed_input_transbase_test.cpp index d5d55fb..74e6dd8 100644 --- a/services/transportbase/test/transbaseunittest/distributed_input_transbase_test.cpp +++ b/services/transportbase/test/transbaseunittest/distributed_input_transbase_test.cpp @@ -33,14 +33,6 @@ namespace { } void DistributedInputTransbaseTest::SetUp() { - sourceTransport_ = new DistributedInputSourceTransport(); - statusSourceListener_ = - std::make_shared(sourceTransport_); - DistributedInputTransportBase::GetInstance().RegisterSrcHandleSessionCallback(statusSourceListener_); - - sinkTransport_ = new DistributedInputSinkTransport(); - statusSinkListener_ = std::make_shared(sinkTransport_); - DistributedInputTransportBase::GetInstance().RegisterSinkHandleSessionCallback(statusSinkListener_); } void DistributedInputTransbaseTest::TearDown() diff --git a/services/transportbase/test/transbaseunittest/distributed_input_transbase_test.h b/services/transportbase/test/transbaseunittest/distributed_input_transbase_test.h index 56bb089..d87cb3d 100644 --- a/services/transportbase/test/transbaseunittest/distributed_input_transbase_test.h +++ b/services/transportbase/test/transbaseunittest/distributed_input_transbase_test.h @@ -48,12 +48,6 @@ public: virtual ~TestRegisterSessionStateCallbackStub() = default; void OnResult(const std::string &devId, const uint32_t status); }; - -private: - DistributedInputSourceTransport* sourceTransport_; - std::shared_ptr statusSourceListener_; - DistributedInputSinkTransport* sinkTransport_; - std::shared_ptr statusSinkListener_; }; } // namespace DistributedInput } // namespace DistributedHardware -- Gitee