mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2025-02-23 14:40:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

PeerMonitor: use CompletableFuture for lookupReverseDNS() and getAddr()

Browse source 
* Create threadpool for reverseDns (rather than use new Thread() repeatedly)
* For getAddr() run completion handler on callback thread (and eliminate new Thread())
* Add getHostName() method that handles case where peerAddress.getAddr() is null
This commit is contained in:
Sean Gilligan 2022-08-18 14:58:00 -07:00 • committed by Andreas Schildbach
parent 39d799e58f
commit 94ad7dd344
1 changed files with 28 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
examples/src/main/java/org/bitcoinj/examples/PeerMonitor.java
View file

@ -21,6 +21,7 @@ import org.bitcoinj.core.AddressMessage;
import org.bitcoinj.base.Coin; import org.bitcoinj.base.Coin;
import org.bitcoinj.core.NetworkParameters; import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.core.Peer; import org.bitcoinj.core.Peer;
import org.bitcoinj.core.PeerAddress;
import org.bitcoinj.core.PeerGroup; import org.bitcoinj.core.PeerGroup;
import org.bitcoinj.net.discovery.DnsDiscovery; import org.bitcoinj.net.discovery.DnsDiscovery;
import org.bitcoinj.params.MainNetParams; import org.bitcoinj.params.MainNetParams;
@ -35,10 +36,11 @@ import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent; import java.awt.event.WindowEvent;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutionException; import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
/** /**
* Shows connected peers in a table view, so you can watch as they come and go. * Shows connected peers in a table view, so you can watch as they come and go.
@ -46,6 +48,7 @@ import java.util.concurrent.TimeoutException;
public class PeerMonitor { public class PeerMonitor {
private NetworkParameters params; private NetworkParameters params;
private PeerGroup peerGroup; private PeerGroup peerGroup;
private final Executor reverseDnsThreadPool = Executors.newCachedThreadPool();
private PeerTableModel peerTableModel; private PeerTableModel peerTableModel;
private PeerTableRenderer peerTableRenderer; private PeerTableRenderer peerTableRenderer;
@ -82,24 +85,34 @@ public class PeerMonitor {
} }
private void lookupReverseDNS(final Peer peer) { private void lookupReverseDNS(final Peer peer) {
new Thread(() -> { getHostName(peer.getAddress()).thenAccept(reverseDns -> {
// This can take a looooong time.
String reverseDns = peer.getAddress().getAddr().getCanonicalHostName();
reverseDnsLookups.put(peer, reverseDns); reverseDnsLookups.put(peer, reverseDns);
refreshUI(); refreshUI();
}).start(); });
} }
private void getAddr(final Peer peer) { private void getAddr(final Peer peer) {
new Thread(() -> { peer.getAddr()
try { .orTimeout(15, TimeUnit.SECONDS)
AddressMessage addressMessage = peer.getAddr().get(15, TimeUnit.SECONDS); .whenComplete((addressMessage, e) -> {
if (addressMessage != null) {
addressMessages.put(peer, addressMessage); addressMessages.put(peer, addressMessage);
refreshUI(); refreshUI();
} catch (InterruptedException | ExecutionException | TimeoutException e) { } else {
e.printStackTrace(); e.printStackTrace();
} }
}).start(); });
}
private CompletableFuture<String> getHostName(final PeerAddress peerAddress) {
if (peerAddress.getAddr() != null) {
// This can take a looooong time.
return CompletableFuture.supplyAsync(peerAddress.getAddr()::getCanonicalHostName, reverseDnsThreadPool);
} else if (peerAddress.getHostname() != null ){
return CompletableFuture.completedFuture(peerAddress.getHostname());
} else {
return CompletableFuture.completedFuture("-unavailable-");
}
} }
private void refreshUI() { private void refreshUI() {