Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-02-12 02:05:53 +00:00
Code Issues Projects Releases Wiki Activity

Re-arrange the actions in PeerGroup.broadcastTransaction()

Browse Source 
This fixes a bug where Netty complains about blocking an IO thread due to the await call on send and resolves a potential race condition.
This commit is contained in:
Mike Hearn 2013-02-04 18:55:51 +01:00
parent 8c488a1687
commit 6ac8eb54cb
1 changed files with 77 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
core/src/main/java/com/google/bitcoin/core/PeerGroup.java
View File

@ -1046,53 +1046,21 @@ public class PeerGroup extends AbstractIdleService {
ListenableFuture<PeerGroup> peerAvailabilityFuture = waitForPeers(minConnections); ListenableFuture<PeerGroup> peerAvailabilityFuture = waitForPeers(minConnections);
peerAvailabilityFuture.addListener(new Runnable() { peerAvailabilityFuture.addListener(new Runnable() {
public void run() { public void run() {
// This can be called immediately if we already have enough peers. Otherwise it'll be called from a // We now have enough connected peers to send the transaction.
// peer thread. // This can be called immediately if we already have enough. Otherwise it'll be called from a peer
// TODO: Fix the race that exists here. // thread. TODO: Fix the race that exists here.
// Pick a peer to be the lucky recipient of our tx.
final Peer somePeer = peers.get(0); final Peer somePeer = peers.get(0);
log.info("broadcastTransaction: Enough peers, adding {} to the memory pool and sending to {}", log.info("broadcastTransaction: Enough peers, adding {} to the memory pool and sending to {}",
tx.getHashAsString(), somePeer); tx.getHashAsString(), somePeer);
final Transaction pinnedTx = memoryPool.seen(tx, somePeer.getAddress()); final Transaction pinnedTx = memoryPool.seen(tx, somePeer.getAddress());
try { try {
// Satoshis code sends an inv in this case and then lets the peer request the tx data. We just // Prepare to send the transaction by adding a listener that'll be called when confidence changes.
// blast out the TX here for a couple of reasons. Firstly it's simpler: in the case where we have // Only bother with this if we might actually hear back:
// just a single connection we don't have to wait for getdata to be received and handled before if (minConnections > 1) tx.getConfidence().addEventListener(new TransactionConfidence.Listener() {
// completing the future in the code immediately below. Secondly, it's faster. The reason the
// Satoshi client sends an inv is privacy - it means you can't tell if the peer originated the
// transaction or not. However, we are not a fully validating node and this is advertised in
// our version message, as SPV nodes cannot relay it doesn't give away any additional information
// to skip the inv here - we wouldn't send invs anyway.
somePeer.sendMessage(pinnedTx).awaitUninterruptibly();
} catch (IOException e) {
future.setException(e);
return;
}
// If we've been limited to talk to only one peer, we can't wait to hear back because the remote peer
// won't tell us about transactions we just announced to it for obvious reasons. So we just have to
// assume we're done, at that point. This happens when we're not given any peer discovery source and
// the user just calls connectTo() once.
if (minConnections == 1) {
synchronized (PeerGroup.this) {
for (Wallet wallet : wallets) {
try {
if (wallet.isPendingTransactionRelevant(pinnedTx)) {
// Assumption here is there are no dependencies of the created transaction.
wallet.receivePending(pinnedTx, null);
}
} catch (Throwable t) {
future.setException(t);
return;
}
}
}
future.set(pinnedTx);
return;
}
tx.getConfidence().addEventListener(new TransactionConfidence.Listener() {
public void onConfidenceChanged(Transaction tx) { public void onConfidenceChanged(Transaction tx) {
// This will run in a peer thread. // The number of peers that announced this tx has gone up. This will run in a peer thread.
final int numSeenPeers = tx.getConfidence().numBroadcastPeers(); final int numSeenPeers = tx.getConfidence().numBroadcastPeers();
boolean done = false; boolean done = false;
log.info("broadcastTransaction: TX {} seen by {} peers", pinnedTx.getHashAsString(), log.info("broadcastTransaction: TX {} seen by {} peers", pinnedTx.getHashAsString(),
@ -1132,6 +1100,46 @@ public class PeerGroup extends AbstractIdleService {
} }
} }
}); });
// Satoshis code sends an inv in this case and then lets the peer request the tx data. We just
// blast out the TX here for a couple of reasons. Firstly it's simpler: in the case where we have
// just a single connection we don't have to wait for getdata to be received and handled before
// completing the future in the code immediately below. Secondly, it's faster. The reason the
// Satoshi client sends an inv is privacy - it means you can't tell if the peer originated the
// transaction or not. However, we are not a fully validating node and this is advertised in
// our version message, as SPV nodes cannot relay it doesn't give away any additional information
// to skip the inv here - we wouldn't send invs anyway.
ChannelFuture sendComplete = somePeer.sendMessage(pinnedTx);
// If we've been limited to talk to only one peer, we can't wait to hear back because the
// remote peer won't tell us about transactions we just announced to it for obvious reasons.
// So we just have to assume we're done, at that point. This happens when we're not given
// any peer discovery source and the user just calls connectTo() once.
if (minConnections == 1) {
sendComplete.addListener(new ChannelFutureListener() {
public void operationComplete(ChannelFuture _) throws Exception {
synchronized (PeerGroup.this) {
for (Wallet wallet : wallets) {
try {
if (wallet.isPendingTransactionRelevant(pinnedTx)) {
// Assumption here is there are no dependencies of the created
// transaction.
wallet.receivePending(pinnedTx, null);
}
} catch (Throwable t) {
future.setException(t);
return;
}
}
}
future.set(pinnedTx);
return;
}
});
}
} catch (IOException e) {
future.setException(e);
return;
}
} }
}, MoreExecutors.sameThreadExecutor()); }, MoreExecutors.sameThreadExecutor());
return future; return future;