From 3690ecc28fd9531cb9d347ba7332dfb0ad3965c2 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Tue, 7 Jul 2015 16:24:11 -0700 Subject: [PATCH] Add std::move to sendPacket calls --- .../src/AssignmentClientMonitor.cpp | 4 ++-- assignment-client/src/audio/AudioMixer.cpp | 4 ++-- .../src/audio/AudioMixerClientData.cpp | 2 +- assignment-client/src/avatars/AvatarMixer.cpp | 4 ++-- domain-server/src/DomainServer.cpp | 4 ++-- libraries/audio-client/src/AudioClient.cpp | 2 +- libraries/audio-client/src/AudioIOStats.cpp | 2 +- libraries/networking/src/NodeList.cpp | 16 ++++++++-------- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/assignment-client/src/AssignmentClientMonitor.cpp b/assignment-client/src/AssignmentClientMonitor.cpp index 75c8446d84..3331e81a18 100644 --- a/assignment-client/src/AssignmentClientMonitor.cpp +++ b/assignment-client/src/AssignmentClientMonitor.cpp @@ -196,7 +196,7 @@ void AssignmentClientMonitor::checkSpares() { childNode->activateLocalSocket(); auto diePacket = NLPacket::create(PacketType::StopNode, 0); - nodeList->sendPacket(diePacket, childNode); + nodeList->sendPacket(std::move(diePacket), childNode); } } } @@ -231,7 +231,7 @@ void AssignmentClientMonitor::readPendingDatagrams() { qDebug() << "asking unknown child to exit."; auto diePacket = NL::create(PacketType::StopNode, 0); - nodeList->sendPacket(diePacket, childNode); + nodeList->sendPacket(std::move(diePacket), childNode); } } } diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp index 4577f2015f..9d519c1b20 100644 --- a/assignment-client/src/audio/AudioMixer.cpp +++ b/assignment-client/src/audio/AudioMixer.cpp @@ -530,7 +530,7 @@ void AudioMixer::sendAudioEnvironmentPacket(SharedNodePointer node) { envPacket.write(&reverbTime, sizeof(reverb)); envPacket.write(&wetLevel, sizeof(wetLevel)); } - nodeList->sendPacket(envPacket, node); + nodeList->sendPacket(std::move(envPacket), node); } } @@ -794,7 +794,7 @@ void AudioMixer::run() { if (nodeData->getAvatarAudioStream() && shouldMute(nodeData->getAvatarAudioStream()->getQuietestFrameLoudness())) { auto mutePacket = NLPacket::create(PacketType::NoisyMute, 0); - nodeList->sendPacket(mutePacket, node); + nodeList->sendPacket(std::move(mutePacket), node); } if (node->getType() == NodeType::Agent && node->getActiveSocket() diff --git a/assignment-client/src/audio/AudioMixerClientData.cpp b/assignment-client/src/audio/AudioMixerClientData.cpp index f4fbbb87f9..b9fe98a2bd 100644 --- a/assignment-client/src/audio/AudioMixerClientData.cpp +++ b/assignment-client/src/audio/AudioMixerClientData.cpp @@ -190,7 +190,7 @@ void AudioMixerClientData::sendAudioStreamStatsPackets(const SharedNodePointer& numStreamStatsRemaining -= numStreamStatsToPack; // send the current packet - nodeList->sendPacket(statsPacket, destinationNode); + nodeList->sendPacket(std::move(statsPacket), destinationNode); } } diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp index af9328cd12..844e38d0aa 100644 --- a/assignment-client/src/avatars/AvatarMixer.cpp +++ b/assignment-client/src/avatars/AvatarMixer.cpp @@ -309,7 +309,7 @@ void AvatarMixer::broadcastAvatarData() { billboardPacket.write(otherNode->getUUID().toRfc4122()); billboardPacket.write(otherNodeData->getAvatar().getBillboard()); - nodeList->sendPacket(billboardPacket, node); + nodeList->sendPacket(std::move(billboardPacket), node); ++_sumBillboardPackets; } @@ -326,7 +326,7 @@ void AvatarMixer::broadcastAvatarData() { identityPacket.write(individualData); - nodeList->sendPacket(identityPacket, node); + nodeList->sendPacket(std::move(identityPacket), node); ++_sumIdentityPackets; } diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index 63e5f5b1eb..4feb0ebe92 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -1324,10 +1324,10 @@ void DomainServer::pingPunchForConnectingPeer(const SharedNetworkPeer& peer) { // send the ping packet to the local and public sockets for this node auto localPingPacket = nodeList->constructICEPingPacket(PingType::Local, limitedNodeList->getSessionUUID()); - limitedNodeList->sendPacket(localPingPacket, peer->getLocalSocket()); + limitedNodeList->sendPacket(std::move(localPingPacket), peer->getLocalSocket()); auto publicPingPacket = nodeList->constructICEPingPacket(PingType::Public, limitedNodeList->getSessionUUID()); - limitedNodeList->sendPacket(publicPingPacket, peer->getPublicSocket()); + limitedNodeList->sendPacket(std::move(publicPingPacket), peer->getPublicSocket()); peer->incrementConnectionAttempts(); } diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp index b058d8b79b..acca48ce35 100644 --- a/libraries/audio-client/src/AudioClient.cpp +++ b/libraries/audio-client/src/AudioClient.cpp @@ -927,7 +927,7 @@ void AudioClient::sendMuteEnvironmentPacket() { if (audioMixer) { // send off this mute packet - nodeList->sendPacket(mutePacket, audioMixer); + nodeList->sendPacket(std::move(mutePacket), audioMixer); } } diff --git a/libraries/audio-client/src/AudioIOStats.cpp b/libraries/audio-client/src/AudioIOStats.cpp index 8e0afff9d2..db72adb0c5 100644 --- a/libraries/audio-client/src/AudioIOStats.cpp +++ b/libraries/audio-client/src/AudioIOStats.cpp @@ -124,5 +124,5 @@ void AudioIOStats::sendDownstreamAudioStatsPacket() { // send packet SharedNodePointer audioMixer = nodeList->soloNodeOfType(NodeType::AudioMixer); - nodeList->sendPacket(packet, audioMixer); + nodeList->sendPacket(std::move(statsPacket), audioMixer); } diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp index 9da78095a7..f329ec7333 100644 --- a/libraries/networking/src/NodeList.cpp +++ b/libraries/networking/src/NodeList.cpp @@ -204,7 +204,7 @@ void NodeList::processNodeData(const HifiSockAddr& senderSockAddr, const QByteAr if (matchingNode) { matchingNode->setLastHeardMicrostamp(usecTimestampNow()); auto replyPacket = constructPingReplyPacket(packet); - sendPacket(replyPacket, matchingNode, senderSockAddr); + sendPacket(std::move(replyPacket), matchingNode, senderSockAddr); // If we don't have a symmetric socket for this node and this socket doesn't match // what we have for public and local then set it as the symmetric. @@ -236,7 +236,7 @@ void NodeList::processNodeData(const HifiSockAddr& senderSockAddr, const QByteAr case PacketType::ICEPing: { // send back a reply auto replyPacket = constructICEPingReplyPacket(packet, _domainHandler.getICEClientID()); - sendPacket(replyPacket, senderSockAddr); + sendPacket(std::move(replyPacket), senderSockAddr); break; } case PacketType::ICEPingReply: { @@ -369,7 +369,7 @@ void NodeList::sendDomainServerCheckIn() { flagTimeForConnectionStep(LimitedNodeList::ConnectionStep::SendDSCheckIn); if (!isUsingDTLS) { - sendPacket(domainPacket, _domainHandler.getSockAddr()); + sendPacket(std::move(domainPacket), _domainHandler.getSockAddr()); } if (_numNoReplyDomainCheckIns >= MAX_SILENT_DOMAIN_SERVER_CHECK_INS) { @@ -431,7 +431,7 @@ void NodeList::sendDSPathQuery(const QString& newPath) { << _domainHandler.getSockAddr(); // send off the path query - sendPacket(pathQueryPacket, _domainHandler.getSockAddr()); + sendPacket(std::move(pathQueryPacket), _domainHandler.getSockAddr()); } else { qCDebug(networking) << "Path" << newPath << "would make PacketTypeDomainServerPathQuery packet > MAX_PACKET_SIZE." << "Will not send query."; @@ -521,10 +521,10 @@ void NodeList::pingPunchForDomainServer() { // send the ping packet to the local and public sockets for this node auto localPingPacket = constructICEPingPacket(PingType::Local); - sendPacket(localPingPacket, _domainHandler.getICEPeer().getLocalSocket()); + sendPacket(std::move(localPingPacket), _domainHandler.getICEPeer().getLocalSocket()); auto publicPingPacket = constructICEPingPacket(PingType::Public); - sendPacket(publicPingPacket, _domainHandler.getICEPeer().getPublicSocket()); + sendPacket(std::move(publicPingPacket), _domainHandler.getICEPeer().getPublicSocket()); _domainHandler.getICEPeer().incrementConnectionAttempts(); } @@ -629,10 +629,10 @@ void NodeList::pingPunchForInactiveNode(const SharedNodePointer& node) { // send the ping packet to the local and public sockets for this node auto localPingPacket = constructPingPacket(PingType::Local); - sendPacket(localPingPacket, node, node->getLocalSocket()); + sendPacket(std::move(localPingPacket), node, node->getLocalSocket()); auto publicPingPacket = constructPingPacket(PingType::Public); - sendPacket(publicPingPacket, node, node->getPublicSocket()); + sendPacket(std::move(publicPingPacket), node, node->getPublicSocket()); if (!node->getSymmetricSocket().isNull()) { auto symmetricPingPacket = constructPingPacket(PingType::Symmetric);