flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-20 20:40:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

[FSD] Gradually increase number of read lines from FSD socket

Browse Source 
* Avoid overflow by gradually reading more lines
* Also improved sending in the same way
This commit is contained in:
Klaus Basan
2020-04-07 18:34:32 +02:00
committed by Mat Sutcliffe
parent b71dfe482c
commit ce9b9e3e5b
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/blackcore/fsd/fsdclient.cpp
View File

@@ -689,17 +689,23 @@ namespace BlackCore
const int s = m_queuedFsdMessages.size(); const int s = m_queuedFsdMessages.size();
this->sendMessageString(m_queuedFsdMessages.dequeue()); this->sendMessageString(m_queuedFsdMessages.dequeue());
// send up to 4 at once // send up to 6 at once
if (s > 5) { this->sendMessageString(m_queuedFsdMessages.dequeue()); } if (s > 5) { this->sendMessageString(m_queuedFsdMessages.dequeue()); }
if (s > 10) { this->sendMessageString(m_queuedFsdMessages.dequeue()); } if (s > 10) { this->sendMessageString(m_queuedFsdMessages.dequeue()); }
if (s > 20) { this->sendMessageString(m_queuedFsdMessages.dequeue()); } if (s > 20) { this->sendMessageString(m_queuedFsdMessages.dequeue()); }
if (s > 30) { this->sendMessageString(m_queuedFsdMessages.dequeue()); }
// overload // overload
// no idea, if we ever get here // no idea, if we ever get here
if (s > 50) if (s > 50)
{ {
CLogMessage(this).warning(u"Too many queued messages (%1), bulk send!") << s; const StatusSeverity severity = s > 75 ? SeverityWarning : SeverityInfo;
for (int i = 0; i < 10; i++) CLogMessage(this).log(severity, u"Too many queued messages (%1), bulk send!") << s;
int sendNo = 10;
if (s > 75) { sendNo = 20; }
if (s > 100) { sendNo = 30; }
for (int i = 0; i < sendNo; i++)
{ {
this->sendMessageString(m_queuedFsdMessages.dequeue()); this->sendMessageString(m_queuedFsdMessages.dequeue());
} }
@@ -1800,11 +1806,13 @@ namespace BlackCore
quitAndWait(); quitAndWait();
} }
void CFSDClient::readDataFromSocket() void CFSDClient::readDataFromSocketMaxLines(int maxLines)
{ {
if (m_socket.bytesAvailable() < 1) { return; } if (m_socket.bytesAvailable() < 1) { return; }
int lines = 0; int lines = 0;
// reads at least one line if available
while (m_socket.canReadLine()) while (m_socket.canReadLine())
{ {
const QByteArray dataEncoded = m_socket.readLine(); const QByteArray dataEncoded = m_socket.readLine();
@@ -1813,19 +1821,23 @@ namespace BlackCore
this->parseMessage(data); this->parseMessage(data);
lines++; lines++;
static constexpr int MaxLines = 50; static constexpr int MaxLines = 75 - 1;
if (lines > MaxLines) if (maxLines < 0) { maxLines = MaxLines; }
if (lines > maxLines)
{ {
static constexpr int DelayMs = 10; static constexpr int DelayMs = 10;
const int newMax = qRound(1.2 * lines); // 20% more
CLogMessage(this).debug(u"ReadDataFromSocket has too many lines (>%1), will read again in %2ms") << MaxLines << DelayMs; CLogMessage(this).debug(u"ReadDataFromSocket has too many lines (>%1), will read again in %2ms") << MaxLines << DelayMs;
QPointer<CFSDClient> myself(this); QPointer<CFSDClient> myself(this);
QTimer::singleShot(DelayMs, this, [ = ] QTimer::singleShot(DelayMs, this, [ = ]
{ {
if (myself) { myself->readDataFromSocket(); } if (myself) { myself->readDataFromSocketMaxLines(newMax); }
}); });
break; break;
} }
} }
} }

3
src/blackcore/fsd/fsdclient.h
View File

@@ -314,7 +314,8 @@ namespace BlackCore
void sendClientIdentification(const QString &fsdChallenge); void sendClientIdentification(const QString &fsdChallenge);
void sendIncrementalAircraftConfig(); void sendIncrementalAircraftConfig();
void readDataFromSocket(); void readDataFromSocket() { this->readDataFromSocketMaxLines(); }
void readDataFromSocketMaxLines(int maxLines = -1);
QString socketErrorToQString(QAbstractSocket::SocketError error); QString socketErrorToQString(QAbstractSocket::SocketError error);
void parseMessage(const QString &lineRaw); void parseMessage(const QString &lineRaw);