From 13eceba3957e27049c86f078bbf138888cca9ecc Mon Sep 17 00:00:00 2001 From: hwzhangchuang Date: Mon, 11 Dec 2023 20:56:15 +0800 Subject: [PATCH 1/2] remove no use log Signed-off-by: hwzhangchuang --- common/include/input_hub.cpp | 4 ---- .../inputcollector/src/distributed_input_collector.cpp | 4 +--- .../transport/src/distributed_input_sink_transport.cpp | 1 - .../src/distributed_input_transport_base.cpp | 8 +------- 4 files changed, 2 insertions(+), 15 deletions(-) diff --git a/common/include/input_hub.cpp b/common/include/input_hub.cpp index ceac892..4c63f59 100644 --- a/common/include/input_hub.cpp +++ b/common/include/input_hub.cpp @@ -213,7 +213,6 @@ bool InputHub::IsTouchPad(Device *device) bool InputHub::IsTouchPad(const InputDevice &inputDevice) { std::string dhName = inputDevice.name; - DHLOGD("device name is %s.", dhName.c_str()); transform(dhName.begin(), dhName.end(), dhName.begin(), ::tolower); if (dhName.find(DH_TOUCH_PAD) == std::string::npos) { return false; @@ -270,7 +269,6 @@ void InputHub::MatchAndDealEvent(Device *device, const RawEvent &event) void InputHub::RecordDeviceChangeStates(Device *device, struct input_event readBuffer[], const size_t count) { - DHLOGD("RecordDeviceChangeStates enter."); bool isTouchEvent = false; if ((device->classes & INPUT_DEVICE_CLASS_TOUCH_MT) || (device->classes & INPUT_DEVICE_CLASS_TOUCH)) { if (!IsTouchPad(device->identifier)) { @@ -289,7 +287,6 @@ void InputHub::RecordDeviceChangeStates(Device *device, struct input_event readB event.descriptor = isTouchEvent ? touchDescriptor : device->identifier.descriptor; MatchAndDealEvent(device, event); } - DHLOGD("RecordDeviceChangeStates end."); } size_t InputHub::CollectEvent(RawEvent *buffer, size_t &capacity, Device *device, struct input_event readBuffer[], @@ -1115,7 +1112,6 @@ InputHub::Device* InputHub::GetDeviceByFdLocked(int fd) InputHub::Device* InputHub::GetSupportDeviceByFd(int fd) { - DHLOGD("GetSupportDeviceByFd fd: %d", fd); std::lock_guard deviceLock(devicesMutex_); for (const auto &[id, device] : devices_) { if (device != nullptr && device->fd == fd) { diff --git a/services/sink/inputcollector/src/distributed_input_collector.cpp b/services/sink/inputcollector/src/distributed_input_collector.cpp index e70c198..bd33f4f 100644 --- a/services/sink/inputcollector/src/distributed_input_collector.cpp +++ b/services/sink/inputcollector/src/distributed_input_collector.cpp @@ -116,9 +116,7 @@ void DistributedInputCollector::StartCollectEventsThread() return; } size_t count = inputHub_->StartCollectInputEvents(mEventBuffer, INPUT_EVENT_BUFFER_SIZE); - if (count > 0) { - DHLOGD("Count: %zu", count); - } else { + if (count <= 0) { continue; } diff --git a/services/sink/transport/src/distributed_input_sink_transport.cpp b/services/sink/transport/src/distributed_input_sink_transport.cpp index 69368ca..4b4aa7c 100644 --- a/services/sink/transport/src/distributed_input_sink_transport.cpp +++ b/services/sink/transport/src/distributed_input_sink_transport.cpp @@ -69,7 +69,6 @@ DistributedInputSinkTransport &DistributedInputSinkTransport::GetInstance() void DistributedInputSinkTransport::DInputSinkEventHandler::ProcessEvent(const AppExecFwk::InnerEvent::Pointer &event) { - DHLOGD("ProcessEvent"); EHandlerMsgType eventId = static_cast(event->GetInnerEventId()); switch (eventId) { case EHandlerMsgType::DINPUT_SINK_EVENT_HANDLER_MSG: { diff --git a/services/transportbase/src/distributed_input_transport_base.cpp b/services/transportbase/src/distributed_input_transport_base.cpp index c9d2921..e36044d 100644 --- a/services/transportbase/src/distributed_input_transport_base.cpp +++ b/services/transportbase/src/distributed_input_transport_base.cpp @@ -449,7 +449,6 @@ bool DistributedInputTransportBase::CheckRecivedData(const std::string &message) void DistributedInputTransportBase::OnBytesReceived(int32_t sessionId, const void *data, uint32_t dataLen) { - DHLOGD("OnBytesReceived, sessionId: %d, dataLen:%d", sessionId, dataLen); if (sessionId < 0 || data == nullptr || dataLen <= 0) { DHLOGE("OnBytesReceived param check failed"); return; @@ -468,11 +467,10 @@ void DistributedInputTransportBase::OnBytesReceived(int32_t sessionId, const voi } std::string message(buf, buf + dataLen); - DHLOGD("OnBytesReceived message:%s.", SetAnonyId(message).c_str()); + DHLOGD("OnBytesReceived sessionId: %d, message:%s.", sessionId, SetAnonyId(message).c_str()); HandleSession(sessionId, message); free(buf); - DHLOGD("OnBytesReceived completed"); return; } @@ -491,13 +489,11 @@ void DistributedInputTransportBase::HandleSession(int32_t sessionId, const std:: return; } uint32_t cmdType = recMsg[DINPUT_SOFTBUS_KEY_CMD_TYPE]; - DHLOGD("HandleSession cmdType %u.", cmdType); if (cmdType < TRANS_MSG_SRC_SINK_SPLIT) { if (srcCallback_ == nullptr) { DHLOGE("srcCallback is nullptr."); return; } - DHLOGD("HandleSession to source."); srcCallback_->HandleSessionData(sessionId, message); return; } @@ -506,14 +502,12 @@ void DistributedInputTransportBase::HandleSession(int32_t sessionId, const std:: DHLOGE("sinkCallback is nullptr."); return; } - DHLOGD("HandleSession to sink."); sinkCallback_->HandleSessionData(sessionId, message); } } int32_t DistributedInputTransportBase::SendMsg(int32_t sessionId, std::string &message) { - DHLOGD("start SendMsg"); if (message.size() > MSG_MAX_SIZE) { DHLOGE("SendMessage error: message.size() > MSG_MAX_SIZE"); return ERR_DH_INPUT_SERVER_SOURCE_TRANSPORT_SENDMESSSAGE; -- Gitee From 2457efcde3ba9bd413e04e166917703ae6b01c4d Mon Sep 17 00:00:00 2001 From: hwzhangchuang Date: Mon, 11 Dec 2023 22:25:11 +0800 Subject: [PATCH 2/2] add Signed-off-by: hwzhangchuang --- common/include/input_hub.cpp | 4 ---- .../sink/transport/src/distributed_input_sink_transport.cpp | 1 - .../inputinject/src/distributed_input_node_manager.cpp | 2 -- services/source/inputinject/src/virtual_device.cpp | 4 ---- .../transport/src/distributed_input_source_transport.cpp | 5 ----- .../transportbase/src/distributed_input_transport_base.cpp | 1 - 6 files changed, 17 deletions(-) diff --git a/common/include/input_hub.cpp b/common/include/input_hub.cpp index 4c63f59..e243ab4 100644 --- a/common/include/input_hub.cpp +++ b/common/include/input_hub.cpp @@ -182,8 +182,6 @@ size_t InputHub::GetEvents(RawEvent *buffer, size_t bufferSize) GetAnonyString(device->identifier.descriptor).c_str()); continue; } - DHLOGD("shared device dhId: %s, name: %s", GetAnonyString(device->identifier.descriptor).c_str(), - device->identifier.name.c_str()); if (eventItem.events & EPOLLIN) { event += CollectEvent(event, capacity, device, readBuffer, count); @@ -1115,8 +1113,6 @@ InputHub::Device* InputHub::GetSupportDeviceByFd(int fd) std::lock_guard deviceLock(devicesMutex_); for (const auto &[id, device] : devices_) { if (device != nullptr && device->fd == fd) { - DHLOGD("GetSupportDeviceByFd device fd: %d, path: %s, dhId: %s, classes=0x%x", device->fd, - device->path.c_str(), GetAnonyString(device->identifier.descriptor).c_str(), device->classes); return device.get(); } } diff --git a/services/sink/transport/src/distributed_input_sink_transport.cpp b/services/sink/transport/src/distributed_input_sink_transport.cpp index 4b4aa7c..7e6ae56 100644 --- a/services/sink/transport/src/distributed_input_sink_transport.cpp +++ b/services/sink/transport/src/distributed_input_sink_transport.cpp @@ -198,7 +198,6 @@ int32_t DistributedInputSinkTransport::RespLatency(const int32_t sessionId, std: return ERR_DH_INPUT_SERVER_SINK_TRANSPORT_RESP_LATENCY_FAIL; } - DHLOGD("RespLatency sessionId: %d, smsg:%s.", sessionId, SetAnonyId(smsg).c_str()); return DH_SUCCESS; } diff --git a/services/source/inputinject/src/distributed_input_node_manager.cpp b/services/source/inputinject/src/distributed_input_node_manager.cpp index a429a98..8b3954c 100644 --- a/services/source/inputinject/src/distributed_input_node_manager.cpp +++ b/services/source/inputinject/src/distributed_input_node_manager.cpp @@ -485,10 +485,8 @@ void DistributedInputNodeManager::InjectEvent() injectQueue_.pop(); } - DHLOGD("process event, inject queue size: %zu", injectQueue_.size()); ProcessInjectEvent(events); } - DHLOGD("end"); } void DistributedInputNodeManager::RegisterInjectEventCb(sptr callback) diff --git a/services/source/inputinject/src/virtual_device.cpp b/services/source/inputinject/src/virtual_device.cpp index f75dcbf..566a906 100644 --- a/services/source/inputinject/src/virtual_device.cpp +++ b/services/source/inputinject/src/virtual_device.cpp @@ -173,15 +173,11 @@ bool VirtualDevice::SetUp(const InputDevice &inputDevice, const std::string &dev bool VirtualDevice::InjectInputEvent(const input_event &event) { - DHLOGI("InjectInputEvent %d", fd_); - if (write(fd_, &event, sizeof(event)) < static_cast(sizeof(event))) { DHLOGE("could not inject event, removed? (fd: %d", fd_); return false; } RecordEventLog(event); - DHLOGI("InjectInputEvent end\n"); - return true; } diff --git a/services/source/transport/src/distributed_input_source_transport.cpp b/services/source/transport/src/distributed_input_source_transport.cpp index 48fd7a7..ceea71e 100644 --- a/services/source/transport/src/distributed_input_source_transport.cpp +++ b/services/source/transport/src/distributed_input_source_transport.cpp @@ -651,8 +651,6 @@ int32_t DistributedInputSourceTransport::LatencyCount(const std::string &deviceI return ERR_DH_INPUT_SERVER_SOURCE_TRANSPORT_LATENCY_FAIL; } - DHLOGD("LatencyCount deviceId:%s, sessionId: %d, smsg:%s.", - GetAnonyString(deviceId).c_str(), sessionId, SetAnonyId(smsg).c_str()); return DH_SUCCESS; } @@ -662,7 +660,6 @@ void DistributedInputSourceTransport::StartLatencyCount(const std::string &devic if (ret != 0) { DHLOGE("StartLatencyCount setname failed."); } - DHLOGI("start"); while (isLatencyThreadRunning_.load()) { if (sendNum_ >= INPUT_LATENCY_DELAY_TIMES) { uint64_t latency = (uint64_t)(deltaTimeAll_ / 2 / INPUT_LATENCY_DELAY_TIMES); @@ -679,7 +676,6 @@ void DistributedInputSourceTransport::StartLatencyCount(const std::string &devic sendNum_ += 1; usleep(INPUT_LATENCY_DELAYTIME_US); } - DHLOGI("end"); } void DistributedInputSourceTransport::StartLatencyThread(const std::string &deviceId) @@ -1095,7 +1091,6 @@ void DistributedInputSourceTransport::NotifyReceivedEventRemoteInput(int32_t ses void DistributedInputSourceTransport::CalculateLatency(int32_t sessionId, const nlohmann::json &recMsg) { - DHLOGD("OnBytesReceived cmdType is TRANS_SINK_MSG_LATENCY."); std::string deviceId = DistributedInputTransportBase::GetInstance().GetDevIdBySessionId(sessionId); if (deviceId.empty()) { DHLOGE("OnBytesReceived cmdType is TRANS_SINK_MSG_LATENCY, deviceId is error."); diff --git a/services/transportbase/src/distributed_input_transport_base.cpp b/services/transportbase/src/distributed_input_transport_base.cpp index e36044d..9c3e431 100644 --- a/services/transportbase/src/distributed_input_transport_base.cpp +++ b/services/transportbase/src/distributed_input_transport_base.cpp @@ -467,7 +467,6 @@ void DistributedInputTransportBase::OnBytesReceived(int32_t sessionId, const voi } std::string message(buf, buf + dataLen); - DHLOGD("OnBytesReceived sessionId: %d, message:%s.", sessionId, SetAnonyId(message).c_str()); HandleSession(sessionId, message); free(buf); -- Gitee