Merge pull request #6029

a784f90 Cap nAttempts penalty at 8 and switch to pow instead of a division loop. (Gregory Maxwell)
2015-04-20 13:55:38 +02:00 · 2015-04-20 13:55:38 +02:00 · 71900b4426
commit 71900b4426
parent 2bc6332df8 a784f90c98
1 changed files with 2 additions and 3 deletions
--- a/src/addrman.cpp
+++ b/src/addrman.cpp
@ -67,9 +67,8 @@ double CAddrInfo::GetChance(int64_t nNow) const
    if (nSinceLastTry < 60 * 10)
        fChance *= 0.01;

-    // deprioritize 50% after each failed attempt
-    for (int n = 0; n < nAttempts; n++)
-        fChance /= 1.5;
+    // deprioritize 66% after each failed attempt, but at most 1/28th to avoid the search taking forever or overly penalizing outages.
+    fChance *= pow(0.66, min(nAttempts, 8));

    return fChance;
 }