From 06ed751f56542fd79b286fc687f225e54deaf73c Mon Sep 17 00:00:00 2001 From: Roxanne Skelly Date: Wed, 5 Jun 2019 11:08:12 -0700 Subject: [PATCH] checkpoint to deal with merge --- libraries/networking/src/LimitedNodeList.cpp | 6 +++++- libraries/networking/src/udt/Socket.cpp | 7 +++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp index 0eda2ee2e0..deed00ac4b 100644 --- a/libraries/networking/src/LimitedNodeList.cpp +++ b/libraries/networking/src/LimitedNodeList.cpp @@ -446,7 +446,11 @@ qint64 LimitedNodeList::sendPacket(std::unique_ptr packet, const HifiS return size; } else { - return sendUnreliablePacket(*packet, sockAddr, hmacAuth); + auto size = sendUnreliablePacket(*packet, sockAddr, hmacAuth); + if (size < 0) { + + } + return size; } } diff --git a/libraries/networking/src/udt/Socket.cpp b/libraries/networking/src/udt/Socket.cpp index 5e68070bb7..5dab1ad2b5 100644 --- a/libraries/networking/src/udt/Socket.cpp +++ b/libraries/networking/src/udt/Socket.cpp @@ -226,8 +226,11 @@ qint64 Socket::writeDatagram(const QByteArray& datagram, const HifiSockAddr& soc qint64 bytesWritten = _udpSocket.writeDatagram(datagram, sockAddr.getAddress(), sockAddr.getPort()); if (bytesWritten < 0) { - // when saturating a link this isn't an uncommon message - suppress it so it doesn't bomb the debug - qCDebug(networking) << "Socket::writeDatagram : " << sockAddr << " " << _udpSocket.error(); + qCDebug(networking) << "udt::writeDatagram (" << _udpSocket.state() << ") error - " << _udpSocket.error() << "(" << _udpSocket.errorString() << ")"; +#ifdef DEBUG_EVENT_QUEUE + int nodeListQueueSize = ::hifi::qt::getEventQueueSize(thread()); + qCDebug(networking) << "Networking queue size - " << nodeListQueueSize; +#endif // DEBUG_EVENT_QUEUE } return bytesWritten;