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

Wallet: allow choice of executor to run event listeners in, default to user thread.

Browse source
This commit is contained in:
Mike Hearn 2013-06-25 15:19:10 +02:00
parent 3185923d4a
commit f6d14db8e6
1 changed files with 50 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
core/src/main/java/com/google/bitcoin/core/Wallet.java
View file

@ -38,10 +38,7 @@ import javax.annotation.concurrent.GuardedBy;
import java.io.*; import java.io.*;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.*; import java.util.*;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.*;
import java.util.concurrent.DelayQueue;
import java.util.concurrent.Delayed;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantLock;
import static com.google.bitcoin.core.Utils.bitcoinValueToFriendlyString; import static com.google.bitcoin.core.Utils.bitcoinValueToFriendlyString;
@ -119,7 +116,16 @@ public class Wallet implements Serializable, BlockChainListener {
private Sha256Hash lastBlockSeenHash; private Sha256Hash lastBlockSeenHash;
private int lastBlockSeenHeight = -1; private int lastBlockSeenHeight = -1;
private transient CopyOnWriteArrayList<WalletEventListener> eventListeners; private static class ListenerRegistration {
public WalletEventListener listener;
public Executor executor;
public ListenerRegistration(WalletEventListener listener, Executor executor) {
this.listener = listener;
this.executor = executor;
}
}
private transient CopyOnWriteArrayList<ListenerRegistration> eventListeners;
// Auto-save code. This all should be generalized in future to not be file specific so you can easily store the // Auto-save code. This all should be generalized in future to not be file specific so you can easily store the
// wallet into a database using the same mechanism. However we need to inform stores of each specific change with // wallet into a database using the same mechanism. However we need to inform stores of each specific change with
@ -291,7 +297,7 @@ public class Wallet implements Serializable, BlockChainListener {
spent = new HashMap<Sha256Hash, Transaction>(); spent = new HashMap<Sha256Hash, Transaction>();
pending = new HashMap<Sha256Hash, Transaction>(); pending = new HashMap<Sha256Hash, Transaction>();
dead = new HashMap<Sha256Hash, Transaction>(); dead = new HashMap<Sha256Hash, Transaction>();
eventListeners = new CopyOnWriteArrayList<WalletEventListener>(); eventListeners = new CopyOnWriteArrayList<ListenerRegistration>();
extensions = new HashMap<String, WalletExtension>(); extensions = new HashMap<String, WalletExtension>();
confidenceChanged = new HashMap<Transaction, TransactionConfidence.Listener.ChangeReason>(); confidenceChanged = new HashMap<Transaction, TransactionConfidence.Listener.ChangeReason>();
createTransientState(); createTransientState();
@ -1358,10 +1364,18 @@ public class Wallet implements Serializable, BlockChainListener {
/** /**
* Adds an event listener object. Methods on this object are called when something interesting happens, * Adds an event listener object. Methods on this object are called when something interesting happens,
* like receiving money. * like receiving money. Runs the listener methods in the user thread.
*/ */
public void addEventListener(WalletEventListener listener) { public void addEventListener(WalletEventListener listener) {
eventListeners.add(listener); addEventListener(listener, Threading.userCode);
}
/**
* Adds an event listener object. Methods on this object are called when something interesting happens,
* like receiving money. The listener is executed by the given executor.
*/
public void addEventListener(WalletEventListener listener, Executor executor) {
eventListeners.add(new ListenerRegistration(listener, executor));
} }
/** /**
@ -3107,10 +3121,11 @@ public class Wallet implements Serializable, BlockChainListener {
private void queueOnTransactionConfidenceChanged(final Transaction tx) { private void queueOnTransactionConfidenceChanged(final Transaction tx) {
checkState(lock.isLocked()); checkState(lock.isLocked());
for (final WalletEventListener listener : eventListeners) { for (final ListenerRegistration registration : eventListeners) {
Threading.userCode.execute(new Runnable() { registration.executor.execute(new Runnable() {
@Override public void run() { @Override
listener.onTransactionConfidenceChanged(Wallet.this, tx); public void run() {
registration.listener.onTransactionConfidenceChanged(Wallet.this, tx);
} }
}); });
} }
@ -3122,10 +3137,11 @@ public class Wallet implements Serializable, BlockChainListener {
checkState(lock.isLocked()); checkState(lock.isLocked());
checkState(onWalletChangedSuppressions >= 0); checkState(onWalletChangedSuppressions >= 0);
if (onWalletChangedSuppressions > 0) return; if (onWalletChangedSuppressions > 0) return;
for (final WalletEventListener listener : eventListeners) { for (final ListenerRegistration registration : eventListeners) {
Threading.userCode.execute(new Runnable() { registration.executor.execute(new Runnable() {
@Override public void run() { @Override
listener.onWalletChanged(Wallet.this); public void run() {
registration.listener.onWalletChanged(Wallet.this);
} }
}); });
} }
@ -3133,10 +3149,11 @@ public class Wallet implements Serializable, BlockChainListener {
private void queueOnCoinsReceived(final Transaction tx, final BigInteger balance, final BigInteger newBalance) { private void queueOnCoinsReceived(final Transaction tx, final BigInteger balance, final BigInteger newBalance) {
checkState(lock.isLocked()); checkState(lock.isLocked());
for (final WalletEventListener listener : eventListeners) { for (final ListenerRegistration registration : eventListeners) {
Threading.userCode.execute(new Runnable() { registration.executor.execute(new Runnable() {
@Override public void run() { @Override
listener.onCoinsReceived(Wallet.this, tx, balance, newBalance); public void run() {
registration.listener.onCoinsReceived(Wallet.this, tx, balance, newBalance);
} }
}); });
} }
@ -3144,10 +3161,11 @@ public class Wallet implements Serializable, BlockChainListener {
private void queueOnCoinsSent(final Transaction tx, final BigInteger prevBalance, final BigInteger newBalance) { private void queueOnCoinsSent(final Transaction tx, final BigInteger prevBalance, final BigInteger newBalance) {
checkState(lock.isLocked()); checkState(lock.isLocked());
for (final WalletEventListener listener : eventListeners) { for (final ListenerRegistration registration : eventListeners) {
Threading.userCode.execute(new Runnable() { registration.executor.execute(new Runnable() {
@Override public void run() { @Override
listener.onCoinsSent(Wallet.this, tx, prevBalance, newBalance); public void run() {
registration.listener.onCoinsSent(Wallet.this, tx, prevBalance, newBalance);
} }
}); });
} }
@ -3156,10 +3174,11 @@ public class Wallet implements Serializable, BlockChainListener {
private void queueOnReorganize() { private void queueOnReorganize() {
checkState(lock.isLocked()); checkState(lock.isLocked());
checkState(insideReorg); checkState(insideReorg);
for (final WalletEventListener listener : eventListeners) { for (final ListenerRegistration registration : eventListeners) {
Threading.userCode.execute(new Runnable() { registration.executor.execute(new Runnable() {
@Override public void run() { @Override
listener.onReorganize(Wallet.this); public void run() {
registration.listener.onReorganize(Wallet.this);
} }
}); });
} }
@ -3167,11 +3186,11 @@ public class Wallet implements Serializable, BlockChainListener {
private void queueOnKeysAdded(final List<ECKey> keys) { private void queueOnKeysAdded(final List<ECKey> keys) {
checkState(lock.isLocked()); checkState(lock.isLocked());
for (final WalletEventListener listener : eventListeners) { for (final ListenerRegistration registration : eventListeners) {
Threading.userCode.execute(new Runnable() { registration.executor.execute(new Runnable() {
@Override @Override
public void run() { public void run() {
listener.onKeysAdded(Wallet.this, keys); registration.listener.onKeysAdded(Wallet.this, keys);
} }
}); });
} }