goldcollection
/
muwire
mirror of https://github.com/zlatinb/muwire
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

more plumbing

pull/53/head
Zlatin Balevsky 2020-10-18 18:54:33 +01:00
parent 84f6091935
commit 749bfaa532
No known key found for this signature in database
GPG Key ID: A72832072D525E41
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
core/src/main/groovy/com/muwire/core/hostcache/H2HostCache.groovy
View File

@ -30,29 +30,41 @@ class H2HostCache extends HostCache {
} }
@Override @Override
protected synchronized void hostDiscovered(Destination d, boolean fromHostcache) { protected synchronized void hostDiscovered(Destination d, boolean fromHostcache) {
if (fromHostcache) if (fromHostcache) {
sql.execute("delete from HOST_ATTEMPTS where DESTINATION='${d.toBase64()}';") sql.execute("delete from HOST_ATTEMPTS where DESTINATION='${d.toBase64()}';")
// TODO: check if already known in db hosts.add(d)
hosts.add(d) } else {
if (sql.rows("select * from HOST_ATTEMPTS where DESTINATION='${d.toBase64()}'").size() == 0)
hosts.add(d)
}
} }
@Override @Override
protected synchronized void onConnection(Destination d, ConnectionAttemptStatus status) { protected synchronized void onConnection(Destination d, ConnectionAttemptStatus status) {
// remove from hosts // remove from hosts
hosts.remove(d) hosts.remove(d)
// record into db // record into db
def timestamp = new java.sql.Date(System.currentTimeMillis()) def timestamp = new java.sql.Date(System.currentTimeMillis())
sql.execute("insert into HOST_ATTEMPTS values ('${d.toBase64()}', '$timestamp', '${status.name()}');") sql.execute("insert into HOST_ATTEMPTS values ('${d.toBase64()}', '$timestamp', '${status.name()}');")
// and re-rank
rankedHosts.put(d, rankHost(d))
} }
@Override @Override
public synchronized List<Destination> getHosts(int n, Predicate<Destination> filter) { public synchronized List<Destination> getHosts(int n, Predicate<Destination> filter) {
List<Destination> rv = getTopHosts(n, filter) List<Destination> rv = getTopHosts(n, filter)
log.fine("got ${rv.size()} ranked hosts out of $n requested")
Iterator<Destination> iter = hosts.iterator() Iterator<Destination> iter = hosts.iterator()
while (rv.size() < n && iter.hasNext()) { while (rv.size() < n && iter.hasNext()) {
Destination host = iter.next() Destination host = iter.next()
if (filter.test(host)) if (filter.test(host))
rv.add(host) rv.add(host)
} }
log.fine("will return total of ${rv.size()} hosts")
return rv; return rv;
} }
@Override @Override
@ -124,9 +136,13 @@ class H2HostCache extends HostCache {
private List<Destination> getTopHosts(int n, Predicate<Destination> filter) { private List<Destination> getTopHosts(int n, Predicate<Destination> filter) {
List<RankedHost> ranked = new ArrayList<>(rankedHosts.values()) List<RankedHost> ranked = new ArrayList<>(rankedHosts.values())
ranked.sort({l,r -> Double.compare(r.probability, l.probability)}) ranked.sort({l,r -> Double.compare(r.probability, l.probability)})
log.fine("before filtering there are ${ranked.size()} ranked hosts")
ranked.retainAll { ranked.retainAll {
filter.test(it.destination) filter.test(it.destination)
} }
log.fine("after filtering there are ${ranked.size()} ranked hosts")
if (ranked.size() > n) if (ranked.size() > n)
ranked = ranked[0..n-1] ranked = ranked[0..n-1]
ranked.collect { it.destination } ranked.collect { it.destination }