Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-01-30 23:02:15 +00:00
Code Issues Projects Releases Wiki Activity

Protect lastPingTimes under its own lock instead of the peer lock.

Browse Source 
Update issue 310.
This commit is contained in:
Mike Hearn 2013-02-15 15:42:37 +01:00
parent 536bbfb231
commit 38ec23299c
1 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
core/src/main/java/com/google/bitcoin/core/Peer.java
View File

@ -35,6 +35,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CopyOnWriteArraySet; import java.util.concurrent.CopyOnWriteArraySet;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.locks.ReentrantLock;
/** /**
* A Peer handles the high level communication with a Bitcoin node. * A Peer handles the high level communication with a Bitcoin node.
@ -107,7 +108,8 @@ public class Peer {
// Outstanding pings against this peer and how long the last one took to complete. // Outstanding pings against this peer and how long the last one took to complete.
private final CopyOnWriteArrayList<PendingPing> pendingPings; private final CopyOnWriteArrayList<PendingPing> pendingPings;
private long[] lastPingTimes; private final ReentrantLock lastPingTimesLock = new ReentrantLock();
private long[] lastPingTimes = null;
private static final int PING_MOVING_AVERAGE_WINDOW = 20; private static final int PING_MOVING_AVERAGE_WINDOW = 20;
private Channel channel; private Channel channel;
@ -130,7 +132,6 @@ public class Peer {
this.isAcked = false; this.isAcked = false;
this.handler = new PeerHandler(); this.handler = new PeerHandler();
this.pendingPings = new CopyOnWriteArrayList<PendingPing>(); this.pendingPings = new CopyOnWriteArrayList<PendingPing>();
this.lastPingTimes = null;
this.wallets = new CopyOnWriteArrayList<Wallet>(); this.wallets = new CopyOnWriteArrayList<Wallet>();
} }
@ -1071,16 +1072,21 @@ public class Peer {
} }
/** Adds a ping time sample to the averaging window. */ /** Adds a ping time sample to the averaging window. */
private synchronized void addPingTimeData(long sample) { private void addPingTimeData(long sample) {
if (lastPingTimes == null) { lastPingTimesLock.lock();
lastPingTimes = new long[PING_MOVING_AVERAGE_WINDOW]; try {
// Initialize the averaging window to the first sample. if (lastPingTimes == null) {
Arrays.fill(lastPingTimes, sample); lastPingTimes = new long[PING_MOVING_AVERAGE_WINDOW];
} else { // Initialize the averaging window to the first sample.
// Shift all elements backwards by one. Arrays.fill(lastPingTimes, sample);
System.arraycopy(lastPingTimes, 1, lastPingTimes, 0, lastPingTimes.length - 1); } else {
// And append the new sample to the end. // Shift all elements backwards by one.
lastPingTimes[lastPingTimes.length - 1] = sample; System.arraycopy(lastPingTimes, 1, lastPingTimes, 0, lastPingTimes.length - 1);
// And append the new sample to the end.
lastPingTimes[lastPingTimes.length - 1] = sample;
}
} finally {
lastPingTimesLock.unlock();
} }
} }
@ -1109,10 +1115,15 @@ public class Peer {
* Returns the elapsed time of the last ping/pong cycle. If {@link com.google.bitcoin.core.Peer#ping()} has never * Returns the elapsed time of the last ping/pong cycle. If {@link com.google.bitcoin.core.Peer#ping()} has never
* been called or we did not hear back the "pong" message yet, returns {@link Long#MAX_VALUE}. * been called or we did not hear back the "pong" message yet, returns {@link Long#MAX_VALUE}.
*/ */
public synchronized long getLastPingTime() { public long getLastPingTime() {
if (lastPingTimes == null) lastPingTimesLock.lock();
return Long.MAX_VALUE; try {
return lastPingTimes[lastPingTimes.length - 1]; if (lastPingTimes == null)
return Long.MAX_VALUE;
return lastPingTimes[lastPingTimes.length - 1];
} finally {
lastPingTimesLock.unlock();
}
} }
/** /**
@ -1120,12 +1131,17 @@ public class Peer {
* been called or we did not hear back the "pong" message yet, returns {@link Long#MAX_VALUE}. The moving average * been called or we did not hear back the "pong" message yet, returns {@link Long#MAX_VALUE}. The moving average
* window is 5 buckets. * window is 5 buckets.
*/ */
public synchronized long getPingTime() { public long getPingTime() {
if (lastPingTimes == null) lastPingTimesLock.lock();
return Long.MAX_VALUE; try {
long sum = 0; if (lastPingTimes == null)
for (long i : lastPingTimes) sum += i; return Long.MAX_VALUE;
return (long)((double) sum / lastPingTimes.length); long sum = 0;
for (long i : lastPingTimes) sum += i;
return (long)((double) sum / lastPingTimes.length);
} finally {
lastPingTimesLock.unlock();
}
} }
private void processPong(Pong m) { private void processPong(Pong m) {