AlphaX/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Issues Pull Requests Projects Releases Wiki Activity

Faster shutdown for Peers doing PROOF part of handshake

Browse Source
This commit is contained in:
catbref 2019-07-02 15:41:23 +01:00
parent 2f2d9a664d
commit 7eb5cd55ff
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/qora/network/Peer.java
View File

@ -127,6 +127,10 @@ public class Peer extends Thread {
// Getters / setters // Getters / setters
public boolean isStopping() {
return this.isStopping;
}
public PeerData getPeerData() { public PeerData getPeerData() {
return this.peerData; return this.peerData;
} }
@ -500,7 +504,7 @@ public class Peer extends Thread {
} }
public void shutdown() { public void shutdown() {
LOGGER.debug(String.format("Shutting down peer %s", this)); LOGGER.debug(() -> String.format("Shutting down peer %s", this));
this.isStopping = true; this.isStopping = true;
// Shut down pinger // Shut down pinger
@ -525,6 +529,7 @@ public class Peer extends Thread {
} }
} }
LOGGER.debug(() -> String.format("Interrupting peer %s", this));
this.interrupt(); this.interrupt();
// Close socket, which should trigger run() to exit // Close socket, which should trigger run() to exit

2
src/main/java/org/qora/network/Proof.java
View File

@ -64,7 +64,7 @@ public class Proof extends Thread {
long nonce; long nonce;
for (nonce = 0; nonce < Long.MAX_VALUE; ++nonce) { for (nonce = 0; nonce < Long.MAX_VALUE; ++nonce) {
// Check whether we're shutting down every so often // Check whether we're shutting down every so often
if ((nonce & 0xff) == 0 && Thread.currentThread().isInterrupted()) if ((nonce & 0xff) == 0 && (peer.isStopping() || Thread.currentThread().isInterrupted()))
// throw new InterruptedException("Interrupted during peer proof calculation"); // throw new InterruptedException("Interrupted during peer proof calculation");
return; return;