Muldersoft/MUtilities
Muldersoft/MUtilities
1
0
Fork 0
Code Releases Activity

Improved buildRandomList() function.

Browse Source
This commit is contained in:
LoRd_MuldeR 2018-10-20 21:05:57 +02:00
parent a61fc10602
commit 4038c5605b
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/UpdateChecker.cpp
View File

@ -35,6 +35,7 @@
#include <QElapsedTimer> #include <QElapsedTimer>
#include <QSet> #include <QSet>
#include <QHash> #include <QHash>
#include <QQueue>
#include "Mirrors.h" #include "Mirrors.h"
@ -91,13 +92,12 @@ while(0)
// Helper Functions // Helper Functions
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
static QStringList buildRandomList(const char *const values[]) static QQueue<QString> buildRandomList(const char *const *values)
{ {
QStringList list; QQueue<QString> list;
for (int index = 0; values[index]; index++) while(*values)
{ {
const int pos = MUtils::next_rand_u32() % (index + 1); list.insert(MUtils::next_rand_u32(list.size() + 1), QString::fromLatin1(*(values++)));
list.insert(pos, QString::fromLatin1(values[index]));
} }
return list; return list;
} }
@ -222,32 +222,35 @@ void MUtils::UpdateChecker::checkForUpdates(void)
// ----- Test Known Hosts Connectivity ----- // // ----- Test Known Hosts Connectivity ----- //
int connectionScore = 0; int connectionScore = 0;
QStringList mirrorList = buildRandomList(known_hosts); QQueue<QString> mirrorList = buildRandomList(known_hosts);
for(int connectionTimout = 1000; connectionTimout <= MAX_CONN_TIMEOUT; connectionTimout *= 2) for(int connectionTimout = 1000; connectionTimout <= MAX_CONN_TIMEOUT; connectionTimout *= 2)
{ {
QElapsedTimer elapsedTimer; QElapsedTimer elapsedTimer;
elapsedTimer.start();
const int globalTimout = 2 * MIN_CONNSCORE * connectionTimout; const int globalTimout = 2 * MIN_CONNSCORE * connectionTimout;
while (!elapsedTimer.hasExpired(globalTimout)) elapsedTimer.start();
do
{ {
const QString hostName = mirrorList.takeFirst(); if (!mirrorList.isEmpty())
if (tryContactHost(hostName, connectionTimout))
{ {
setProgress(1 + (connectionScore += 1)); const QString hostName = mirrorList.dequeue();
elapsedTimer.restart(); if (tryContactHost(hostName, connectionTimout))
if (connectionScore >= MIN_CONNSCORE)
{ {
goto endLoop; /*success*/ setProgress(1 + (connectionScore += 1));
elapsedTimer.restart();
if (connectionScore >= MIN_CONNSCORE)
{
goto endLoop; /*success*/
}
}
else
{
mirrorList.enqueue(hostName); /*re-schedule*/
} }
} }
else
{
mirrorList.append(hostName); /*re-schedule*/
}
CHECK_CANCELLED(); CHECK_CANCELLED();
msleep(1);
} }
while(!elapsedTimer.hasExpired(globalTimout));
} }
endLoop: endLoop: