thunderbrewhq/thunderbrew
1
0
Fork 0
mirror of https://github.com/thunderbrewhq/thunderbrew synced 2025-12-12 11:12:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(net): correct bugs with connection tracking in Mac PlatformRun loop

Browse source
This commit is contained in:
fallenoak 2023-02-20 17:40:17 -06:00
parent 40b4717a0d
commit 28184fb6fa
No known key found for this signature in database
GPG key ID: 7628F8E61AEA070D
1 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/net/connection/WowConnectionNetMac.cpp
View file

@ -60,11 +60,10 @@ void WowConnectionNet::PlatformRun() {
auto fdCount = s_workerPipe[0]; auto fdCount = s_workerPipe[0];
int32_t v39 = 0;
int32_t v41 = 0;
this->m_connectionsLock.Enter(); this->m_connectionsLock.Enter();
uint32_t connectionCount = 0;
uint32_t disconnectionCount = 0;
for (auto connection = this->m_connections.Head(); connection; connection = this->m_connections.Link(connection)->Next()) { for (auto connection = this->m_connections.Head(); connection; connection = this->m_connections.Link(connection)->Next()) {
if (connection->m_serviceCount) { if (connection->m_serviceCount) {
continue; continue;
@ -75,7 +74,8 @@ void WowConnectionNet::PlatformRun() {
FD_SET(connection->m_sock, &writeFds); FD_SET(connection->m_sock, &writeFds);
FD_SET(connection->m_sock, &errorFds); FD_SET(connection->m_sock, &errorFds);
connections.Add(1, &connection); connections.GrowToFit(connectionCount, 0);
connections[connectionCount] = connection;
connection->AddRef(); connection->AddRef();
fdCount = std::max(fdCount, connection->m_sock); fdCount = std::max(fdCount, connection->m_sock);
@ -85,7 +85,8 @@ void WowConnectionNet::PlatformRun() {
case WOWC_LISTENING: { case WOWC_LISTENING: {
FD_SET(connection->m_sock, &readFds); FD_SET(connection->m_sock, &readFds);
connections.Add(1, &connection); connections.GrowToFit(connectionCount, 0);
connections[connectionCount] = connection;
connection->AddRef(); connection->AddRef();
fdCount = std::max(fdCount, connection->m_sock); fdCount = std::max(fdCount, connection->m_sock);
@ -98,16 +99,21 @@ void WowConnectionNet::PlatformRun() {
// TODO // TODO
connections.Add(1, &connection); connections.GrowToFit(connectionCount, 0);
connections[connectionCount] = connection;
connection->AddRef(); connection->AddRef();
fdCount = std::max(fdCount, connection->m_sock); fdCount = std::max(fdCount, connection->m_sock);
break;
} }
case WOWC_DISCONNECTING: { case WOWC_DISCONNECTING: {
// TODO // TODO
v41++; disconnectionCount++;
connections.Add(1, &connection);
connections.GrowToFit(connectionCount, 0);
connections[connectionCount] = connection;
connection->AddRef(); connection->AddRef();
break; break;
@ -117,15 +123,17 @@ void WowConnectionNet::PlatformRun() {
break; break;
} }
} }
connectionCount++;
} }
this->m_connectionsLock.Leave(); this->m_connectionsLock.Leave();
if (v41 > 0) { if (disconnectionCount > 0) {
timeout = { 0, 0 }; timeout = { 0, 0 };
} }
if (connections.Count() > 0) { if (connectionCount > 0) {
// TODO // TODO
} }
@ -138,7 +146,7 @@ void WowConnectionNet::PlatformRun() {
} }
} }
for (int32_t i = 0; i < connections.Count(); i++) { for (int32_t i = 0; i < connectionCount; i++) {
auto connection = connections[i]; auto connection = connections[i];
uint32_t signalFlags = 0x0; uint32_t signalFlags = 0x0;