From b8085086c65238a72f392366b1d2ffeeef04c828 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Wed, 29 Jul 2015 17:28:37 -0700 Subject: [PATCH] HifiSockAddr have object names --- assignment-client/src/AssignmentClient.cpp | 2 ++ libraries/networking/src/DomainHandler.cpp | 3 +++ libraries/networking/src/HifiSockAddr.cpp | 15 ++++++++++----- libraries/networking/src/NetworkPeer.cpp | 6 ++++++ libraries/networking/src/Node.cpp | 12 +++++++++++- libraries/networking/src/Node.h | 2 +- libraries/networking/src/udt/SendQueue.cpp | 2 +- libraries/networking/src/udt/Socket.cpp | 1 + libraries/networking/src/udt/Socket.h | 2 +- 9 files changed, 36 insertions(+), 9 deletions(-) diff --git a/assignment-client/src/AssignmentClient.cpp b/assignment-client/src/AssignmentClient.cpp index 40aef1c707..6b7365fc01 100644 --- a/assignment-client/src/AssignmentClient.cpp +++ b/assignment-client/src/AssignmentClient.cpp @@ -95,6 +95,7 @@ AssignmentClient::AssignmentClient(Assignment::Type requestAssignmentType, QStri } _assignmentServerSocket = HifiSockAddr(_assignmentServerHostname, assignmentServerPort, true); + _assignmentServerSocket.setObjectName("AssigmentServer"); nodeList->setAssignmentServerSocket(_assignmentServerSocket); qDebug() << "Assignment server socket is" << _assignmentServerSocket; @@ -119,6 +120,7 @@ AssignmentClient::AssignmentClient(Assignment::Type requestAssignmentType, QStri // did we get an assignment-client monitor port? if (assignmentMonitorPort > 0) { _assignmentClientMonitorSocket = HifiSockAddr(DEFAULT_ASSIGNMENT_CLIENT_MONITOR_HOSTNAME, assignmentMonitorPort); + _assignmentClientMonitorSocket.setObjectName("AssignmentClientMonitor"); qDebug() << "Assignment-client monitor socket is" << _assignmentClientMonitorSocket; diff --git a/libraries/networking/src/DomainHandler.cpp b/libraries/networking/src/DomainHandler.cpp index afb362053e..d38ae35826 100644 --- a/libraries/networking/src/DomainHandler.cpp +++ b/libraries/networking/src/DomainHandler.cpp @@ -37,6 +37,8 @@ DomainHandler::DomainHandler(QObject* parent) : _settingsObject(), _failedSettingsRequests(0) { + _sockAddr.setObjectName("DomainServer"); + // if we get a socket that make sure our NetworkPeer ping timer stops connect(this, &DomainHandler::completedSocketDiscovery, &_icePeer, &NetworkPeer::stopPingTimer); } @@ -145,6 +147,7 @@ void DomainHandler::setIceServerHostnameAndID(const QString& iceServerHostname, HifiSockAddr* replaceableSockAddr = &_iceServerSockAddr; replaceableSockAddr->~HifiSockAddr(); replaceableSockAddr = new (replaceableSockAddr) HifiSockAddr(iceServerHostname, ICE_SERVER_DEFAULT_PORT); + _iceServerSockAddr.setObjectName("IceServer"); auto nodeList = DependencyManager::get(); diff --git a/libraries/networking/src/HifiSockAddr.cpp b/libraries/networking/src/HifiSockAddr.cpp index 39210db81e..813d19d22c 100644 --- a/libraries/networking/src/HifiSockAddr.cpp +++ b/libraries/networking/src/HifiSockAddr.cpp @@ -33,16 +33,16 @@ HifiSockAddr::HifiSockAddr(const QHostAddress& address, quint16 port) : } HifiSockAddr::HifiSockAddr(const HifiSockAddr& otherSockAddr) : - QObject(), _address(otherSockAddr._address), _port(otherSockAddr._port) { - + setObjectName(otherSockAddr.objectName()); } HifiSockAddr& HifiSockAddr::operator=(const HifiSockAddr& rhsSockAddr) { - HifiSockAddr temp(rhsSockAddr); - swap(temp); + setObjectName(rhsSockAddr.objectName()); + _address = rhsSockAddr._address; + _port = rhsSockAddr._port; return *this; } @@ -76,9 +76,14 @@ HifiSockAddr::HifiSockAddr(const sockaddr* sockaddr) { void HifiSockAddr::swap(HifiSockAddr& otherSockAddr) { using std::swap; - + swap(_address, otherSockAddr._address); swap(_port, otherSockAddr._port); + + // Swap objects name + auto temp = otherSockAddr.objectName(); + otherSockAddr.setObjectName(objectName()); + setObjectName(temp); } bool HifiSockAddr::operator==(const HifiSockAddr& rhsSockAddr) const { diff --git a/libraries/networking/src/NetworkPeer.cpp b/libraries/networking/src/NetworkPeer.cpp index 52e53e9665..9e51bc5dac 100644 --- a/libraries/networking/src/NetworkPeer.cpp +++ b/libraries/networking/src/NetworkPeer.cpp @@ -57,7 +57,9 @@ void NetworkPeer::setPublicSocket(const HifiSockAddr& publicSocket) { bool wasOldSocketNull = _publicSocket.isNull(); + auto temp = _publicSocket.objectName(); _publicSocket = publicSocket; + _publicSocket.setObjectName(temp); if (!wasOldSocketNull) { qCDebug(networking) << "Public socket change for node" << *this; @@ -74,7 +76,9 @@ void NetworkPeer::setLocalSocket(const HifiSockAddr& localSocket) { bool wasOldSocketNull = _localSocket.isNull(); + auto temp = _localSocket.objectName(); _localSocket = localSocket; + _localSocket.setObjectName(temp); if (!wasOldSocketNull) { qCDebug(networking) << "Local socket change for node" << *this; @@ -91,7 +95,9 @@ void NetworkPeer::setSymmetricSocket(const HifiSockAddr& symmetricSocket) { bool wasOldSocketNull = _symmetricSocket.isNull(); + auto temp = _symmetricSocket.objectName(); _symmetricSocket = symmetricSocket; + _symmetricSocket.setObjectName(temp); if (!wasOldSocketNull) { qCDebug(networking) << "Symmetric socket change for node" << *this; diff --git a/libraries/networking/src/Node.cpp b/libraries/networking/src/Node.cpp index 355aa6994e..6f10e6dbdb 100644 --- a/libraries/networking/src/Node.cpp +++ b/libraries/networking/src/Node.cpp @@ -55,13 +55,23 @@ Node::Node(const QUuid& uuid, NodeType_t type, const HifiSockAddr& publicSocket, _canAdjustLocks(canAdjustLocks), _canRez(canRez) { - + // Update socket's object name + setType(_type); } Node::~Node() { delete _linkedData; } +void Node::setType(char type) { + _type = type; + + auto typeString = NodeType::getNodeTypeName(type); + _publicSocket.setObjectName(typeString); + _localSocket.setObjectName(typeString); + _symmetricSocket.setObjectName(typeString); +} + void Node::updateClockSkewUsec(int clockSkewSample) { _clockSkewMovingPercentile.updatePercentile((float)clockSkewSample); _clockSkewUsec = (int)_clockSkewMovingPercentile.getValueAtPercentile(); diff --git a/libraries/networking/src/Node.h b/libraries/networking/src/Node.h index 53a2aced8c..573569f92b 100644 --- a/libraries/networking/src/Node.h +++ b/libraries/networking/src/Node.h @@ -40,7 +40,7 @@ public: bool operator!=(const Node& otherNode) const { return !(*this == otherNode); } char getType() const { return _type; } - void setType(char type) { _type = type; } + void setType(char type); const QUuid& getConnectionSecret() const { return _connectionSecret; } void setConnectionSecret(const QUuid& connectionSecret) { _connectionSecret = connectionSecret; } diff --git a/libraries/networking/src/udt/SendQueue.cpp b/libraries/networking/src/udt/SendQueue.cpp index 05d69dde6c..9a2e371616 100644 --- a/libraries/networking/src/udt/SendQueue.cpp +++ b/libraries/networking/src/udt/SendQueue.cpp @@ -30,7 +30,7 @@ std::unique_ptr SendQueue::create(Socket* socket, HifiSockAddr dest) // Setup queue private thread QThread* thread = new QThread(); - thread->setObjectName("Networking: SendQueue"); // Name thread for easier debug + thread->setObjectName("Networking: SendQueue " + dest.objectName()); // Name thread for easier debug connect(queue.get(), &QObject::destroyed, thread, &QThread::quit); // Thread auto cleanup connect(thread, &QThread::finished, thread, &QThread::deleteLater); // Thread auto cleanup diff --git a/libraries/networking/src/udt/Socket.cpp b/libraries/networking/src/udt/Socket.cpp index 650bdd7906..4c8b5a4329 100644 --- a/libraries/networking/src/udt/Socket.cpp +++ b/libraries/networking/src/udt/Socket.cpp @@ -14,6 +14,7 @@ #include #include "../NetworkLogging.h" +#include "Connection.h" #include "ControlPacket.h" #include "Packet.h" diff --git a/libraries/networking/src/udt/Socket.h b/libraries/networking/src/udt/Socket.h index 0bc23cdf0a..1827dc8234 100644 --- a/libraries/networking/src/udt/Socket.h +++ b/libraries/networking/src/udt/Socket.h @@ -23,11 +23,11 @@ #include "../HifiSockAddr.h" #include "CongestionControl.h" -#include "Connection.h" namespace udt { class BasePacket; +class Connection; class ControlSender; class Packet; class SequenceNumber;