Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 05:58:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #15742 from SimonWalton-HiFi/connections-hash-lock

Browse source 
Add mutex for Socket::_connectionsHash
This commit is contained in:
Brad Hefta-Gaub 2019-06-11 16:41:11 -07:00 committed by GitHub
commit d9e3dd2857
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libraries/networking/src/udt/Socket.cpp
View file

@ -253,6 +253,7 @@ qint64 Socket::writeDatagram(const QByteArray& datagram, const HifiSockAddr& soc
} }
Connection* Socket::findOrCreateConnection(const HifiSockAddr& sockAddr, bool filterCreate) { Connection* Socket::findOrCreateConnection(const HifiSockAddr& sockAddr, bool filterCreate) {
Lock connectionsLock(_connectionsHashMutex);
auto it = _connectionsHash.find(sockAddr); auto it = _connectionsHash.find(sockAddr);
if (it == _connectionsHash.end()) { if (it == _connectionsHash.end()) {
@ -292,6 +293,7 @@ void Socket::clearConnections() {
return; return;
} }
Lock connectionsLock(_connectionsHashMutex);
if (_connectionsHash.size() > 0) { if (_connectionsHash.size() > 0) {
// clear all of the current connections in the socket // clear all of the current connections in the socket
qCDebug(networking) << "Clearing all remaining connections in Socket."; qCDebug(networking) << "Clearing all remaining connections in Socket.";
@ -300,6 +302,7 @@ void Socket::clearConnections() {
} }
void Socket::cleanupConnection(HifiSockAddr sockAddr) { void Socket::cleanupConnection(HifiSockAddr sockAddr) {
Lock connectionsLock(_connectionsHashMutex);
auto numErased = _connectionsHash.erase(sockAddr); auto numErased = _connectionsHash.erase(sockAddr);
if (numErased > 0) { if (numErased > 0) {
@ -457,6 +460,7 @@ void Socket::readPendingDatagrams() {
} }
void Socket::connectToSendSignal(const HifiSockAddr& destinationAddr, QObject* receiver, const char* slot) { void Socket::connectToSendSignal(const HifiSockAddr& destinationAddr, QObject* receiver, const char* slot) {
Lock connectionsLock(_connectionsHashMutex);
auto it = _connectionsHash.find(destinationAddr); auto it = _connectionsHash.find(destinationAddr);
if (it != _connectionsHash.end()) { if (it != _connectionsHash.end()) {
connect(it->second.get(), SIGNAL(packetSent()), receiver, slot); connect(it->second.get(), SIGNAL(packetSent()), receiver, slot);
@ -473,6 +477,7 @@ void Socket::setConnectionMaxBandwidth(int maxBandwidth) {
qInfo() << "Setting socket's maximum bandwith to" << maxBandwidth << "bps. (" qInfo() << "Setting socket's maximum bandwith to" << maxBandwidth << "bps. ("
<< _connectionsHash.size() << "live connections)"; << _connectionsHash.size() << "live connections)";
_maxBandwidth = maxBandwidth; _maxBandwidth = maxBandwidth;
Lock connectionsLock(_connectionsHashMutex);
for (auto& pair : _connectionsHash) { for (auto& pair : _connectionsHash) {
auto& connection = pair.second; auto& connection = pair.second;
connection->setMaxBandwidth(_maxBandwidth); connection->setMaxBandwidth(_maxBandwidth);
@ -490,6 +495,8 @@ ConnectionStats::Stats Socket::sampleStatsForConnection(const HifiSockAddr& dest
Socket::StatsVector Socket::sampleStatsForAllConnections() { Socket::StatsVector Socket::sampleStatsForAllConnections() {
StatsVector result; StatsVector result;
Lock connectionsLock(_connectionsHashMutex);
result.reserve(_connectionsHash.size()); result.reserve(_connectionsHash.size());
for (const auto& connectionPair : _connectionsHash) { for (const auto& connectionPair : _connectionsHash) {
result.emplace_back(connectionPair.first, connectionPair.second->sampleStats()); result.emplace_back(connectionPair.first, connectionPair.second->sampleStats());
@ -500,6 +507,8 @@ Socket::StatsVector Socket::sampleStatsForAllConnections() {
std::vector<HifiSockAddr> Socket::getConnectionSockAddrs() { std::vector<HifiSockAddr> Socket::getConnectionSockAddrs() {
std::vector<HifiSockAddr> addr; std::vector<HifiSockAddr> addr;
Lock connectionsLock(_connectionsHashMutex);
addr.reserve(_connectionsHash.size()); addr.reserve(_connectionsHash.size());
for (const auto& connectionPair : _connectionsHash) { for (const auto& connectionPair : _connectionsHash) {

1
libraries/networking/src/udt/Socket.h
View file

@ -129,6 +129,7 @@ private:
ConnectionCreationFilterOperator _connectionCreationFilterOperator; ConnectionCreationFilterOperator _connectionCreationFilterOperator;
Mutex _unreliableSequenceNumbersMutex; Mutex _unreliableSequenceNumbersMutex;
Mutex _connectionsHashMutex;
std::unordered_map<HifiSockAddr, BasePacketHandler> _unfilteredHandlers; std::unordered_map<HifiSockAddr, BasePacketHandler> _unfilteredHandlers;
std::unordered_map<HifiSockAddr, SequenceNumber> _unreliableSequenceNumbers; std::unordered_map<HifiSockAddr, SequenceNumber> _unreliableSequenceNumbers;